diff --git a/librarian.yaml b/librarian.yaml
index 58c253689b..b0442a0e99 100644
--- a/librarian.yaml
+++ b/librarian.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 language: rust
-version: v0.8.1-0.20260204230000-ecb27d3ef03a
+version: v0.8.1-0.20260208220643-e77cccf75c05
 sources:
   conformance:
     commit: b407e8416e3893036aee5af9a12bd9b6a0e2b2e6
@@ -54,9 +54,6 @@ default:
       - name: bytes
         package: bytes
         force_used: true
-      - name: gax
-        package: google-cloud-gax
-        used_if: services
       - name: gaxi
         package: google-cloud-gax-internal
         feature: _internal-http-client
@@ -67,6 +64,9 @@ default:
       - name: google-cloud-common
         package: google-cloud-common
         source: google.cloud.common
+      - name: google-cloud-gax
+        package: google-cloud-gax
+        used_if: services
       - name: google-cloud-grafeas-v1
         package: google-cloud-grafeas-v1
         source: grafeas.v1
diff --git a/src/firestore/Cargo.toml b/src/firestore/Cargo.toml
index 34c71f1aeb..e1f6f49c53 100644
--- a/src/firestore/Cargo.toml
+++ b/src/firestore/Cargo.toml
@@ -39,7 +39,7 @@ serde_with.workspace  = true
 tokio                 = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tracing.workspace     = true
 # Local crates
-gax.workspace     = true
+google-cloud-gax  = { workspace = true }
 gaxi              = { workspace = true, features = ["_internal-common", "_internal-grpc-client"] }
 google-cloud-type = { workspace = true }
 google-cloud-rpc  = { workspace = true }
diff --git a/src/firestore/src/generated/gapic/builder.rs b/src/firestore/src/generated/gapic/builder.rs
index 5f4d33b06d..06acaf79a7 100644
--- a/src/firestore/src/generated/gapic/builder.rs
+++ b/src/firestore/src/generated/gapic/builder.rs
@@ -20,7 +20,7 @@ pub mod firestore {
     /// A builder for [Firestore][crate::client::Firestore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_firestore::*;
     /// # use builder::firestore::ClientBuilder;
     /// # use client::Firestore;
@@ -30,19 +30,18 @@ pub mod firestore {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Firestore;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Firestore;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod firestore {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Firestore>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod firestore {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::GetDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod firestore {
             (*self.0.stub)
                 .get_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDocumentRequest::name].
@@ -182,8 +181,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -193,8 +192,8 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::ListDocuments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -225,7 +224,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -235,13 +234,13 @@ pub mod firestore {
             (*self.0.stub)
                 .list_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDocumentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDocumentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -250,15 +249,17 @@ pub mod firestore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDocumentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDocumentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -357,8 +358,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -368,7 +369,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::UpdateDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -396,7 +397,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -406,7 +407,7 @@ pub mod firestore {
             (*self.0.stub)
                 .update_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::UpdateDocumentRequest::document].
@@ -487,8 +488,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -498,7 +499,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::DeleteDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -526,7 +527,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -536,7 +537,7 @@ pub mod firestore {
             (*self.0.stub)
                 .delete_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDocumentRequest::name].
@@ -567,8 +568,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -578,7 +579,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::BeginTransaction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -609,7 +610,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -619,7 +620,7 @@ pub mod firestore {
             (*self.0.stub)
                 .begin_transaction(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [database][crate::model::BeginTransactionRequest::database].
@@ -650,8 +651,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BeginTransaction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BeginTransaction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -661,7 +662,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::Commit;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -689,7 +690,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -699,7 +700,7 @@ pub mod firestore {
             (*self.0.stub)
                 .commit(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [database][crate::model::CommitRequest::database].
@@ -729,8 +730,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Commit {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Commit {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -740,7 +741,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::Rollback;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -768,7 +769,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -778,7 +779,7 @@ pub mod firestore {
             (*self.0.stub)
                 .rollback(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [database][crate::model::RollbackRequest::database].
@@ -799,8 +800,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Rollback {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Rollback {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -810,8 +811,8 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::PartitionQuery;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -842,7 +843,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -852,14 +853,16 @@ pub mod firestore {
             (*self.0.stub)
                 .partition_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PartitionQueryResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::PartitionQueryResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -867,15 +870,17 @@ pub mod firestore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::PartitionQueryResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::PartitionQueryResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -961,8 +966,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PartitionQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PartitionQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -972,7 +977,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::ListCollectionIds;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1003,7 +1008,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1013,7 +1018,7 @@ pub mod firestore {
             (*self.0.stub)
                 .list_collection_ids(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListCollectionIdsRequest::parent].
@@ -1065,8 +1070,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCollectionIds {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCollectionIds {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1076,7 +1081,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::BatchWrite;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1104,7 +1109,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1114,7 +1119,7 @@ pub mod firestore {
             (*self.0.stub)
                 .batch_write(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [database][crate::model::BatchWriteRequest::database].
@@ -1149,8 +1154,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchWrite {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchWrite {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1160,7 +1165,7 @@ pub mod firestore {
     /// # Example
     /// ```
     /// # use google_cloud_firestore::builder::firestore::CreateDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_firestore::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1188,7 +1193,7 @@ pub mod firestore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1198,7 +1203,7 @@ pub mod firestore {
             (*self.0.stub)
                 .create_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDocumentRequest::parent].
@@ -1265,8 +1270,8 @@ pub mod firestore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/firestore/src/generated/gapic/client.rs b/src/firestore/src/generated/gapic/client.rs
index 034798f9cc..ed30bec02d 100644
--- a/src/firestore/src/generated/gapic/client.rs
+++ b/src/firestore/src/generated/gapic/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_firestore::client::Firestore;
 /// let client = Firestore::builder().build().await?;
 /// // use `client` to make requests to the Cloud Firestore API.
@@ -73,13 +73,13 @@ impl Firestore {
     /// Returns a builder for [Firestore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_firestore::client::Firestore;
     /// let client = Firestore::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::firestore::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::firestore::client::Factory)
+        crate::new_client_builder(super::builder::firestore::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -97,14 +97,14 @@ impl Firestore {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Firestore>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Firestore>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -113,13 +113,13 @@ impl Firestore {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Firestore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Firestore> {
         super::transport::Firestore::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Firestore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Firestore> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Firestore::new)
diff --git a/src/firestore/src/generated/gapic/model.rs b/src/firestore/src/generated/gapic/model.rs
index 5f609e0c8d..57c7e9e22b 100644
--- a/src/firestore/src/generated/gapic/model.rs
+++ b/src/firestore/src/generated/gapic/model.rs
@@ -2640,7 +2640,7 @@ impl wkt::message::Message for ListDocumentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDocumentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDocumentsResponse {
     type PageItem = crate::model::Document;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5362,7 +5362,7 @@ impl wkt::message::Message for PartitionQueryResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PartitionQueryResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for PartitionQueryResponse {
     type PageItem = crate::model::Cursor;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/firestore/src/generated/gapic/stub.rs b/src/firestore/src/generated/gapic/stub.rs
index 5ff3e2f8bb..5e17455ca7 100644
--- a/src/firestore/src/generated/gapic/stub.rs
+++ b/src/firestore/src/generated/gapic/stub.rs
@@ -42,10 +42,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn get_document(
         &self,
         _req: crate::model::GetDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn list_documents(
         &self,
         _req: crate::model::ListDocumentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDocumentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +63,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn update_document(
         &self,
         _req: crate::model::UpdateDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,8 +73,8 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn delete_document(
         &self,
         _req: crate::model::DeleteDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -84,9 +82,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn begin_transaction(
         &self,
         _req: crate::model::BeginTransactionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BeginTransactionResponse>>,
+        Output = crate::Result<crate::Response<crate::model::BeginTransactionResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -95,9 +93,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn commit(
         &self,
         _req: crate::model::CommitRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CommitResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CommitResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,8 +104,8 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn rollback(
         &self,
         _req: crate::model::RollbackRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -115,9 +113,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn partition_query(
         &self,
         _req: crate::model::PartitionQueryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PartitionQueryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PartitionQueryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -126,9 +124,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn list_collection_ids(
         &self,
         _req: crate::model::ListCollectionIdsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCollectionIdsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCollectionIdsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -137,9 +135,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn batch_write(
         &self,
         _req: crate::model::BatchWriteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BatchWriteResponse>>,
+        Output = crate::Result<crate::Response<crate::model::BatchWriteResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -148,10 +146,9 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     fn create_document(
         &self,
         _req: crate::model::CreateDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/firestore/src/generated/gapic/stub/dynamic.rs b/src/firestore/src/generated/gapic/stub/dynamic.rs
index ba2f35f4a3..516ec57898 100644
--- a/src/firestore/src/generated/gapic/stub/dynamic.rs
+++ b/src/firestore/src/generated/gapic/stub/dynamic.rs
@@ -20,68 +20,68 @@ pub trait Firestore: std::fmt::Debug + Send + Sync {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDocumentsResponse>>;
 
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn begin_transaction(
         &self,
         req: crate::model::BeginTransactionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BeginTransactionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BeginTransactionResponse>>;
 
     async fn commit(
         &self,
         req: crate::model::CommitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitResponse>>;
 
     async fn rollback(
         &self,
         req: crate::model::RollbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn partition_query(
         &self,
         req: crate::model::PartitionQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PartitionQueryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PartitionQueryResponse>>;
 
     async fn list_collection_ids(
         &self,
         req: crate::model::ListCollectionIdsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCollectionIdsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCollectionIdsResponse>>;
 
     async fn batch_write(
         &self,
         req: crate::model::BatchWriteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchWriteResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchWriteResponse>>;
 
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 }
 
 /// All implementations of [super::Firestore] also implement [Firestore].
@@ -91,8 +91,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::get_document(self, req, options).await
     }
 
@@ -100,8 +100,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDocumentsResponse>> {
         T::list_documents(self, req, options).await
     }
 
@@ -109,8 +109,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::update_document(self, req, options).await
     }
 
@@ -118,8 +118,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_document(self, req, options).await
     }
 
@@ -127,8 +127,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn begin_transaction(
         &self,
         req: crate::model::BeginTransactionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BeginTransactionResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BeginTransactionResponse>> {
         T::begin_transaction(self, req, options).await
     }
 
@@ -136,8 +136,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn commit(
         &self,
         req: crate::model::CommitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitResponse>> {
         T::commit(self, req, options).await
     }
 
@@ -145,8 +145,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn rollback(
         &self,
         req: crate::model::RollbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::rollback(self, req, options).await
     }
 
@@ -154,8 +154,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn partition_query(
         &self,
         req: crate::model::PartitionQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PartitionQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PartitionQueryResponse>> {
         T::partition_query(self, req, options).await
     }
 
@@ -163,8 +163,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn list_collection_ids(
         &self,
         req: crate::model::ListCollectionIdsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCollectionIdsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCollectionIdsResponse>> {
         T::list_collection_ids(self, req, options).await
     }
 
@@ -172,8 +172,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn batch_write(
         &self,
         req: crate::model::BatchWriteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchWriteResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchWriteResponse>> {
         T::batch_write(self, req, options).await
     }
 
@@ -181,8 +181,8 @@ impl<T: super::Firestore> Firestore for T {
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::create_document(self, req, options).await
     }
 }
diff --git a/src/firestore/src/generated/gapic/tracing.rs b/src/firestore/src/generated/gapic/tracing.rs
index 33c92a1914..b332b06165 100644
--- a/src/firestore/src/generated/gapic/tracing.rs
+++ b/src/firestore/src/generated/gapic/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.get_document(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDocumentsResponse>> {
         self.inner.list_documents(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.update_document(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_document(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn begin_transaction(
         &self,
         req: crate::model::BeginTransactionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BeginTransactionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BeginTransactionResponse>> {
         self.inner.begin_transaction(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn commit(
         &self,
         req: crate::model::CommitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitResponse>> {
         self.inner.commit(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn rollback(
         &self,
         req: crate::model::RollbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.rollback(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn partition_query(
         &self,
         req: crate::model::PartitionQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PartitionQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PartitionQueryResponse>> {
         self.inner.partition_query(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_collection_ids(
         &self,
         req: crate::model::ListCollectionIdsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCollectionIdsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCollectionIdsResponse>> {
         self.inner.list_collection_ids(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn batch_write(
         &self,
         req: crate::model::BatchWriteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchWriteResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchWriteResponse>> {
         self.inner.batch_write(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.create_document(req, options).await
     }
 }
diff --git a/src/firestore/src/generated/gapic/transport.rs b/src/firestore/src/generated/gapic/transport.rs
index 157cf24590..c42cc92213 100644
--- a/src/firestore/src/generated/gapic/transport.rs
+++ b/src/firestore/src/generated/gapic/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 const DEFAULT_HOST: &str = "https://firestore.googleapis.com";
 
@@ -50,7 +50,7 @@ impl std::fmt::Debug for Firestore {
 }
 
 impl Firestore {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::grpc::Client::new(config, DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -60,13 +60,13 @@ impl super::stub::Firestore for Firestore {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, true);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, true);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -102,13 +102,13 @@ impl super::stub::Firestore for Firestore {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDocumentsResponse>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, true);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, true);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -150,13 +150,13 @@ impl super::stub::Firestore for Firestore {
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -193,13 +193,13 @@ impl super::stub::Firestore for Firestore {
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, true);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, true);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -235,13 +235,13 @@ impl super::stub::Firestore for Firestore {
     async fn begin_transaction(
         &self,
         req: crate::model::BeginTransactionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BeginTransactionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BeginTransactionResponse>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -277,13 +277,13 @@ impl super::stub::Firestore for Firestore {
     async fn commit(
         &self,
         req: crate::model::CommitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitResponse>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new("google.firestore.v1.Firestore", "Commit"));
@@ -315,13 +315,13 @@ impl super::stub::Firestore for Firestore {
     async fn rollback(
         &self,
         req: crate::model::RollbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new("google.firestore.v1.Firestore", "Rollback"));
@@ -353,13 +353,13 @@ impl super::stub::Firestore for Firestore {
     async fn partition_query(
         &self,
         req: crate::model::PartitionQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PartitionQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PartitionQueryResponse>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -395,13 +395,13 @@ impl super::stub::Firestore for Firestore {
     async fn list_collection_ids(
         &self,
         req: crate::model::ListCollectionIdsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCollectionIdsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCollectionIdsResponse>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -438,13 +438,13 @@ impl super::stub::Firestore for Firestore {
     async fn batch_write(
         &self,
         req: crate::model::BatchWriteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchWriteResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchWriteResponse>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
@@ -480,13 +480,13 @@ impl super::stub::Firestore for Firestore {
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::{
             grpc::tonic::{Extensions, GrpcMethod},
             prost::ToProto,
         };
-        let options = gax::options::internal::set_default_idempotency(options, false);
+        let options = google_cloud_gax::options::internal::set_default_idempotency(options, false);
         let extensions = {
             let mut e = Extensions::new();
             e.insert(GrpcMethod::new(
diff --git a/src/firestore/src/lib.rs b/src/firestore/src/lib.rs
index 648e4355a0..83640ba65f 100644
--- a/src/firestore/src/lib.rs
+++ b/src/firestore/src/lib.rs
@@ -25,8 +25,16 @@
 //!
 //! * [Firestore](client/struct.Firestore.html)
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
 // TODO(#1549) - remove this workaround once all code is generated.
 #[allow(rustdoc::broken_intra_doc_links)]
 pub(crate) mod generated;
diff --git a/src/generated/api/apikeys/v2/Cargo.toml b/src/generated/api/apikeys/v2/Cargo.toml
index 2241149e0c..52d6d1b5f1 100644
--- a/src/generated/api/apikeys/v2/Cargo.toml
+++ b/src/generated/api/apikeys/v2/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/api/apikeys/v2/src/builder.rs b/src/generated/api/apikeys/v2/src/builder.rs
index 042560e773..e2f0a6790f 100644
--- a/src/generated/api/apikeys/v2/src/builder.rs
+++ b/src/generated/api/apikeys/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod api_keys {
     /// A builder for [ApiKeys][crate::client::ApiKeys].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apikeys_v2::*;
     /// # use builder::api_keys::ClientBuilder;
     /// # use client::ApiKeys;
@@ -30,19 +30,18 @@ pub mod api_keys {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiKeys;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiKeys;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod api_keys {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiKeys>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod api_keys {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::CreateKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -101,7 +100,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116,7 +115,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .create_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_key`.
@@ -127,7 +126,7 @@ pub mod api_keys {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -192,8 +191,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -203,8 +202,8 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::ListKeys;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -233,7 +232,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -243,13 +242,13 @@ pub mod api_keys {
             (*self.0.stub)
                 .list_keys(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListKeysResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListKeysResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -258,15 +257,15 @@ pub mod api_keys {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListKeysResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListKeysResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -298,8 +297,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListKeys {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListKeys {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -309,7 +308,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::GetKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -335,7 +334,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -345,7 +344,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .get_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetKeyRequest::name].
@@ -358,8 +357,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -369,7 +368,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::GetKeyString;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -395,7 +394,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -405,7 +404,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .get_key_string(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetKeyStringRequest::name].
@@ -418,8 +417,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetKeyString {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetKeyString {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -429,7 +428,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::UpdateKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -456,7 +455,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -471,7 +470,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .update_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_key`.
@@ -482,7 +481,7 @@ pub mod api_keys {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -551,8 +550,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -562,7 +561,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::DeleteKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -589,7 +588,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -604,7 +603,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .delete_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_key`.
@@ -615,7 +614,7 @@ pub mod api_keys {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -658,8 +657,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -669,7 +668,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::UndeleteKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -696,7 +695,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -711,7 +710,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .undelete_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undelete_key`.
@@ -722,7 +721,7 @@ pub mod api_keys {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -759,8 +758,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeleteKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeleteKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -770,7 +769,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::LookupKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -796,7 +795,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -806,7 +805,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .lookup_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [key_string][crate::model::LookupKeyRequest::key_string].
@@ -819,8 +818,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -830,7 +829,7 @@ pub mod api_keys {
     /// # Example
     /// ```
     /// # use google_cloud_apikeys_v2::builder::api_keys::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apikeys_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -859,7 +858,7 @@ pub mod api_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -869,7 +868,7 @@ pub mod api_keys {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -880,8 +879,8 @@ pub mod api_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/api/apikeys/v2/src/client.rs b/src/generated/api/apikeys/v2/src/client.rs
index d5610ed506..40713b2dd6 100644
--- a/src/generated/api/apikeys/v2/src/client.rs
+++ b/src/generated/api/apikeys/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apikeys_v2::client::ApiKeys;
 /// let client = ApiKeys::builder().build().await?;
 /// // use `client` to make requests to the API Keys API.
@@ -66,13 +66,13 @@ impl ApiKeys {
     /// Returns a builder for [ApiKeys].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apikeys_v2::client::ApiKeys;
     /// let client = ApiKeys::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_keys::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::api_keys::client::Factory)
+        crate::new_client_builder(super::builder::api_keys::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl ApiKeys {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiKeys>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiKeys>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl ApiKeys {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiKeys> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiKeys> {
         super::transport::ApiKeys::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiKeys> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiKeys> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiKeys::new)
diff --git a/src/generated/api/apikeys/v2/src/lib.rs b/src/generated/api/apikeys/v2/src/lib.rs
index 3e878c0a64..bf3fbafacd 100644
--- a/src/generated/api/apikeys/v2/src/lib.rs
+++ b/src/generated/api/apikeys/v2/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/api/apikeys/v2/src/model.rs b/src/generated/api/apikeys/v2/src/model.rs
index 3a900a1fb3..5312236d94 100644
--- a/src/generated/api/apikeys/v2/src/model.rs
+++ b/src/generated/api/apikeys/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -270,7 +270,7 @@ impl wkt::message::Message for ListKeysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListKeysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListKeysResponse {
     type PageItem = crate::model::Key;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/api/apikeys/v2/src/stub.rs b/src/generated/api/apikeys/v2/src/stub.rs
index 87747fefe6..d301531f94 100644
--- a/src/generated/api/apikeys/v2/src/stub.rs
+++ b/src/generated/api/apikeys/v2/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn create_key(
         &self,
         _req: crate::model::CreateKeyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn list_keys(
         &self,
         _req: crate::model::ListKeysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListKeysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListKeysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn get_key(
         &self,
         _req: crate::model::GetKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Key>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Key>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -74,9 +74,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn get_key_string(
         &self,
         _req: crate::model::GetKeyStringRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GetKeyStringResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GetKeyStringResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -85,9 +85,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn update_key(
         &self,
         _req: crate::model::UpdateKeyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -96,9 +96,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn delete_key(
         &self,
         _req: crate::model::DeleteKeyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -107,9 +107,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn undelete_key(
         &self,
         _req: crate::model::UndeleteKeyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -118,9 +118,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn lookup_key(
         &self,
         _req: crate::model::LookupKeyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LookupKeyResponse>>,
+        Output = crate::Result<crate::Response<crate::model::LookupKeyResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -129,9 +129,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -142,9 +142,9 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -153,8 +153,8 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/api/apikeys/v2/src/stub/dynamic.rs b/src/generated/api/apikeys/v2/src/stub/dynamic.rs
index 5a479cecba..426a4279b9 100644
--- a/src/generated/api/apikeys/v2/src/stub/dynamic.rs
+++ b/src/generated/api/apikeys/v2/src/stub/dynamic.rs
@@ -20,66 +20,66 @@ pub trait ApiKeys: std::fmt::Debug + Send + Sync {
     async fn create_key(
         &self,
         req: crate::model::CreateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_keys(
         &self,
         req: crate::model::ListKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKeysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKeysResponse>>;
 
     async fn get_key(
         &self,
         req: crate::model::GetKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Key>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Key>>;
 
     async fn get_key_string(
         &self,
         req: crate::model::GetKeyStringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetKeyStringResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetKeyStringResponse>>;
 
     async fn update_key(
         &self,
         req: crate::model::UpdateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_key(
         &self,
         req: crate::model::DeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undelete_key(
         &self,
         req: crate::model::UndeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn lookup_key(
         &self,
         req: crate::model::LookupKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupKeyResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupKeyResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ApiKeys] also implement [ApiKeys].
@@ -89,8 +89,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn create_key(
         &self,
         req: crate::model::CreateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_key(self, req, options).await
     }
 
@@ -98,8 +98,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn list_keys(
         &self,
         req: crate::model::ListKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKeysResponse>> {
         T::list_keys(self, req, options).await
     }
 
@@ -107,8 +107,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn get_key(
         &self,
         req: crate::model::GetKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Key>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Key>> {
         T::get_key(self, req, options).await
     }
 
@@ -116,8 +116,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn get_key_string(
         &self,
         req: crate::model::GetKeyStringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetKeyStringResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetKeyStringResponse>> {
         T::get_key_string(self, req, options).await
     }
 
@@ -125,8 +125,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn update_key(
         &self,
         req: crate::model::UpdateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_key(self, req, options).await
     }
 
@@ -134,8 +134,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn delete_key(
         &self,
         req: crate::model::DeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_key(self, req, options).await
     }
 
@@ -143,8 +143,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn undelete_key(
         &self,
         req: crate::model::UndeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undelete_key(self, req, options).await
     }
 
@@ -152,8 +152,8 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn lookup_key(
         &self,
         req: crate::model::LookupKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupKeyResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupKeyResponse>> {
         T::lookup_key(self, req, options).await
     }
 
@@ -161,22 +161,22 @@ impl<T: super::ApiKeys> ApiKeys for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/api/apikeys/v2/src/tracing.rs b/src/generated/api/apikeys/v2/src/tracing.rs
index 6ba6704a8c..8e2b8badfe 100644
--- a/src/generated/api/apikeys/v2/src/tracing.rs
+++ b/src/generated/api/apikeys/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_key(
         &self,
         req: crate::model::CreateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_key(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_keys(
         &self,
         req: crate::model::ListKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKeysResponse>> {
         self.inner.list_keys(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_key(
         &self,
         req: crate::model::GetKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Key>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Key>> {
         self.inner.get_key(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_key_string(
         &self,
         req: crate::model::GetKeyStringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetKeyStringResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetKeyStringResponse>> {
         self.inner.get_key_string(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_key(
         &self,
         req: crate::model::UpdateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_key(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_key(
         &self,
         req: crate::model::DeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_key(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn undelete_key(
         &self,
         req: crate::model::UndeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undelete_key(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn lookup_key(
         &self,
         req: crate::model::LookupKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupKeyResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupKeyResponse>> {
         self.inner.lookup_key(req, options).await
     }
 
@@ -113,22 +113,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/api/apikeys/v2/src/transport.rs b/src/generated/api/apikeys/v2/src/transport.rs
index c65078ae94..fb8c630969 100644
--- a/src/generated/api/apikeys/v2/src/transport.rs
+++ b/src/generated/api/apikeys/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ApiKeys](super::stub::ApiKeys) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ApiKeys {
 }
 
 impl ApiKeys {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn create_key(
         &self,
         req: crate::model::CreateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn list_keys(
         &self,
         req: crate::model::ListKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKeysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKeysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn get_key(
         &self,
         req: crate::model::GetKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Key>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Key>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn get_key_string(
         &self,
         req: crate::model::GetKeyStringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetKeyStringResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetKeyStringResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -278,9 +278,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -295,13 +295,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn update_key(
         &self,
         req: crate::model::UpdateKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -360,9 +360,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -377,13 +377,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn delete_key(
         &self,
         req: crate::model::DeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn undelete_key(
         &self,
         req: crate::model::UndeleteKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +489,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,11 +506,11 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn lookup_key(
         &self,
         req: crate::model::LookupKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupKeyResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupKeyResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v2/keys:lookupKey".to_string();
@@ -526,9 +526,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -543,13 +543,13 @@ impl super::stub::ApiKeys for ApiKeys {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -576,9 +576,9 @@ impl super::stub::ApiKeys for ApiKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -592,15 +592,15 @@ impl super::stub::ApiKeys for ApiKeys {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/api/cloudquotas/v1/Cargo.toml b/src/generated/api/cloudquotas/v1/Cargo.toml
index a80bec060a..df8730f3ad 100644
--- a/src/generated/api/cloudquotas/v1/Cargo.toml
+++ b/src/generated/api/cloudquotas/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/api/cloudquotas/v1/src/builder.rs b/src/generated/api/cloudquotas/v1/src/builder.rs
index 5f8e9ef5ed..2fbbffa9b1 100644
--- a/src/generated/api/cloudquotas/v1/src/builder.rs
+++ b/src/generated/api/cloudquotas/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_quotas {
     /// A builder for [CloudQuotas][crate::client::CloudQuotas].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_cloudquotas_v1::*;
     /// # use builder::cloud_quotas::ClientBuilder;
     /// # use client::CloudQuotas;
@@ -30,19 +30,18 @@ pub mod cloud_quotas {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudQuotas;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudQuotas;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_quotas {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudQuotas>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_quotas {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod cloud_quotas {
     /// # Example
     /// ```
     /// # use google_cloud_api_cloudquotas_v1::builder::cloud_quotas::ListQuotaInfos;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_cloudquotas_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod cloud_quotas {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,14 +117,16 @@ pub mod cloud_quotas {
             (*self.0.stub)
                 .list_quota_infos(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListQuotaInfosResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListQuotaInfosResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -133,15 +134,17 @@ pub mod cloud_quotas {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListQuotaInfosResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListQuotaInfosResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -167,8 +170,8 @@ pub mod cloud_quotas {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQuotaInfos {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQuotaInfos {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -178,7 +181,7 @@ pub mod cloud_quotas {
     /// # Example
     /// ```
     /// # use google_cloud_api_cloudquotas_v1::builder::cloud_quotas::GetQuotaInfo;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_cloudquotas_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -206,7 +209,7 @@ pub mod cloud_quotas {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -216,7 +219,7 @@ pub mod cloud_quotas {
             (*self.0.stub)
                 .get_quota_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQuotaInfoRequest::name].
@@ -229,8 +232,8 @@ pub mod cloud_quotas {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQuotaInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQuotaInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -240,8 +243,8 @@ pub mod cloud_quotas {
     /// # Example
     /// ```
     /// # use google_cloud_api_cloudquotas_v1::builder::cloud_quotas::ListQuotaPreferences;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_cloudquotas_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -275,7 +278,7 @@ pub mod cloud_quotas {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -285,14 +288,16 @@ pub mod cloud_quotas {
             (*self.0.stub)
                 .list_quota_preferences(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListQuotaPreferencesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListQuotaPreferencesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -300,17 +305,17 @@ pub mod cloud_quotas {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListQuotaPreferencesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -348,8 +353,8 @@ pub mod cloud_quotas {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQuotaPreferences {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQuotaPreferences {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -359,7 +364,7 @@ pub mod cloud_quotas {
     /// # Example
     /// ```
     /// # use google_cloud_api_cloudquotas_v1::builder::cloud_quotas::GetQuotaPreference;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_cloudquotas_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -390,7 +395,7 @@ pub mod cloud_quotas {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -400,7 +405,7 @@ pub mod cloud_quotas {
             (*self.0.stub)
                 .get_quota_preference(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQuotaPreferenceRequest::name].
@@ -413,8 +418,8 @@ pub mod cloud_quotas {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQuotaPreference {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQuotaPreference {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -424,7 +429,7 @@ pub mod cloud_quotas {
     /// # Example
     /// ```
     /// # use google_cloud_api_cloudquotas_v1::builder::cloud_quotas::CreateQuotaPreference;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_cloudquotas_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -455,7 +460,7 @@ pub mod cloud_quotas {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -465,7 +470,7 @@ pub mod cloud_quotas {
             (*self.0.stub)
                 .create_quota_preference(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateQuotaPreferenceRequest::parent].
@@ -517,8 +522,8 @@ pub mod cloud_quotas {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateQuotaPreference {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateQuotaPreference {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -528,7 +533,7 @@ pub mod cloud_quotas {
     /// # Example
     /// ```
     /// # use google_cloud_api_cloudquotas_v1::builder::cloud_quotas::UpdateQuotaPreference;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_cloudquotas_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -559,7 +564,7 @@ pub mod cloud_quotas {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -569,7 +574,7 @@ pub mod cloud_quotas {
             (*self.0.stub)
                 .update_quota_preference(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateQuotaPreferenceRequest::update_mask].
@@ -637,8 +642,8 @@ pub mod cloud_quotas {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateQuotaPreference {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateQuotaPreference {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/api/cloudquotas/v1/src/client.rs b/src/generated/api/cloudquotas/v1/src/client.rs
index 8b28012a48..67bbe4d990 100644
--- a/src/generated/api/cloudquotas/v1/src/client.rs
+++ b/src/generated/api/cloudquotas/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_api_cloudquotas_v1::client::CloudQuotas;
 /// let client = CloudQuotas::builder().build().await?;
 /// // use `client` to make requests to the Cloud Quotas API.
@@ -72,13 +72,13 @@ impl CloudQuotas {
     /// Returns a builder for [CloudQuotas].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_cloudquotas_v1::client::CloudQuotas;
     /// let client = CloudQuotas::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_quotas::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::cloud_quotas::client::Factory)
+        crate::new_client_builder(super::builder::cloud_quotas::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -96,14 +96,14 @@ impl CloudQuotas {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudQuotas>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudQuotas>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -112,13 +112,13 @@ impl CloudQuotas {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudQuotas> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudQuotas> {
         super::transport::CloudQuotas::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudQuotas> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudQuotas> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudQuotas::new)
diff --git a/src/generated/api/cloudquotas/v1/src/lib.rs b/src/generated/api/cloudquotas/v1/src/lib.rs
index 57aacb4eec..729ee5bf06 100644
--- a/src/generated/api/cloudquotas/v1/src/lib.rs
+++ b/src/generated/api/cloudquotas/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/api/cloudquotas/v1/src/model.rs b/src/generated/api/cloudquotas/v1/src/model.rs
index 6c79e420e9..146dddee10 100644
--- a/src/generated/api/cloudquotas/v1/src/model.rs
+++ b/src/generated/api/cloudquotas/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -166,7 +166,7 @@ impl wkt::message::Message for ListQuotaInfosResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQuotaInfosResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQuotaInfosResponse {
     type PageItem = crate::model::QuotaInfo;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -411,7 +411,7 @@ impl wkt::message::Message for ListQuotaPreferencesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQuotaPreferencesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQuotaPreferencesResponse {
     type PageItem = crate::model::QuotaPreference;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/api/cloudquotas/v1/src/stub.rs b/src/generated/api/cloudquotas/v1/src/stub.rs
index 83936e6a0d..2e9247619b 100644
--- a/src/generated/api/cloudquotas/v1/src/stub.rs
+++ b/src/generated/api/cloudquotas/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     fn list_quota_infos(
         &self,
         _req: crate::model::ListQuotaInfosRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListQuotaInfosResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListQuotaInfosResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     fn get_quota_info(
         &self,
         _req: crate::model::GetQuotaInfoRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QuotaInfo>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QuotaInfo>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     fn list_quota_preferences(
         &self,
         _req: crate::model::ListQuotaPreferencesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListQuotaPreferencesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListQuotaPreferencesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     fn get_quota_preference(
         &self,
         _req: crate::model::GetQuotaPreferenceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QuotaPreference>>,
+        Output = crate::Result<crate::Response<crate::model::QuotaPreference>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     fn create_quota_preference(
         &self,
         _req: crate::model::CreateQuotaPreferenceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QuotaPreference>>,
+        Output = crate::Result<crate::Response<crate::model::QuotaPreference>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     fn update_quota_preference(
         &self,
         _req: crate::model::UpdateQuotaPreferenceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QuotaPreference>>,
+        Output = crate::Result<crate::Response<crate::model::QuotaPreference>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/api/cloudquotas/v1/src/stub/dynamic.rs b/src/generated/api/cloudquotas/v1/src/stub/dynamic.rs
index e19898be13..e30696fb50 100644
--- a/src/generated/api/cloudquotas/v1/src/stub/dynamic.rs
+++ b/src/generated/api/cloudquotas/v1/src/stub/dynamic.rs
@@ -20,38 +20,38 @@ pub trait CloudQuotas: std::fmt::Debug + Send + Sync {
     async fn list_quota_infos(
         &self,
         req: crate::model::ListQuotaInfosRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQuotaInfosResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQuotaInfosResponse>>;
 
     async fn get_quota_info(
         &self,
         req: crate::model::GetQuotaInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaInfo>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaInfo>>;
 
     async fn list_quota_preferences(
         &self,
         req: crate::model::ListQuotaPreferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQuotaPreferencesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQuotaPreferencesResponse>>;
 
     async fn get_quota_preference(
         &self,
         req: crate::model::GetQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaPreference>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaPreference>>;
 
     async fn create_quota_preference(
         &self,
         req: crate::model::CreateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaPreference>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaPreference>>;
 
     async fn update_quota_preference(
         &self,
         req: crate::model::UpdateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaPreference>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaPreference>>;
 }
 
 /// All implementations of [super::CloudQuotas] also implement [CloudQuotas].
@@ -61,8 +61,8 @@ impl<T: super::CloudQuotas> CloudQuotas for T {
     async fn list_quota_infos(
         &self,
         req: crate::model::ListQuotaInfosRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQuotaInfosResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQuotaInfosResponse>> {
         T::list_quota_infos(self, req, options).await
     }
 
@@ -70,8 +70,8 @@ impl<T: super::CloudQuotas> CloudQuotas for T {
     async fn get_quota_info(
         &self,
         req: crate::model::GetQuotaInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaInfo>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaInfo>> {
         T::get_quota_info(self, req, options).await
     }
 
@@ -79,8 +79,8 @@ impl<T: super::CloudQuotas> CloudQuotas for T {
     async fn list_quota_preferences(
         &self,
         req: crate::model::ListQuotaPreferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQuotaPreferencesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQuotaPreferencesResponse>> {
         T::list_quota_preferences(self, req, options).await
     }
 
@@ -88,8 +88,8 @@ impl<T: super::CloudQuotas> CloudQuotas for T {
     async fn get_quota_preference(
         &self,
         req: crate::model::GetQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaPreference>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaPreference>> {
         T::get_quota_preference(self, req, options).await
     }
 
@@ -97,8 +97,8 @@ impl<T: super::CloudQuotas> CloudQuotas for T {
     async fn create_quota_preference(
         &self,
         req: crate::model::CreateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaPreference>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaPreference>> {
         T::create_quota_preference(self, req, options).await
     }
 
@@ -106,8 +106,8 @@ impl<T: super::CloudQuotas> CloudQuotas for T {
     async fn update_quota_preference(
         &self,
         req: crate::model::UpdateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaPreference>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaPreference>> {
         T::update_quota_preference(self, req, options).await
     }
 }
diff --git a/src/generated/api/cloudquotas/v1/src/tracing.rs b/src/generated/api/cloudquotas/v1/src/tracing.rs
index ee876711c3..a0242d4e85 100644
--- a/src/generated/api/cloudquotas/v1/src/tracing.rs
+++ b/src/generated/api/cloudquotas/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_quota_infos(
         &self,
         req: crate::model::ListQuotaInfosRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQuotaInfosResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQuotaInfosResponse>> {
         self.inner.list_quota_infos(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_quota_info(
         &self,
         req: crate::model::GetQuotaInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaInfo>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaInfo>> {
         self.inner.get_quota_info(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_quota_preferences(
         &self,
         req: crate::model::ListQuotaPreferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQuotaPreferencesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQuotaPreferencesResponse>> {
         self.inner.list_quota_preferences(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_quota_preference(
         &self,
         req: crate::model::GetQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaPreference>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaPreference>> {
         self.inner.get_quota_preference(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn create_quota_preference(
         &self,
         req: crate::model::CreateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaPreference>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaPreference>> {
         self.inner.create_quota_preference(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn update_quota_preference(
         &self,
         req: crate::model::UpdateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaPreference>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaPreference>> {
         self.inner.update_quota_preference(req, options).await
     }
 }
diff --git a/src/generated/api/cloudquotas/v1/src/transport.rs b/src/generated/api/cloudquotas/v1/src/transport.rs
index 2e9f2520ea..b5c3f39061 100644
--- a/src/generated/api/cloudquotas/v1/src/transport.rs
+++ b/src/generated/api/cloudquotas/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudQuotas](super::stub::CloudQuotas) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudQuotas {
 }
 
 impl CloudQuotas {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudQuotas for CloudQuotas {
     async fn list_quota_infos(
         &self,
         req: crate::model::ListQuotaInfosRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQuotaInfosResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQuotaInfosResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -170,9 +170,9 @@ impl super::stub::CloudQuotas for CloudQuotas {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -187,13 +187,13 @@ impl super::stub::CloudQuotas for CloudQuotas {
     async fn get_quota_info(
         &self,
         req: crate::model::GetQuotaInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaInfo>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaInfo>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -320,9 +320,9 @@ impl super::stub::CloudQuotas for CloudQuotas {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -337,13 +337,13 @@ impl super::stub::CloudQuotas for CloudQuotas {
     async fn list_quota_preferences(
         &self,
         req: crate::model::ListQuotaPreferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQuotaPreferencesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQuotaPreferencesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -458,9 +458,9 @@ impl super::stub::CloudQuotas for CloudQuotas {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475,13 +475,13 @@ impl super::stub::CloudQuotas for CloudQuotas {
     async fn get_quota_preference(
         &self,
         req: crate::model::GetQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaPreference>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaPreference>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -596,9 +596,9 @@ impl super::stub::CloudQuotas for CloudQuotas {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -613,13 +613,13 @@ impl super::stub::CloudQuotas for CloudQuotas {
     async fn create_quota_preference(
         &self,
         req: crate::model::CreateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaPreference>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaPreference>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -734,9 +734,9 @@ impl super::stub::CloudQuotas for CloudQuotas {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -751,13 +751,13 @@ impl super::stub::CloudQuotas for CloudQuotas {
     async fn update_quota_preference(
         &self,
         req: crate::model::UpdateQuotaPreferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaPreference>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaPreference>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -941,9 +941,9 @@ impl super::stub::CloudQuotas for CloudQuotas {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/api/servicecontrol/v1/Cargo.toml b/src/generated/api/servicecontrol/v1/Cargo.toml
index 1358bee16a..f6dbb24251 100644
--- a/src/generated/api/servicecontrol/v1/Cargo.toml
+++ b/src/generated/api/servicecontrol/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace               = true
 bytes.workspace                     = true
-gax.workspace                       = true
 gaxi                                = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace          = true
+google-cloud-gax.workspace          = true
 google-cloud-logging-type.workspace = true
 google-cloud-rpc.workspace          = true
 lazy_static.workspace               = true
diff --git a/src/generated/api/servicecontrol/v1/src/builder.rs b/src/generated/api/servicecontrol/v1/src/builder.rs
index 97baa740b0..c12a9ca2d2 100644
--- a/src/generated/api/servicecontrol/v1/src/builder.rs
+++ b/src/generated/api/servicecontrol/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod quota_controller {
     /// A builder for [QuotaController][crate::client::QuotaController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicecontrol_v1::*;
     /// # use builder::quota_controller::ClientBuilder;
     /// # use client::QuotaController;
@@ -30,19 +30,18 @@ pub mod quota_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::QuotaController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = QuotaController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod quota_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::QuotaController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod quota_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod quota_controller {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicecontrol_v1::builder::quota_controller::AllocateQuota;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicecontrol_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod quota_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod quota_controller {
             (*self.0.stub)
                 .allocate_quota(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::AllocateQuotaRequest::service_name].
@@ -149,8 +148,8 @@ pub mod quota_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AllocateQuota {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AllocateQuota {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -162,7 +161,7 @@ pub mod service_controller {
     /// A builder for [ServiceController][crate::client::ServiceController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicecontrol_v1::*;
     /// # use builder::service_controller::ClientBuilder;
     /// # use client::ServiceController;
@@ -172,19 +171,18 @@ pub mod service_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ServiceController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ServiceController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -195,7 +193,7 @@ pub mod service_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ServiceController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -208,7 +206,7 @@ pub mod service_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -218,7 +216,7 @@ pub mod service_controller {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicecontrol_v1::builder::service_controller::Check;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicecontrol_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -246,7 +244,7 @@ pub mod service_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -256,7 +254,7 @@ pub mod service_controller {
             (*self.0.stub)
                 .check(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::CheckRequest::service_name].
@@ -291,8 +289,8 @@ pub mod service_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Check {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Check {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -302,7 +300,7 @@ pub mod service_controller {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicecontrol_v1::builder::service_controller::Report;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicecontrol_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -330,7 +328,7 @@ pub mod service_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -340,7 +338,7 @@ pub mod service_controller {
             (*self.0.stub)
                 .report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::ReportRequest::service_name].
@@ -368,8 +366,8 @@ pub mod service_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Report {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Report {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/api/servicecontrol/v1/src/client.rs b/src/generated/api/servicecontrol/v1/src/client.rs
index 08180e5acd..61fbb0129b 100644
--- a/src/generated/api/servicecontrol/v1/src/client.rs
+++ b/src/generated/api/servicecontrol/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_api_servicecontrol_v1::client::QuotaController;
 /// let client = QuotaController::builder().build().await?;
 /// // use `client` to make requests to the Service Control API.
@@ -69,15 +69,13 @@ impl QuotaController {
     /// Returns a builder for [QuotaController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicecontrol_v1::client::QuotaController;
     /// let client = QuotaController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::quota_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::quota_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::quota_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,15 +93,14 @@ impl QuotaController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::QuotaController>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::QuotaController>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -112,13 +109,13 @@ impl QuotaController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::QuotaController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::QuotaController> {
         super::transport::QuotaController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::QuotaController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::QuotaController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::QuotaController::new)
@@ -144,7 +141,7 @@ impl QuotaController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_api_servicecontrol_v1::client::ServiceController;
 /// let client = ServiceController::builder().build().await?;
 /// // use `client` to make requests to the Service Control API.
@@ -193,15 +190,13 @@ impl ServiceController {
     /// Returns a builder for [ServiceController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicecontrol_v1::client::ServiceController;
     /// let client = ServiceController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::service_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::service_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::service_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -219,14 +214,14 @@ impl ServiceController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ServiceController>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ServiceController>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -236,13 +231,13 @@ impl ServiceController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceController> {
         super::transport::ServiceController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ServiceController::new)
diff --git a/src/generated/api/servicecontrol/v1/src/lib.rs b/src/generated/api/servicecontrol/v1/src/lib.rs
index c5d834364a..fa5e00497f 100644
--- a/src/generated/api/servicecontrol/v1/src/lib.rs
+++ b/src/generated/api/servicecontrol/v1/src/lib.rs
@@ -45,8 +45,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -81,3 +81,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/api/servicecontrol/v1/src/model.rs b/src/generated/api/servicecontrol/v1/src/model.rs
index 01c4bbc9c9..8ad259ff34 100644
--- a/src/generated/api/servicecontrol/v1/src/model.rs
+++ b/src/generated/api/servicecontrol/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_logging_type;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
diff --git a/src/generated/api/servicecontrol/v1/src/stub.rs b/src/generated/api/servicecontrol/v1/src/stub.rs
index b30bfb5d4e..45b55e744e 100644
--- a/src/generated/api/servicecontrol/v1/src/stub.rs
+++ b/src/generated/api/servicecontrol/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait QuotaController: std::fmt::Debug + Send + Sync {
     fn allocate_quota(
         &self,
         _req: crate::model::AllocateQuotaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AllocateQuotaResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AllocateQuotaResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +66,9 @@ pub trait ServiceController: std::fmt::Debug + Send + Sync {
     fn check(
         &self,
         _req: crate::model::CheckRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CheckResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CheckResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +77,9 @@ pub trait ServiceController: std::fmt::Debug + Send + Sync {
     fn report(
         &self,
         _req: crate::model::ReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReportResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReportResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/api/servicecontrol/v1/src/stub/dynamic.rs b/src/generated/api/servicecontrol/v1/src/stub/dynamic.rs
index ee74476d28..d4589a4e03 100644
--- a/src/generated/api/servicecontrol/v1/src/stub/dynamic.rs
+++ b/src/generated/api/servicecontrol/v1/src/stub/dynamic.rs
@@ -20,8 +20,8 @@ pub trait QuotaController: std::fmt::Debug + Send + Sync {
     async fn allocate_quota(
         &self,
         req: crate::model::AllocateQuotaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AllocateQuotaResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AllocateQuotaResponse>>;
 }
 
 /// All implementations of [super::QuotaController] also implement [QuotaController].
@@ -31,8 +31,8 @@ impl<T: super::QuotaController> QuotaController for T {
     async fn allocate_quota(
         &self,
         req: crate::model::AllocateQuotaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AllocateQuotaResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AllocateQuotaResponse>> {
         T::allocate_quota(self, req, options).await
     }
 }
@@ -43,14 +43,14 @@ pub trait ServiceController: std::fmt::Debug + Send + Sync {
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckResponse>>;
 
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportResponse>>;
 }
 
 /// All implementations of [super::ServiceController] also implement [ServiceController].
@@ -60,8 +60,8 @@ impl<T: super::ServiceController> ServiceController for T {
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckResponse>> {
         T::check(self, req, options).await
     }
 
@@ -69,8 +69,8 @@ impl<T: super::ServiceController> ServiceController for T {
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportResponse>> {
         T::report(self, req, options).await
     }
 }
diff --git a/src/generated/api/servicecontrol/v1/src/tracing.rs b/src/generated/api/servicecontrol/v1/src/tracing.rs
index e08d1afac4..7865418927 100644
--- a/src/generated/api/servicecontrol/v1/src/tracing.rs
+++ b/src/generated/api/servicecontrol/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn allocate_quota(
         &self,
         req: crate::model::AllocateQuotaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AllocateQuotaResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AllocateQuotaResponse>> {
         self.inner.allocate_quota(req, options).await
     }
 }
@@ -73,8 +73,8 @@ where
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckResponse>> {
         self.inner.check(req, options).await
     }
 
@@ -82,8 +82,8 @@ where
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportResponse>> {
         self.inner.report(req, options).await
     }
 }
diff --git a/src/generated/api/servicecontrol/v1/src/transport.rs b/src/generated/api/servicecontrol/v1/src/transport.rs
index 204bf33ddd..972fb62c8d 100644
--- a/src/generated/api/servicecontrol/v1/src/transport.rs
+++ b/src/generated/api/servicecontrol/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [QuotaController](super::stub::QuotaController) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for QuotaController {
 }
 
 impl QuotaController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::QuotaController for QuotaController {
     async fn allocate_quota(
         &self,
         req: crate::model::AllocateQuotaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AllocateQuotaResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AllocateQuotaResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76,9 +76,9 @@ impl super::stub::QuotaController for QuotaController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -106,7 +106,7 @@ impl std::fmt::Debug for ServiceController {
 }
 
 impl ServiceController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -116,13 +116,13 @@ impl super::stub::ServiceController for ServiceController {
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -149,9 +149,9 @@ impl super::stub::ServiceController for ServiceController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -166,13 +166,13 @@ impl super::stub::ServiceController for ServiceController {
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -199,9 +199,9 @@ impl super::stub::ServiceController for ServiceController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/api/servicecontrol/v2/Cargo.toml b/src/generated/api/servicecontrol/v2/Cargo.toml
index 24c87843c4..b20a862153 100644
--- a/src/generated/api/servicecontrol/v2/Cargo.toml
+++ b/src/generated/api/servicecontrol/v2/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-rpc-context.workspace = true
 google-cloud-rpc.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/api/servicecontrol/v2/src/builder.rs b/src/generated/api/servicecontrol/v2/src/builder.rs
index 2f90106add..48fa0aadb2 100644
--- a/src/generated/api/servicecontrol/v2/src/builder.rs
+++ b/src/generated/api/servicecontrol/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod service_controller {
     /// A builder for [ServiceController][crate::client::ServiceController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicecontrol_v2::*;
     /// # use builder::service_controller::ClientBuilder;
     /// # use client::ServiceController;
@@ -30,19 +30,18 @@ pub mod service_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ServiceController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ServiceController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod service_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ServiceController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod service_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod service_controller {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicecontrol_v2::builder::service_controller::Check;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicecontrol_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod service_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod service_controller {
             (*self.0.stub)
                 .check(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::CheckRequest::service_name].
@@ -166,8 +165,8 @@ pub mod service_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Check {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Check {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -177,7 +176,7 @@ pub mod service_controller {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicecontrol_v2::builder::service_controller::Report;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicecontrol_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -205,7 +204,7 @@ pub mod service_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -215,7 +214,7 @@ pub mod service_controller {
             (*self.0.stub)
                 .report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::ReportRequest::service_name].
@@ -243,8 +242,8 @@ pub mod service_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Report {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Report {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/api/servicecontrol/v2/src/client.rs b/src/generated/api/servicecontrol/v2/src/client.rs
index c3071b08d1..aa93b5df39 100644
--- a/src/generated/api/servicecontrol/v2/src/client.rs
+++ b/src/generated/api/servicecontrol/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_api_servicecontrol_v2::client::ServiceController;
 /// let client = ServiceController::builder().build().await?;
 /// // use `client` to make requests to the Service Control API.
@@ -71,15 +71,13 @@ impl ServiceController {
     /// Returns a builder for [ServiceController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicecontrol_v2::client::ServiceController;
     /// let client = ServiceController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::service_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::service_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::service_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -97,14 +95,14 @@ impl ServiceController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ServiceController>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ServiceController>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -114,13 +112,13 @@ impl ServiceController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceController> {
         super::transport::ServiceController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ServiceController::new)
diff --git a/src/generated/api/servicecontrol/v2/src/lib.rs b/src/generated/api/servicecontrol/v2/src/lib.rs
index a4216136d3..e7fc594ade 100644
--- a/src/generated/api/servicecontrol/v2/src/lib.rs
+++ b/src/generated/api/servicecontrol/v2/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/api/servicecontrol/v2/src/model.rs b/src/generated/api/servicecontrol/v2/src/model.rs
index d34a312d56..12b17bd137 100644
--- a/src/generated/api/servicecontrol/v2/src/model.rs
+++ b/src/generated/api/servicecontrol/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_rpc;
 extern crate google_cloud_rpc_context;
 extern crate lazy_static;
diff --git a/src/generated/api/servicecontrol/v2/src/stub.rs b/src/generated/api/servicecontrol/v2/src/stub.rs
index 6a2f83f29f..495e6b7a12 100644
--- a/src/generated/api/servicecontrol/v2/src/stub.rs
+++ b/src/generated/api/servicecontrol/v2/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ServiceController: std::fmt::Debug + Send + Sync {
     fn check(
         &self,
         _req: crate::model::CheckRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CheckResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CheckResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ServiceController: std::fmt::Debug + Send + Sync {
     fn report(
         &self,
         _req: crate::model::ReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReportResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReportResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/api/servicecontrol/v2/src/stub/dynamic.rs b/src/generated/api/servicecontrol/v2/src/stub/dynamic.rs
index 87a9f2c68e..ed534b3127 100644
--- a/src/generated/api/servicecontrol/v2/src/stub/dynamic.rs
+++ b/src/generated/api/servicecontrol/v2/src/stub/dynamic.rs
@@ -20,14 +20,14 @@ pub trait ServiceController: std::fmt::Debug + Send + Sync {
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckResponse>>;
 
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportResponse>>;
 }
 
 /// All implementations of [super::ServiceController] also implement [ServiceController].
@@ -37,8 +37,8 @@ impl<T: super::ServiceController> ServiceController for T {
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckResponse>> {
         T::check(self, req, options).await
     }
 
@@ -46,8 +46,8 @@ impl<T: super::ServiceController> ServiceController for T {
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportResponse>> {
         T::report(self, req, options).await
     }
 }
diff --git a/src/generated/api/servicecontrol/v2/src/tracing.rs b/src/generated/api/servicecontrol/v2/src/tracing.rs
index 6332498751..845168b1cf 100644
--- a/src/generated/api/servicecontrol/v2/src/tracing.rs
+++ b/src/generated/api/servicecontrol/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckResponse>> {
         self.inner.check(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportResponse>> {
         self.inner.report(req, options).await
     }
 }
diff --git a/src/generated/api/servicecontrol/v2/src/transport.rs b/src/generated/api/servicecontrol/v2/src/transport.rs
index 6402b93222..0e9f6673bb 100644
--- a/src/generated/api/servicecontrol/v2/src/transport.rs
+++ b/src/generated/api/servicecontrol/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ServiceController](super::stub::ServiceController) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ServiceController {
 }
 
 impl ServiceController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ServiceController for ServiceController {
     async fn check(
         &self,
         req: crate::model::CheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76,9 +76,9 @@ impl super::stub::ServiceController for ServiceController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -93,13 +93,13 @@ impl super::stub::ServiceController for ServiceController {
     async fn report(
         &self,
         req: crate::model::ReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -126,9 +126,9 @@ impl super::stub::ServiceController for ServiceController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/api/servicemanagement/v1/Cargo.toml b/src/generated/api/servicemanagement/v1/Cargo.toml
index e434db9599..889c154a4f 100644
--- a/src/generated/api/servicemanagement/v1/Cargo.toml
+++ b/src/generated/api/servicemanagement/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace         = true
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/api/servicemanagement/v1/src/builder.rs b/src/generated/api/servicemanagement/v1/src/builder.rs
index 8881f97075..d8d844da33 100644
--- a/src/generated/api/servicemanagement/v1/src/builder.rs
+++ b/src/generated/api/servicemanagement/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod service_manager {
     /// A builder for [ServiceManager][crate::client::ServiceManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicemanagement_v1::*;
     /// # use builder::service_manager::ClientBuilder;
     /// # use client::ServiceManager;
@@ -30,19 +30,18 @@ pub mod service_manager {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ServiceManager;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ServiceManager;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod service_manager {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ServiceManager>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod service_manager {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::ListServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod service_manager {
             (*self.0.stub)
                 .list_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServicesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListServicesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod service_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListServicesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListServicesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -172,8 +173,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -183,7 +184,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::GetService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -211,7 +212,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -221,7 +222,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .get_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::GetServiceRequest::service_name].
@@ -234,8 +235,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -245,7 +246,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::CreateService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -274,7 +275,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -289,7 +290,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .create_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service`.
@@ -306,7 +307,7 @@ pub mod service_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -357,8 +358,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -368,7 +369,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::DeleteService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -397,7 +398,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -412,7 +413,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .delete_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service`.
@@ -424,7 +425,7 @@ pub mod service_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -461,8 +462,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -472,7 +473,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::UndeleteService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -501,7 +502,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -516,7 +517,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .undelete_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undelete_service`.
@@ -535,7 +536,7 @@ pub mod service_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -572,8 +573,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeleteService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeleteService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -583,8 +584,8 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::ListServiceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -618,7 +619,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -628,14 +629,16 @@ pub mod service_manager {
             (*self.0.stub)
                 .list_service_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServiceConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListServiceConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -643,17 +646,17 @@ pub mod service_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -679,8 +682,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -690,7 +693,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::GetServiceConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -721,7 +724,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -731,7 +734,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .get_service_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::GetServiceConfigRequest::service_name].
@@ -761,8 +764,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -772,7 +775,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::CreateServiceConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -803,7 +806,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -813,7 +816,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .create_service_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::CreateServiceConfigRequest::service_name].
@@ -848,8 +851,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateServiceConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateServiceConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -859,7 +862,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::SubmitConfigSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -891,7 +894,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -906,7 +909,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .submit_config_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `submit_config_source`.
@@ -925,7 +928,7 @@ pub mod service_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -990,8 +993,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubmitConfigSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubmitConfigSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1001,8 +1004,8 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::ListServiceRollouts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1036,7 +1039,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1046,14 +1049,16 @@ pub mod service_manager {
             (*self.0.stub)
                 .list_service_rollouts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServiceRolloutsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListServiceRolloutsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1061,17 +1066,17 @@ pub mod service_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceRolloutsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1105,8 +1110,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceRollouts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceRollouts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1116,7 +1121,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::GetServiceRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1147,7 +1152,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1157,7 +1162,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .get_service_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [service_name][crate::model::GetServiceRolloutRequest::service_name].
@@ -1178,8 +1183,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1189,7 +1194,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::CreateServiceRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1221,7 +1226,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1236,7 +1241,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .create_service_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service_rollout`.
@@ -1253,7 +1258,7 @@ pub mod service_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1312,8 +1317,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateServiceRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateServiceRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1323,7 +1328,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::GenerateConfigReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1354,7 +1359,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1364,7 +1369,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .generate_config_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [new_config][crate::model::GenerateConfigReportRequest::new_config].
@@ -1409,8 +1414,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateConfigReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateConfigReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1420,7 +1425,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1451,7 +1456,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1461,7 +1466,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1514,8 +1519,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1525,7 +1530,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1556,7 +1561,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1566,7 +1571,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1597,8 +1602,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1608,7 +1613,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1641,7 +1646,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1651,7 +1656,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1677,8 +1682,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1688,8 +1693,8 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1725,7 +1730,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1735,15 +1740,15 @@ pub mod service_manager {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1752,17 +1757,17 @@ pub mod service_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1798,8 +1803,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1809,7 +1814,7 @@ pub mod service_manager {
     /// # Example
     /// ```
     /// # use google_cloud_api_servicemanagement_v1::builder::service_manager::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_servicemanagement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1840,7 +1845,7 @@ pub mod service_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1850,7 +1855,7 @@ pub mod service_manager {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1861,8 +1866,8 @@ pub mod service_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/api/servicemanagement/v1/src/client.rs b/src/generated/api/servicemanagement/v1/src/client.rs
index 54be9d9458..394e86fdb7 100644
--- a/src/generated/api/servicemanagement/v1/src/client.rs
+++ b/src/generated/api/servicemanagement/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_api_servicemanagement_v1::client::ServiceManager;
 /// let client = ServiceManager::builder().build().await?;
 /// // use `client` to make requests to the Service Management API.
@@ -67,13 +67,13 @@ impl ServiceManager {
     /// Returns a builder for [ServiceManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_servicemanagement_v1::client::ServiceManager;
     /// let client = ServiceManager::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::service_manager::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::service_manager::client::Factory)
+        crate::new_client_builder(super::builder::service_manager::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl ServiceManager {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ServiceManager>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ServiceManager>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl ServiceManager {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceManager> {
         super::transport::ServiceManager::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceManager> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ServiceManager::new)
diff --git a/src/generated/api/servicemanagement/v1/src/lib.rs b/src/generated/api/servicemanagement/v1/src/lib.rs
index 83e31f4f4c..f3a70b07a8 100644
--- a/src/generated/api/servicemanagement/v1/src/lib.rs
+++ b/src/generated/api/servicemanagement/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/api/servicemanagement/v1/src/model.rs b/src/generated/api/servicemanagement/v1/src/model.rs
index be550ebe79..6f88d26e70 100644
--- a/src/generated/api/servicemanagement/v1/src/model.rs
+++ b/src/generated/api/servicemanagement/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1681,7 +1681,7 @@ impl wkt::message::Message for ListServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServicesResponse {
     type PageItem = crate::model::ManagedService;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2245,7 +2245,7 @@ impl wkt::message::Message for ListServiceConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServiceConfigsResponse {
     type PageItem = google_cloud_api::model::Service;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2697,7 +2697,7 @@ impl wkt::message::Message for ListServiceRolloutsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceRolloutsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServiceRolloutsResponse {
     type PageItem = crate::model::Rollout;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/api/servicemanagement/v1/src/stub.rs b/src/generated/api/servicemanagement/v1/src/stub.rs
index 32614297c7..2d5a3b50f0 100644
--- a/src/generated/api/servicemanagement/v1/src/stub.rs
+++ b/src/generated/api/servicemanagement/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn list_services(
         &self,
         _req: crate::model::ListServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn get_service(
         &self,
         _req: crate::model::GetServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ManagedService>>,
+        Output = crate::Result<crate::Response<crate::model::ManagedService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn create_service(
         &self,
         _req: crate::model::CreateServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn delete_service(
         &self,
         _req: crate::model::DeleteServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn undelete_service(
         &self,
         _req: crate::model::UndeleteServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn list_service_configs(
         &self,
         _req: crate::model::ListServiceConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServiceConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServiceConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +108,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn get_service_config(
         &self,
         _req: crate::model::GetServiceConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::Service>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::Service>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +119,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn create_service_config(
         &self,
         _req: crate::model::CreateServiceConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::Service>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::Service>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +130,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn submit_config_source(
         &self,
         _req: crate::model::SubmitConfigSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +141,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn list_service_rollouts(
         &self,
         _req: crate::model::ListServiceRolloutsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServiceRolloutsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServiceRolloutsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,10 +152,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn get_service_rollout(
         &self,
         _req: crate::model::GetServiceRolloutRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Rollout>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Rollout>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -163,9 +162,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn create_service_rollout(
         &self,
         _req: crate::model::CreateServiceRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +173,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn generate_config_report(
         &self,
         _req: crate::model::GenerateConfigReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateConfigReportResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateConfigReportResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,9 +184,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -196,9 +195,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,10 +206,10 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -220,10 +219,10 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -233,9 +232,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -246,9 +245,9 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -257,8 +256,8 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/api/servicemanagement/v1/src/stub/dynamic.rs b/src/generated/api/servicemanagement/v1/src/stub/dynamic.rs
index 44ef131dfa..977bb18661 100644
--- a/src/generated/api/servicemanagement/v1/src/stub/dynamic.rs
+++ b/src/generated/api/servicemanagement/v1/src/stub/dynamic.rs
@@ -20,124 +20,120 @@ pub trait ServiceManager: std::fmt::Debug + Send + Sync {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>>;
 
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedService>>;
 
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undelete_service(
         &self,
         req: crate::model::UndeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_service_configs(
         &self,
         req: crate::model::ListServiceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConfigsResponse>>;
 
     async fn get_service_config(
         &self,
         req: crate::model::GetServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::Service>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::Service>>;
 
     async fn create_service_config(
         &self,
         req: crate::model::CreateServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::Service>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::Service>>;
 
     async fn submit_config_source(
         &self,
         req: crate::model::SubmitConfigSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_service_rollouts(
         &self,
         req: crate::model::ListServiceRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceRolloutsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceRolloutsResponse>>;
 
     async fn get_service_rollout(
         &self,
         req: crate::model::GetServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rollout>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rollout>>;
 
     async fn create_service_rollout(
         &self,
         req: crate::model::CreateServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_config_report(
         &self,
         req: crate::model::GenerateConfigReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateConfigReportResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateConfigReportResponse>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ServiceManager] also implement [ServiceManager].
@@ -147,8 +143,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>> {
         T::list_services(self, req, options).await
     }
 
@@ -156,8 +152,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedService>> {
         T::get_service(self, req, options).await
     }
 
@@ -165,8 +161,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service(self, req, options).await
     }
 
@@ -174,8 +170,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service(self, req, options).await
     }
 
@@ -183,8 +179,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn undelete_service(
         &self,
         req: crate::model::UndeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undelete_service(self, req, options).await
     }
 
@@ -192,8 +188,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn list_service_configs(
         &self,
         req: crate::model::ListServiceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConfigsResponse>> {
         T::list_service_configs(self, req, options).await
     }
 
@@ -201,8 +197,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn get_service_config(
         &self,
         req: crate::model::GetServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::Service>> {
         T::get_service_config(self, req, options).await
     }
 
@@ -210,8 +206,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn create_service_config(
         &self,
         req: crate::model::CreateServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::Service>> {
         T::create_service_config(self, req, options).await
     }
 
@@ -219,8 +215,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn submit_config_source(
         &self,
         req: crate::model::SubmitConfigSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::submit_config_source(self, req, options).await
     }
 
@@ -228,8 +224,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn list_service_rollouts(
         &self,
         req: crate::model::ListServiceRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceRolloutsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceRolloutsResponse>> {
         T::list_service_rollouts(self, req, options).await
     }
 
@@ -237,8 +233,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn get_service_rollout(
         &self,
         req: crate::model::GetServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rollout>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rollout>> {
         T::get_service_rollout(self, req, options).await
     }
 
@@ -246,8 +242,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn create_service_rollout(
         &self,
         req: crate::model::CreateServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service_rollout(self, req, options).await
     }
 
@@ -255,8 +251,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn generate_config_report(
         &self,
         req: crate::model::GenerateConfigReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateConfigReportResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateConfigReportResponse>> {
         T::generate_config_report(self, req, options).await
     }
 
@@ -264,8 +260,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -273,8 +269,8 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -282,10 +278,9 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -293,10 +288,9 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -304,22 +298,22 @@ impl<T: super::ServiceManager> ServiceManager for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/api/servicemanagement/v1/src/tracing.rs b/src/generated/api/servicemanagement/v1/src/tracing.rs
index f83b6f891e..5a233ac587 100644
--- a/src/generated/api/servicemanagement/v1/src/tracing.rs
+++ b/src/generated/api/servicemanagement/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         self.inner.list_services(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedService>> {
         self.inner.get_service(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_service(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_service(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn undelete_service(
         &self,
         req: crate::model::UndeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undelete_service(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_service_configs(
         &self,
         req: crate::model::ListServiceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceConfigsResponse>> {
         self.inner.list_service_configs(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_service_config(
         &self,
         req: crate::model::GetServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::Service>> {
         self.inner.get_service_config(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_service_config(
         &self,
         req: crate::model::CreateServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::Service>> {
         self.inner.create_service_config(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn submit_config_source(
         &self,
         req: crate::model::SubmitConfigSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.submit_config_source(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_service_rollouts(
         &self,
         req: crate::model::ListServiceRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceRolloutsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceRolloutsResponse>> {
         self.inner.list_service_rollouts(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_service_rollout(
         &self,
         req: crate::model::GetServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rollout>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rollout>> {
         self.inner.get_service_rollout(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn create_service_rollout(
         &self,
         req: crate::model::CreateServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_service_rollout(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn generate_config_report(
         &self,
         req: crate::model::GenerateConfigReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateConfigReportResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateConfigReportResponse>> {
         self.inner.generate_config_report(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -176,9 +176,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -186,9 +185,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -196,22 +194,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/api/servicemanagement/v1/src/transport.rs b/src/generated/api/servicemanagement/v1/src/transport.rs
index 7b178c9a38..baeca4f84e 100644
--- a/src/generated/api/servicemanagement/v1/src/transport.rs
+++ b/src/generated/api/servicemanagement/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ServiceManager](super::stub::ServiceManager) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ServiceManager {
 }
 
 impl ServiceManager {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,11 +43,11 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/services".to_string();
@@ -66,9 +66,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -83,13 +83,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -116,9 +116,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133,11 +133,11 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/services".to_string();
@@ -152,9 +152,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -169,13 +169,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -202,9 +202,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -219,13 +219,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn undelete_service(
         &self,
         req: crate::model::UndeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252,9 +252,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -269,13 +269,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn list_service_configs(
         &self,
         req: crate::model::ListServiceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -304,9 +304,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -321,13 +321,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn get_service_config(
         &self,
         req: crate::model::GetServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::Service>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::Service>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -390,9 +390,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -407,13 +407,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn create_service_config(
         &self,
         req: crate::model::CreateServiceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::Service>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::Service>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -440,9 +440,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -457,13 +457,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn submit_config_source(
         &self,
         req: crate::model::SubmitConfigSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -490,9 +490,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -507,13 +507,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn list_service_rollouts(
         &self,
         req: crate::model::ListServiceRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceRolloutsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceRolloutsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -543,9 +543,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -560,13 +560,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn get_service_rollout(
         &self,
         req: crate::model::GetServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rollout>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rollout>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -603,9 +603,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -620,13 +620,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn create_service_rollout(
         &self,
         req: crate::model::CreateServiceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -653,9 +653,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -670,11 +670,11 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn generate_config_report(
         &self,
         req: crate::model::GenerateConfigReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateConfigReportResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateConfigReportResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/services:generateConfigReport".to_string();
@@ -689,9 +689,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -706,13 +706,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -772,9 +772,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -789,13 +789,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -855,9 +855,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -872,14 +872,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -939,9 +938,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -956,12 +955,11 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/operations".to_string();
@@ -982,9 +980,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -999,13 +997,13 @@ impl super::stub::ServiceManager for ServiceManager {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1038,9 +1036,9 @@ impl super::stub::ServiceManager for ServiceManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1054,15 +1052,15 @@ impl super::stub::ServiceManager for ServiceManager {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/api/serviceusage/v1/Cargo.toml b/src/generated/api/serviceusage/v1/Cargo.toml
index e1943a94de..9309d694df 100644
--- a/src/generated/api/serviceusage/v1/Cargo.toml
+++ b/src/generated/api/serviceusage/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace         = true
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/api/serviceusage/v1/src/builder.rs b/src/generated/api/serviceusage/v1/src/builder.rs
index a665af8a5c..3363ba8adf 100644
--- a/src/generated/api/serviceusage/v1/src/builder.rs
+++ b/src/generated/api/serviceusage/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod service_usage {
     /// A builder for [ServiceUsage][crate::client::ServiceUsage].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_serviceusage_v1::*;
     /// # use builder::service_usage::ClientBuilder;
     /// # use client::ServiceUsage;
@@ -30,19 +30,18 @@ pub mod service_usage {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ServiceUsage;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ServiceUsage;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod service_usage {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ServiceUsage>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod service_usage {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::EnableService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -105,7 +104,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120,7 +119,7 @@ pub mod service_usage {
             (*self.0.stub)
                 .enable_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_service`.
@@ -139,7 +138,7 @@ pub mod service_usage {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -174,8 +173,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnableService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnableService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -185,7 +184,7 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::DisableService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -214,7 +213,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -229,7 +228,7 @@ pub mod service_usage {
             (*self.0.stub)
                 .disable_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_service`.
@@ -248,7 +247,7 @@ pub mod service_usage {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -300,8 +299,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisableService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisableService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -311,7 +310,7 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::GetService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -339,7 +338,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -349,7 +348,7 @@ pub mod service_usage {
             (*self.0.stub)
                 .get_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceRequest::name].
@@ -360,8 +359,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -371,8 +370,8 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::ListServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -403,7 +402,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -413,13 +412,13 @@ pub mod service_usage {
             (*self.0.stub)
                 .list_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServicesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListServicesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -428,15 +427,17 @@ pub mod service_usage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListServicesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListServicesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -466,8 +467,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -477,7 +478,7 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::BatchEnableServices;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -509,7 +510,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -524,7 +525,7 @@ pub mod service_usage {
             (*self.0.stub)
                 .batch_enable_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_enable_services`.
@@ -543,7 +544,7 @@ pub mod service_usage {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -589,8 +590,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchEnableServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchEnableServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -600,7 +601,7 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::BatchGetServices;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -631,7 +632,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -641,7 +642,7 @@ pub mod service_usage {
             (*self.0.stub)
                 .batch_get_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchGetServicesRequest::parent].
@@ -663,8 +664,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchGetServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchGetServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -674,8 +675,8 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -711,7 +712,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -721,15 +722,15 @@ pub mod service_usage {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -738,17 +739,17 @@ pub mod service_usage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -784,8 +785,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -795,7 +796,7 @@ pub mod service_usage {
     /// # Example
     /// ```
     /// # use google_cloud_api_serviceusage_v1::builder::service_usage::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_api_serviceusage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -826,7 +827,7 @@ pub mod service_usage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -836,7 +837,7 @@ pub mod service_usage {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -847,8 +848,8 @@ pub mod service_usage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/api/serviceusage/v1/src/client.rs b/src/generated/api/serviceusage/v1/src/client.rs
index 2672e45237..4eac17c1cb 100644
--- a/src/generated/api/serviceusage/v1/src/client.rs
+++ b/src/generated/api/serviceusage/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_api_serviceusage_v1::client::ServiceUsage;
 /// let client = ServiceUsage::builder().build().await?;
 /// // use `client` to make requests to the Service Usage API.
@@ -70,13 +70,13 @@ impl ServiceUsage {
     /// Returns a builder for [ServiceUsage].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_api_serviceusage_v1::client::ServiceUsage;
     /// let client = ServiceUsage::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::service_usage::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::service_usage::client::Factory)
+        crate::new_client_builder(super::builder::service_usage::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -94,14 +94,14 @@ impl ServiceUsage {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ServiceUsage>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ServiceUsage>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -110,13 +110,13 @@ impl ServiceUsage {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceUsage> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceUsage> {
         super::transport::ServiceUsage::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceUsage> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceUsage> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ServiceUsage::new)
diff --git a/src/generated/api/serviceusage/v1/src/lib.rs b/src/generated/api/serviceusage/v1/src/lib.rs
index 0f642ae193..9bd5b3a764 100644
--- a/src/generated/api/serviceusage/v1/src/lib.rs
+++ b/src/generated/api/serviceusage/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/api/serviceusage/v1/src/model.rs b/src/generated/api/serviceusage/v1/src/model.rs
index 973f89754a..630b1a233f 100644
--- a/src/generated/api/serviceusage/v1/src/model.rs
+++ b/src/generated/api/serviceusage/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -1069,7 +1069,7 @@ impl wkt::message::Message for ListServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServicesResponse {
     type PageItem = crate::model::Service;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/api/serviceusage/v1/src/stub.rs b/src/generated/api/serviceusage/v1/src/stub.rs
index cfa5530062..6087a6cd2b 100644
--- a/src/generated/api/serviceusage/v1/src/stub.rs
+++ b/src/generated/api/serviceusage/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn enable_service(
         &self,
         _req: crate::model::EnableServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn disable_service(
         &self,
         _req: crate::model::DisableServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +64,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn get_service(
         &self,
         _req: crate::model::GetServiceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Service>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Service>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +74,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn list_services(
         &self,
         _req: crate::model::ListServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn batch_enable_services(
         &self,
         _req: crate::model::BatchEnableServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn batch_get_services(
         &self,
         _req: crate::model::BatchGetServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BatchGetServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::BatchGetServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +107,10 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -121,9 +120,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +133,9 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -145,8 +144,8 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/api/serviceusage/v1/src/stub/dynamic.rs b/src/generated/api/serviceusage/v1/src/stub/dynamic.rs
index 2a134b036e..e68d4a06ab 100644
--- a/src/generated/api/serviceusage/v1/src/stub/dynamic.rs
+++ b/src/generated/api/serviceusage/v1/src/stub/dynamic.rs
@@ -20,62 +20,60 @@ pub trait ServiceUsage: std::fmt::Debug + Send + Sync {
     async fn enable_service(
         &self,
         req: crate::model::EnableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn disable_service(
         &self,
         req: crate::model::DisableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>>;
 
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>>;
 
     async fn batch_enable_services(
         &self,
         req: crate::model::BatchEnableServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_get_services(
         &self,
         req: crate::model::BatchGetServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetServicesResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ServiceUsage] also implement [ServiceUsage].
@@ -85,8 +83,8 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn enable_service(
         &self,
         req: crate::model::EnableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::enable_service(self, req, options).await
     }
 
@@ -94,8 +92,8 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn disable_service(
         &self,
         req: crate::model::DisableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::disable_service(self, req, options).await
     }
 
@@ -103,8 +101,8 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>> {
         T::get_service(self, req, options).await
     }
 
@@ -112,8 +110,8 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>> {
         T::list_services(self, req, options).await
     }
 
@@ -121,8 +119,8 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn batch_enable_services(
         &self,
         req: crate::model::BatchEnableServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_enable_services(self, req, options).await
     }
 
@@ -130,8 +128,8 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn batch_get_services(
         &self,
         req: crate::model::BatchGetServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetServicesResponse>> {
         T::batch_get_services(self, req, options).await
     }
 
@@ -139,10 +137,9 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -150,22 +147,22 @@ impl<T: super::ServiceUsage> ServiceUsage for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/api/serviceusage/v1/src/tracing.rs b/src/generated/api/serviceusage/v1/src/tracing.rs
index e2c0414e63..3288a84ea1 100644
--- a/src/generated/api/serviceusage/v1/src/tracing.rs
+++ b/src/generated/api/serviceusage/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn enable_service(
         &self,
         req: crate::model::EnableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.enable_service(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn disable_service(
         &self,
         req: crate::model::DisableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.disable_service(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         self.inner.get_service(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         self.inner.list_services(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn batch_enable_services(
         &self,
         req: crate::model::BatchEnableServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_enable_services(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn batch_get_services(
         &self,
         req: crate::model::BatchGetServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetServicesResponse>> {
         self.inner.batch_get_services(req, options).await
     }
 
@@ -95,9 +95,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -105,22 +104,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/api/serviceusage/v1/src/transport.rs b/src/generated/api/serviceusage/v1/src/transport.rs
index 07a5be63e2..54258d78ec 100644
--- a/src/generated/api/serviceusage/v1/src/transport.rs
+++ b/src/generated/api/serviceusage/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ServiceUsage](super::stub::ServiceUsage) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ServiceUsage {
 }
 
 impl ServiceUsage {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn enable_service(
         &self,
         req: crate::model::EnableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn disable_service(
         &self,
         req: crate::model::DisableServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -212,9 +212,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -229,13 +229,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -273,9 +273,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -290,13 +290,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn batch_enable_services(
         &self,
         req: crate::model::BatchEnableServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -331,9 +331,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -348,13 +348,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn batch_get_services(
         &self,
         req: crate::model::BatchGetServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -393,9 +393,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -410,12 +410,11 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/operations".to_string();
@@ -436,9 +435,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -453,13 +452,13 @@ impl super::stub::ServiceUsage for ServiceUsage {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -486,9 +485,9 @@ impl super::stub::ServiceUsage for ServiceUsage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -502,15 +501,15 @@ impl super::stub::ServiceUsage for ServiceUsage {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/appengine/v1/Cargo.toml b/src/generated/appengine/v1/Cargo.toml
index 4fb0dc54f7..e8b8c02bb0 100644
--- a/src/generated/appengine/v1/Cargo.toml
+++ b/src/generated/appengine/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/appengine/v1/src/builder.rs b/src/generated/appengine/v1/src/builder.rs
index d858037212..07aed8ec48 100644
--- a/src/generated/appengine/v1/src/builder.rs
+++ b/src/generated/appengine/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod applications {
     /// A builder for [Applications][crate::client::Applications].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::applications::ClientBuilder;
     /// # use client::Applications;
@@ -30,19 +30,18 @@ pub mod applications {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Applications;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Applications;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod applications {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Applications>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod applications {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod applications {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::applications::GetApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod applications {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod applications {
             (*self.0.stub)
                 .get_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApplicationRequest::name].
@@ -125,8 +124,8 @@ pub mod applications {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -136,7 +135,7 @@ pub mod applications {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::applications::CreateApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -168,7 +167,7 @@ pub mod applications {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -183,7 +182,7 @@ pub mod applications {
             (*self.0.stub)
                 .create_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_application`.
@@ -200,7 +199,7 @@ pub mod applications {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -247,8 +246,8 @@ pub mod applications {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -258,7 +257,7 @@ pub mod applications {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::applications::UpdateApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -290,7 +289,7 @@ pub mod applications {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -305,7 +304,7 @@ pub mod applications {
             (*self.0.stub)
                 .update_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_application`.
@@ -322,7 +321,7 @@ pub mod applications {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -393,8 +392,8 @@ pub mod applications {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -404,7 +403,7 @@ pub mod applications {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::applications::RepairApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -436,7 +435,7 @@ pub mod applications {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -451,7 +450,7 @@ pub mod applications {
             (*self.0.stub)
                 .repair_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `repair_application`.
@@ -468,7 +467,7 @@ pub mod applications {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -503,8 +502,8 @@ pub mod applications {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RepairApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RepairApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -514,8 +513,8 @@ pub mod applications {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::applications::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -551,7 +550,7 @@ pub mod applications {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -561,15 +560,15 @@ pub mod applications {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -578,17 +577,17 @@ pub mod applications {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -624,8 +623,8 @@ pub mod applications {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -635,7 +634,7 @@ pub mod applications {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::applications::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -666,7 +665,7 @@ pub mod applications {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -676,7 +675,7 @@ pub mod applications {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -687,8 +686,8 @@ pub mod applications {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -700,7 +699,7 @@ pub mod services {
     /// A builder for [Services][crate::client::Services].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::services::ClientBuilder;
     /// # use client::Services;
@@ -710,19 +709,18 @@ pub mod services {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Services;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Services;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -733,7 +731,7 @@ pub mod services {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Services>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -744,7 +742,7 @@ pub mod services {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -754,8 +752,8 @@ pub mod services {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::services::ListServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -784,7 +782,7 @@ pub mod services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -794,13 +792,13 @@ pub mod services {
             (*self.0.stub)
                 .list_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServicesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListServicesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -809,15 +807,17 @@ pub mod services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListServicesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListServicesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -841,8 +841,8 @@ pub mod services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -852,7 +852,7 @@ pub mod services {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::services::GetService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -878,7 +878,7 @@ pub mod services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -888,7 +888,7 @@ pub mod services {
             (*self.0.stub)
                 .get_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceRequest::name].
@@ -899,8 +899,8 @@ pub mod services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -910,7 +910,7 @@ pub mod services {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::services::UpdateService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -937,7 +937,7 @@ pub mod services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -952,7 +952,7 @@ pub mod services {
             (*self.0.stub)
                 .update_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_service`.
@@ -969,7 +969,7 @@ pub mod services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1046,8 +1046,8 @@ pub mod services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1057,7 +1057,7 @@ pub mod services {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::services::DeleteService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1084,7 +1084,7 @@ pub mod services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1099,7 +1099,7 @@ pub mod services {
             (*self.0.stub)
                 .delete_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service`.
@@ -1115,7 +1115,7 @@ pub mod services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1150,8 +1150,8 @@ pub mod services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1161,8 +1161,8 @@ pub mod services {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::services::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1196,7 +1196,7 @@ pub mod services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1206,15 +1206,15 @@ pub mod services {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1223,17 +1223,17 @@ pub mod services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1269,8 +1269,8 @@ pub mod services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1280,7 +1280,7 @@ pub mod services {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::services::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1309,7 +1309,7 @@ pub mod services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1319,7 +1319,7 @@ pub mod services {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1330,8 +1330,8 @@ pub mod services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1343,7 +1343,7 @@ pub mod versions {
     /// A builder for [Versions][crate::client::Versions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::versions::ClientBuilder;
     /// # use client::Versions;
@@ -1353,19 +1353,18 @@ pub mod versions {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Versions;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Versions;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1376,7 +1375,7 @@ pub mod versions {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Versions>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1387,7 +1386,7 @@ pub mod versions {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1397,8 +1396,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::ListVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1427,7 +1426,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1437,13 +1436,13 @@ pub mod versions {
             (*self.0.stub)
                 .list_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVersionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVersionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1452,15 +1451,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVersionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVersionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1490,8 +1491,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1501,7 +1502,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::GetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1527,7 +1528,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1537,7 +1538,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVersionRequest::name].
@@ -1554,8 +1555,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1565,7 +1566,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::CreateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1592,7 +1593,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1607,7 +1608,7 @@ pub mod versions {
             (*self.0.stub)
                 .create_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_version`.
@@ -1624,7 +1625,7 @@ pub mod versions {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1677,8 +1678,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1688,7 +1689,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::UpdateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1715,7 +1716,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1730,7 +1731,7 @@ pub mod versions {
             (*self.0.stub)
                 .update_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_version`.
@@ -1747,7 +1748,7 @@ pub mod versions {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1818,8 +1819,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1829,7 +1830,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::DeleteVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1856,7 +1857,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1871,7 +1872,7 @@ pub mod versions {
             (*self.0.stub)
                 .delete_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_version`.
@@ -1887,7 +1888,7 @@ pub mod versions {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1922,8 +1923,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1933,8 +1934,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1968,7 +1969,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1978,15 +1979,15 @@ pub mod versions {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1995,17 +1996,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2041,8 +2042,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2052,7 +2053,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::versions::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2081,7 +2082,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2091,7 +2092,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2102,8 +2103,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2115,7 +2116,7 @@ pub mod instances {
     /// A builder for [Instances][crate::client::Instances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::instances::ClientBuilder;
     /// # use client::Instances;
@@ -2125,19 +2126,18 @@ pub mod instances {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Instances;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Instances;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2148,7 +2148,7 @@ pub mod instances {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Instances>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2161,7 +2161,7 @@ pub mod instances {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2171,8 +2171,8 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::instances::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2203,7 +2203,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2213,13 +2213,13 @@ pub mod instances {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2228,15 +2228,17 @@ pub mod instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2260,8 +2262,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2271,7 +2273,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::instances::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2299,7 +2301,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2309,7 +2311,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -2320,8 +2322,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2331,7 +2333,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::instances::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2360,7 +2362,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2375,7 +2377,7 @@ pub mod instances {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -2391,7 +2393,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2426,8 +2428,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2437,7 +2439,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::instances::DebugInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2466,7 +2468,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2481,7 +2483,7 @@ pub mod instances {
             (*self.0.stub)
                 .debug_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `debug_instance`.
@@ -2498,7 +2500,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2539,8 +2541,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DebugInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DebugInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2550,8 +2552,8 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::instances::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2587,7 +2589,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2597,15 +2599,15 @@ pub mod instances {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2614,17 +2616,17 @@ pub mod instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2660,8 +2662,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2671,7 +2673,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::instances::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2702,7 +2704,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2712,7 +2714,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2723,8 +2725,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2736,7 +2738,7 @@ pub mod firewall {
     /// A builder for [Firewall][crate::client::Firewall].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::firewall::ClientBuilder;
     /// # use client::Firewall;
@@ -2746,19 +2748,18 @@ pub mod firewall {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Firewall;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Firewall;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2769,7 +2770,7 @@ pub mod firewall {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Firewall>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2780,7 +2781,7 @@ pub mod firewall {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2790,8 +2791,8 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::ListIngressRules;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2823,7 +2824,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2833,14 +2834,16 @@ pub mod firewall {
             (*self.0.stub)
                 .list_ingress_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListIngressRulesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListIngressRulesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2848,15 +2851,17 @@ pub mod firewall {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListIngressRulesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListIngressRulesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2886,8 +2891,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIngressRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIngressRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2897,7 +2902,7 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::BatchUpdateIngressRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2928,7 +2933,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2938,7 +2943,7 @@ pub mod firewall {
             (*self.0.stub)
                 .batch_update_ingress_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::BatchUpdateIngressRulesRequest::name].
@@ -2960,8 +2965,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchUpdateIngressRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchUpdateIngressRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2971,7 +2976,7 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::CreateIngressRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3000,7 +3005,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3010,7 +3015,7 @@ pub mod firewall {
             (*self.0.stub)
                 .create_ingress_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIngressRuleRequest::parent].
@@ -3039,8 +3044,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIngressRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIngressRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3050,7 +3055,7 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::GetIngressRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3076,7 +3081,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3086,7 +3091,7 @@ pub mod firewall {
             (*self.0.stub)
                 .get_ingress_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIngressRuleRequest::name].
@@ -3097,8 +3102,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIngressRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIngressRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3108,7 +3113,7 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::UpdateIngressRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3137,7 +3142,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3147,7 +3152,7 @@ pub mod firewall {
             (*self.0.stub)
                 .update_ingress_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateIngressRuleRequest::name].
@@ -3194,8 +3199,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIngressRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIngressRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3205,7 +3210,7 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::DeleteIngressRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3234,7 +3239,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3244,7 +3249,7 @@ pub mod firewall {
             (*self.0.stub)
                 .delete_ingress_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIngressRuleRequest::name].
@@ -3255,8 +3260,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIngressRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIngressRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3266,8 +3271,8 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3301,7 +3306,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3311,15 +3316,15 @@ pub mod firewall {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3328,17 +3333,17 @@ pub mod firewall {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3374,8 +3379,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3385,7 +3390,7 @@ pub mod firewall {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::firewall::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3414,7 +3419,7 @@ pub mod firewall {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3424,7 +3429,7 @@ pub mod firewall {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3435,8 +3440,8 @@ pub mod firewall {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3448,7 +3453,7 @@ pub mod authorized_domains {
     /// A builder for [AuthorizedDomains][crate::client::AuthorizedDomains].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::authorized_domains::ClientBuilder;
     /// # use client::AuthorizedDomains;
@@ -3458,19 +3463,18 @@ pub mod authorized_domains {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AuthorizedDomains;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AuthorizedDomains;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3481,7 +3485,7 @@ pub mod authorized_domains {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AuthorizedDomains>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3494,7 +3498,7 @@ pub mod authorized_domains {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3504,8 +3508,8 @@ pub mod authorized_domains {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_domains::ListAuthorizedDomains;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3539,7 +3543,7 @@ pub mod authorized_domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3549,14 +3553,16 @@ pub mod authorized_domains {
             (*self.0.stub)
                 .list_authorized_domains(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAuthorizedDomainsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAuthorizedDomainsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3564,17 +3570,17 @@ pub mod authorized_domains {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAuthorizedDomainsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3598,8 +3604,8 @@ pub mod authorized_domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAuthorizedDomains {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAuthorizedDomains {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3609,8 +3615,8 @@ pub mod authorized_domains {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_domains::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3646,7 +3652,7 @@ pub mod authorized_domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3656,15 +3662,15 @@ pub mod authorized_domains {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3673,17 +3679,17 @@ pub mod authorized_domains {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3719,8 +3725,8 @@ pub mod authorized_domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3730,7 +3736,7 @@ pub mod authorized_domains {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_domains::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3761,7 +3767,7 @@ pub mod authorized_domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3771,7 +3777,7 @@ pub mod authorized_domains {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3782,8 +3788,8 @@ pub mod authorized_domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3795,7 +3801,7 @@ pub mod authorized_certificates {
     /// A builder for [AuthorizedCertificates][crate::client::AuthorizedCertificates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::authorized_certificates::ClientBuilder;
     /// # use client::AuthorizedCertificates;
@@ -3805,19 +3811,18 @@ pub mod authorized_certificates {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AuthorizedCertificates;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AuthorizedCertificates;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3828,7 +3833,7 @@ pub mod authorized_certificates {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AuthorizedCertificates>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3841,7 +3846,7 @@ pub mod authorized_certificates {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3851,8 +3856,8 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::ListAuthorizedCertificates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3888,7 +3893,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3898,15 +3903,15 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .list_authorized_certificates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListAuthorizedCertificatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3915,17 +3920,17 @@ pub mod authorized_certificates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAuthorizedCertificatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3955,8 +3960,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAuthorizedCertificates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAuthorizedCertificates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3966,7 +3971,7 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::GetAuthorizedCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3999,7 +4004,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4009,7 +4014,7 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .get_authorized_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAuthorizedCertificateRequest::name].
@@ -4026,8 +4031,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAuthorizedCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAuthorizedCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4037,7 +4042,7 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::CreateAuthorizedCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4070,7 +4075,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4080,7 +4085,7 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .create_authorized_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAuthorizedCertificateRequest::parent].
@@ -4109,8 +4114,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAuthorizedCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAuthorizedCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4120,7 +4125,7 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::UpdateAuthorizedCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4153,7 +4158,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4163,7 +4168,7 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .update_authorized_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateAuthorizedCertificateRequest::name].
@@ -4210,8 +4215,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAuthorizedCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAuthorizedCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4221,7 +4226,7 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::DeleteAuthorizedCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4254,7 +4259,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4264,7 +4269,7 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .delete_authorized_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAuthorizedCertificateRequest::name].
@@ -4275,8 +4280,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAuthorizedCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAuthorizedCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4286,8 +4291,8 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4323,7 +4328,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4333,15 +4338,15 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4350,17 +4355,17 @@ pub mod authorized_certificates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4396,8 +4401,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4407,7 +4412,7 @@ pub mod authorized_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::authorized_certificates::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4438,7 +4443,7 @@ pub mod authorized_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4448,7 +4453,7 @@ pub mod authorized_certificates {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4459,8 +4464,8 @@ pub mod authorized_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4472,7 +4477,7 @@ pub mod domain_mappings {
     /// A builder for [DomainMappings][crate::client::DomainMappings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::*;
     /// # use builder::domain_mappings::ClientBuilder;
     /// # use client::DomainMappings;
@@ -4482,19 +4487,18 @@ pub mod domain_mappings {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DomainMappings;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DomainMappings;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4505,7 +4509,7 @@ pub mod domain_mappings {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DomainMappings>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4518,7 +4522,7 @@ pub mod domain_mappings {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4528,8 +4532,8 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::ListDomainMappings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4563,7 +4567,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4573,14 +4577,16 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .list_domain_mappings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDomainMappingsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDomainMappingsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4588,17 +4594,17 @@ pub mod domain_mappings {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDomainMappingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4622,8 +4628,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDomainMappings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDomainMappings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4633,7 +4639,7 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::GetDomainMapping;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4664,7 +4670,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4674,7 +4680,7 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .get_domain_mapping(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDomainMappingRequest::name].
@@ -4685,8 +4691,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDomainMapping {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDomainMapping {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4696,7 +4702,7 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::CreateDomainMapping;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4728,7 +4734,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4743,7 +4749,7 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .create_domain_mapping(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_domain_mapping`.
@@ -4760,7 +4766,7 @@ pub mod domain_mappings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4822,8 +4828,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDomainMapping {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDomainMapping {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4833,7 +4839,7 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::UpdateDomainMapping;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4865,7 +4871,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4880,7 +4886,7 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .update_domain_mapping(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_domain_mapping`.
@@ -4897,7 +4903,7 @@ pub mod domain_mappings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4968,8 +4974,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDomainMapping {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDomainMapping {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4979,7 +4985,7 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::DeleteDomainMapping;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5011,7 +5017,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5026,7 +5032,7 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .delete_domain_mapping(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_domain_mapping`.
@@ -5042,7 +5048,7 @@ pub mod domain_mappings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5077,8 +5083,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDomainMapping {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDomainMapping {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5088,8 +5094,8 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5125,7 +5131,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5135,15 +5141,15 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5152,17 +5158,17 @@ pub mod domain_mappings {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5198,8 +5204,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5209,7 +5215,7 @@ pub mod domain_mappings {
     /// # Example
     /// ```
     /// # use google_cloud_appengine_v1::builder::domain_mappings::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_appengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5240,7 +5246,7 @@ pub mod domain_mappings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5250,7 +5256,7 @@ pub mod domain_mappings {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5261,8 +5267,8 @@ pub mod domain_mappings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/appengine/v1/src/client.rs b/src/generated/appengine/v1/src/client.rs
index 988837caa1..45c2dfafdf 100644
--- a/src/generated/appengine/v1/src/client.rs
+++ b/src/generated/appengine/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::Applications;
 /// let client = Applications::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -66,13 +66,13 @@ impl Applications {
     /// Returns a builder for [Applications].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::Applications;
     /// let client = Applications::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::applications::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::applications::client::Factory)
+        crate::new_client_builder(super::builder::applications::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Applications {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Applications>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Applications>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Applications {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Applications> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Applications> {
         super::transport::Applications::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Applications> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Applications> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Applications::new)
@@ -207,7 +207,7 @@ impl Applications {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::Services;
 /// let client = Services::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -253,13 +253,13 @@ impl Services {
     /// Returns a builder for [Services].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::Services;
     /// let client = Services::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::services::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::services::client::Factory)
+        crate::new_client_builder(super::builder::services::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -277,14 +277,14 @@ impl Services {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Services>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Services>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -293,13 +293,13 @@ impl Services {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Services> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Services> {
         super::transport::Services::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Services> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Services> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Services::new)
@@ -364,7 +364,7 @@ impl Services {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::Versions;
 /// let client = Versions::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -410,13 +410,13 @@ impl Versions {
     /// Returns a builder for [Versions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::Versions;
     /// let client = Versions::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::versions::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::versions::client::Factory)
+        crate::new_client_builder(super::builder::versions::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -434,14 +434,14 @@ impl Versions {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Versions>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Versions>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -450,13 +450,13 @@ impl Versions {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Versions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Versions> {
         super::transport::Versions::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Versions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Versions> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Versions::new)
@@ -573,7 +573,7 @@ impl Versions {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::Instances;
 /// let client = Instances::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -619,13 +619,13 @@ impl Instances {
     /// Returns a builder for [Instances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::Instances;
     /// let client = Instances::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instances::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::instances::client::Factory)
+        crate::new_client_builder(super::builder::instances::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -643,14 +643,14 @@ impl Instances {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Instances>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Instances>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -659,13 +659,13 @@ impl Instances {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Instances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Instances> {
         super::transport::Instances::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Instances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Instances> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Instances::new)
@@ -751,7 +751,7 @@ impl Instances {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::Firewall;
 /// let client = Firewall::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -806,13 +806,13 @@ impl Firewall {
     /// Returns a builder for [Firewall].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::Firewall;
     /// let client = Firewall::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::firewall::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::firewall::client::Factory)
+        crate::new_client_builder(super::builder::firewall::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -830,14 +830,14 @@ impl Firewall {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Firewall>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Firewall>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -846,13 +846,13 @@ impl Firewall {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Firewall> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Firewall> {
         super::transport::Firewall::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Firewall> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Firewall> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Firewall::new)
@@ -911,7 +911,7 @@ impl Firewall {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::AuthorizedDomains;
 /// let client = AuthorizedDomains::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -959,15 +959,13 @@ impl AuthorizedDomains {
     /// Returns a builder for [AuthorizedDomains].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::AuthorizedDomains;
     /// let client = AuthorizedDomains::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::authorized_domains::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::authorized_domains::client::Factory,
-        )
+        crate::new_client_builder(super::builder::authorized_domains::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -985,14 +983,14 @@ impl AuthorizedDomains {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AuthorizedDomains>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AuthorizedDomains>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1002,13 +1000,13 @@ impl AuthorizedDomains {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AuthorizedDomains> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AuthorizedDomains> {
         super::transport::AuthorizedDomains::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AuthorizedDomains> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AuthorizedDomains> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AuthorizedDomains::new)
@@ -1040,7 +1038,7 @@ impl AuthorizedDomains {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::AuthorizedCertificates;
 /// let client = AuthorizedCertificates::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -1087,15 +1085,13 @@ impl AuthorizedCertificates {
     /// Returns a builder for [AuthorizedCertificates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::AuthorizedCertificates;
     /// let client = AuthorizedCertificates::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::authorized_certificates::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::authorized_certificates::client::Factory,
-        )
+        crate::new_client_builder(super::builder::authorized_certificates::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1113,14 +1109,14 @@ impl AuthorizedCertificates {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AuthorizedCertificates>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AuthorizedCertificates>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1130,13 +1126,13 @@ impl AuthorizedCertificates {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AuthorizedCertificates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AuthorizedCertificates> {
         super::transport::AuthorizedCertificates::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AuthorizedCertificates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AuthorizedCertificates> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AuthorizedCertificates::new)
@@ -1206,7 +1202,7 @@ impl AuthorizedCertificates {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_appengine_v1::client::DomainMappings;
 /// let client = DomainMappings::builder().build().await?;
 /// // use `client` to make requests to the App Engine Admin API.
@@ -1252,13 +1248,13 @@ impl DomainMappings {
     /// Returns a builder for [DomainMappings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_appengine_v1::client::DomainMappings;
     /// let client = DomainMappings::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::domain_mappings::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::domain_mappings::client::Factory)
+        crate::new_client_builder(super::builder::domain_mappings::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1276,14 +1272,14 @@ impl DomainMappings {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DomainMappings>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DomainMappings>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1292,13 +1288,13 @@ impl DomainMappings {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DomainMappings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DomainMappings> {
         super::transport::DomainMappings::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DomainMappings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DomainMappings> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DomainMappings::new)
diff --git a/src/generated/appengine/v1/src/lib.rs b/src/generated/appengine/v1/src/lib.rs
index b6c8b7ffa0..0f54add72a 100644
--- a/src/generated/appengine/v1/src/lib.rs
+++ b/src/generated/appengine/v1/src/lib.rs
@@ -51,8 +51,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -87,3 +87,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/appengine/v1/src/model.rs b/src/generated/appengine/v1/src/model.rs
index 7e4a9f920f..73f1bf78d4 100644
--- a/src/generated/appengine/v1/src/model.rs
+++ b/src/generated/appengine/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -2012,7 +2012,7 @@ impl wkt::message::Message for ListServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServicesResponse {
     type PageItem = crate::model::Service;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2367,7 +2367,7 @@ impl wkt::message::Message for ListVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVersionsResponse {
     type PageItem = crate::model::Version;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2770,7 +2770,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3054,7 +3054,7 @@ impl wkt::message::Message for ListIngressRulesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIngressRulesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIngressRulesResponse {
     type PageItem = crate::model::FirewallRule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3552,7 +3552,7 @@ impl wkt::message::Message for ListAuthorizedDomainsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAuthorizedDomainsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAuthorizedDomainsResponse {
     type PageItem = crate::model::AuthorizedDomain;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3708,7 +3708,9 @@ impl wkt::message::Message for ListAuthorizedCertificatesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAuthorizedCertificatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListAuthorizedCertificatesResponse
+{
     type PageItem = crate::model::AuthorizedCertificate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4113,7 +4115,7 @@ impl wkt::message::Message for ListDomainMappingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDomainMappingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDomainMappingsResponse {
     type PageItem = crate::model::DomainMapping;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/appengine/v1/src/stub.rs b/src/generated/appengine/v1/src/stub.rs
index 90c263e05a..8f5009dd29 100644
--- a/src/generated/appengine/v1/src/stub.rs
+++ b/src/generated/appengine/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     fn get_application(
         &self,
         _req: crate::model::GetApplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Application>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Application>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     fn create_application(
         &self,
         _req: crate::model::CreateApplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +63,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     fn update_application(
         &self,
         _req: crate::model::UpdateApplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     fn repair_application(
         &self,
         _req: crate::model::RepairApplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +85,10 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -99,9 +98,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -112,9 +111,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -123,9 +122,9 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -145,9 +144,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     fn list_services(
         &self,
         _req: crate::model::ListServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,10 +155,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     fn get_service(
         &self,
         _req: crate::model::GetServiceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Service>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Service>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -167,9 +165,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     fn update_service(
         &self,
         _req: crate::model::UpdateServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +176,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     fn delete_service(
         &self,
         _req: crate::model::DeleteServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,10 +187,10 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -202,9 +200,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -215,9 +213,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -226,9 +224,9 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -248,9 +246,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_versions(
         &self,
         _req: crate::model::ListVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -259,10 +257,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_version(
         &self,
         _req: crate::model::GetVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -270,9 +267,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn create_version(
         &self,
         _req: crate::model::CreateVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -281,9 +278,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn update_version(
         &self,
         _req: crate::model::UpdateVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -292,9 +289,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn delete_version(
         &self,
         _req: crate::model::DeleteVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -303,10 +300,10 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -316,9 +313,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -329,9 +326,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -340,9 +337,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -362,9 +359,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -373,10 +370,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -384,9 +380,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -395,9 +391,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn debug_instance(
         &self,
         _req: crate::model::DebugInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -406,10 +402,10 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -419,9 +415,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -432,9 +428,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -443,9 +439,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -465,9 +461,9 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn list_ingress_rules(
         &self,
         _req: crate::model::ListIngressRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIngressRulesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIngressRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -476,11 +472,9 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn batch_update_ingress_rules(
         &self,
         _req: crate::model::BatchUpdateIngressRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::BatchUpdateIngressRulesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::BatchUpdateIngressRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -489,9 +483,9 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn create_ingress_rule(
         &self,
         _req: crate::model::CreateIngressRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -500,9 +494,9 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn get_ingress_rule(
         &self,
         _req: crate::model::GetIngressRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -511,9 +505,9 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn update_ingress_rule(
         &self,
         _req: crate::model::UpdateIngressRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -522,8 +516,8 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn delete_ingress_rule(
         &self,
         _req: crate::model::DeleteIngressRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -531,10 +525,10 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -544,9 +538,9 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -568,11 +562,9 @@ pub trait AuthorizedDomains: std::fmt::Debug + Send + Sync {
     fn list_authorized_domains(
         &self,
         _req: crate::model::ListAuthorizedDomainsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAuthorizedDomainsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAuthorizedDomainsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -581,10 +573,10 @@ pub trait AuthorizedDomains: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -594,9 +586,9 @@ pub trait AuthorizedDomains: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -618,11 +610,9 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn list_authorized_certificates(
         &self,
         _req: crate::model::ListAuthorizedCertificatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAuthorizedCertificatesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAuthorizedCertificatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -631,9 +621,9 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn get_authorized_certificate(
         &self,
         _req: crate::model::GetAuthorizedCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>>,
+        Output = crate::Result<crate::Response<crate::model::AuthorizedCertificate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -642,9 +632,9 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn create_authorized_certificate(
         &self,
         _req: crate::model::CreateAuthorizedCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>>,
+        Output = crate::Result<crate::Response<crate::model::AuthorizedCertificate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -653,9 +643,9 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn update_authorized_certificate(
         &self,
         _req: crate::model::UpdateAuthorizedCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>>,
+        Output = crate::Result<crate::Response<crate::model::AuthorizedCertificate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -664,8 +654,8 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn delete_authorized_certificate(
         &self,
         _req: crate::model::DeleteAuthorizedCertificateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -673,10 +663,10 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -686,9 +676,9 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -710,9 +700,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn list_domain_mappings(
         &self,
         _req: crate::model::ListDomainMappingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDomainMappingsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDomainMappingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -721,9 +711,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn get_domain_mapping(
         &self,
         _req: crate::model::GetDomainMappingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DomainMapping>>,
+        Output = crate::Result<crate::Response<crate::model::DomainMapping>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -732,9 +722,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn create_domain_mapping(
         &self,
         _req: crate::model::CreateDomainMappingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -743,9 +733,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn update_domain_mapping(
         &self,
         _req: crate::model::UpdateDomainMappingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -754,9 +744,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn delete_domain_mapping(
         &self,
         _req: crate::model::DeleteDomainMappingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -765,10 +755,10 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -778,9 +768,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -791,9 +781,9 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -802,8 +792,8 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/appengine/v1/src/stub/dynamic.rs b/src/generated/appengine/v1/src/stub/dynamic.rs
index 21220770d2..9fb1bd5323 100644
--- a/src/generated/appengine/v1/src/stub/dynamic.rs
+++ b/src/generated/appengine/v1/src/stub/dynamic.rs
@@ -20,50 +20,48 @@ pub trait Applications: std::fmt::Debug + Send + Sync {
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Application>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Application>>;
 
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn repair_application(
         &self,
         req: crate::model::RepairApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Applications] also implement [Applications].
@@ -73,8 +71,8 @@ impl<T: super::Applications> Applications for T {
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Application>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Application>> {
         T::get_application(self, req, options).await
     }
 
@@ -82,8 +80,8 @@ impl<T: super::Applications> Applications for T {
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_application(self, req, options).await
     }
 
@@ -91,8 +89,8 @@ impl<T: super::Applications> Applications for T {
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_application(self, req, options).await
     }
 
@@ -100,8 +98,8 @@ impl<T: super::Applications> Applications for T {
     async fn repair_application(
         &self,
         req: crate::model::RepairApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::repair_application(self, req, options).await
     }
 
@@ -109,10 +107,9 @@ impl<T: super::Applications> Applications for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -120,22 +117,22 @@ impl<T: super::Applications> Applications for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -146,50 +143,48 @@ pub trait Services: std::fmt::Debug + Send + Sync {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>>;
 
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>>;
 
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Services] also implement [Services].
@@ -199,8 +194,8 @@ impl<T: super::Services> Services for T {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>> {
         T::list_services(self, req, options).await
     }
 
@@ -208,8 +203,8 @@ impl<T: super::Services> Services for T {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>> {
         T::get_service(self, req, options).await
     }
 
@@ -217,8 +212,8 @@ impl<T: super::Services> Services for T {
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_service(self, req, options).await
     }
 
@@ -226,8 +221,8 @@ impl<T: super::Services> Services for T {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service(self, req, options).await
     }
 
@@ -235,10 +230,9 @@ impl<T: super::Services> Services for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -246,22 +240,22 @@ impl<T: super::Services> Services for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -272,56 +266,54 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>>;
 
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Versions] also implement [Versions].
@@ -331,8 +323,8 @@ impl<T: super::Versions> Versions for T {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>> {
         T::list_versions(self, req, options).await
     }
 
@@ -340,8 +332,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::get_version(self, req, options).await
     }
 
@@ -349,8 +341,8 @@ impl<T: super::Versions> Versions for T {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_version(self, req, options).await
     }
 
@@ -358,8 +350,8 @@ impl<T: super::Versions> Versions for T {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_version(self, req, options).await
     }
 
@@ -367,8 +359,8 @@ impl<T: super::Versions> Versions for T {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_version(self, req, options).await
     }
 
@@ -376,10 +368,9 @@ impl<T: super::Versions> Versions for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -387,22 +378,22 @@ impl<T: super::Versions> Versions for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -413,50 +404,48 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn debug_instance(
         &self,
         req: crate::model::DebugInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Instances] also implement [Instances].
@@ -466,8 +455,8 @@ impl<T: super::Instances> Instances for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -475,8 +464,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -484,8 +473,8 @@ impl<T: super::Instances> Instances for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -493,8 +482,8 @@ impl<T: super::Instances> Instances for T {
     async fn debug_instance(
         &self,
         req: crate::model::DebugInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::debug_instance(self, req, options).await
     }
 
@@ -502,10 +491,9 @@ impl<T: super::Instances> Instances for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -513,22 +501,22 @@ impl<T: super::Instances> Instances for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -539,52 +527,50 @@ pub trait Firewall: std::fmt::Debug + Send + Sync {
     async fn list_ingress_rules(
         &self,
         req: crate::model::ListIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIngressRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIngressRulesResponse>>;
 
     async fn batch_update_ingress_rules(
         &self,
         req: crate::model::BatchUpdateIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchUpdateIngressRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchUpdateIngressRulesResponse>>;
 
     async fn create_ingress_rule(
         &self,
         req: crate::model::CreateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallRule>>;
 
     async fn get_ingress_rule(
         &self,
         req: crate::model::GetIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallRule>>;
 
     async fn update_ingress_rule(
         &self,
         req: crate::model::UpdateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallRule>>;
 
     async fn delete_ingress_rule(
         &self,
         req: crate::model::DeleteIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::Firewall] also implement [Firewall].
@@ -594,8 +580,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn list_ingress_rules(
         &self,
         req: crate::model::ListIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIngressRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIngressRulesResponse>> {
         T::list_ingress_rules(self, req, options).await
     }
 
@@ -603,8 +589,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn batch_update_ingress_rules(
         &self,
         req: crate::model::BatchUpdateIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchUpdateIngressRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchUpdateIngressRulesResponse>> {
         T::batch_update_ingress_rules(self, req, options).await
     }
 
@@ -612,8 +598,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn create_ingress_rule(
         &self,
         req: crate::model::CreateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallRule>> {
         T::create_ingress_rule(self, req, options).await
     }
 
@@ -621,8 +607,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn get_ingress_rule(
         &self,
         req: crate::model::GetIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallRule>> {
         T::get_ingress_rule(self, req, options).await
     }
 
@@ -630,8 +616,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn update_ingress_rule(
         &self,
         req: crate::model::UpdateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallRule>> {
         T::update_ingress_rule(self, req, options).await
     }
 
@@ -639,8 +625,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn delete_ingress_rule(
         &self,
         req: crate::model::DeleteIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_ingress_rule(self, req, options).await
     }
 
@@ -648,10 +634,9 @@ impl<T: super::Firewall> Firewall for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -659,8 +644,8 @@ impl<T: super::Firewall> Firewall for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
@@ -671,22 +656,20 @@ pub trait AuthorizedDomains: std::fmt::Debug + Send + Sync {
     async fn list_authorized_domains(
         &self,
         req: crate::model::ListAuthorizedDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuthorizedDomainsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuthorizedDomainsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::AuthorizedDomains] also implement [AuthorizedDomains].
@@ -696,8 +679,8 @@ impl<T: super::AuthorizedDomains> AuthorizedDomains for T {
     async fn list_authorized_domains(
         &self,
         req: crate::model::ListAuthorizedDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuthorizedDomainsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuthorizedDomainsResponse>> {
         T::list_authorized_domains(self, req, options).await
     }
 
@@ -705,10 +688,9 @@ impl<T: super::AuthorizedDomains> AuthorizedDomains for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -716,8 +698,8 @@ impl<T: super::AuthorizedDomains> AuthorizedDomains for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
@@ -728,46 +710,44 @@ pub trait AuthorizedCertificates: std::fmt::Debug + Send + Sync {
     async fn list_authorized_certificates(
         &self,
         req: crate::model::ListAuthorizedCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuthorizedCertificatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuthorizedCertificatesResponse>>;
 
     async fn get_authorized_certificate(
         &self,
         req: crate::model::GetAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedCertificate>>;
 
     async fn create_authorized_certificate(
         &self,
         req: crate::model::CreateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedCertificate>>;
 
     async fn update_authorized_certificate(
         &self,
         req: crate::model::UpdateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedCertificate>>;
 
     async fn delete_authorized_certificate(
         &self,
         req: crate::model::DeleteAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::AuthorizedCertificates] also implement [AuthorizedCertificates].
@@ -777,9 +757,8 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn list_authorized_certificates(
         &self,
         req: crate::model::ListAuthorizedCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuthorizedCertificatesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuthorizedCertificatesResponse>> {
         T::list_authorized_certificates(self, req, options).await
     }
 
@@ -787,8 +766,8 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn get_authorized_certificate(
         &self,
         req: crate::model::GetAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedCertificate>> {
         T::get_authorized_certificate(self, req, options).await
     }
 
@@ -796,8 +775,8 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn create_authorized_certificate(
         &self,
         req: crate::model::CreateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedCertificate>> {
         T::create_authorized_certificate(self, req, options).await
     }
 
@@ -805,8 +784,8 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn update_authorized_certificate(
         &self,
         req: crate::model::UpdateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedCertificate>> {
         T::update_authorized_certificate(self, req, options).await
     }
 
@@ -814,8 +793,8 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn delete_authorized_certificate(
         &self,
         req: crate::model::DeleteAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_authorized_certificate(self, req, options).await
     }
 
@@ -823,10 +802,9 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -834,8 +812,8 @@ impl<T: super::AuthorizedCertificates> AuthorizedCertificates for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
@@ -846,56 +824,54 @@ pub trait DomainMappings: std::fmt::Debug + Send + Sync {
     async fn list_domain_mappings(
         &self,
         req: crate::model::ListDomainMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDomainMappingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDomainMappingsResponse>>;
 
     async fn get_domain_mapping(
         &self,
         req: crate::model::GetDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DomainMapping>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DomainMapping>>;
 
     async fn create_domain_mapping(
         &self,
         req: crate::model::CreateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_domain_mapping(
         &self,
         req: crate::model::UpdateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_domain_mapping(
         &self,
         req: crate::model::DeleteDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DomainMappings] also implement [DomainMappings].
@@ -905,8 +881,8 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn list_domain_mappings(
         &self,
         req: crate::model::ListDomainMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDomainMappingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDomainMappingsResponse>> {
         T::list_domain_mappings(self, req, options).await
     }
 
@@ -914,8 +890,8 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn get_domain_mapping(
         &self,
         req: crate::model::GetDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DomainMapping>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DomainMapping>> {
         T::get_domain_mapping(self, req, options).await
     }
 
@@ -923,8 +899,8 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn create_domain_mapping(
         &self,
         req: crate::model::CreateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_domain_mapping(self, req, options).await
     }
 
@@ -932,8 +908,8 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn update_domain_mapping(
         &self,
         req: crate::model::UpdateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_domain_mapping(self, req, options).await
     }
 
@@ -941,8 +917,8 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn delete_domain_mapping(
         &self,
         req: crate::model::DeleteDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_domain_mapping(self, req, options).await
     }
 
@@ -950,10 +926,9 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -961,22 +936,22 @@ impl<T: super::DomainMappings> DomainMappings for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/appengine/v1/src/tracing.rs b/src/generated/appengine/v1/src/tracing.rs
index c3a7970f29..3b52ab8856 100644
--- a/src/generated/appengine/v1/src/tracing.rs
+++ b/src/generated/appengine/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Application>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Application>> {
         self.inner.get_application(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_application(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_application(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn repair_application(
         &self,
         req: crate::model::RepairApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.repair_application(req, options).await
     }
 
@@ -77,9 +77,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -87,22 +86,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -133,8 +132,8 @@ where
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         self.inner.list_services(req, options).await
     }
 
@@ -142,8 +141,8 @@ where
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         self.inner.get_service(req, options).await
     }
 
@@ -151,8 +150,8 @@ where
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_service(req, options).await
     }
 
@@ -160,8 +159,8 @@ where
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_service(req, options).await
     }
 
@@ -169,9 +168,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -179,22 +177,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -225,8 +223,8 @@ where
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         self.inner.list_versions(req, options).await
     }
 
@@ -234,8 +232,8 @@ where
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.get_version(req, options).await
     }
 
@@ -243,8 +241,8 @@ where
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_version(req, options).await
     }
 
@@ -252,8 +250,8 @@ where
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_version(req, options).await
     }
 
@@ -261,8 +259,8 @@ where
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_version(req, options).await
     }
 
@@ -270,9 +268,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -280,22 +277,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -326,8 +323,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -335,8 +332,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -344,8 +341,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -353,8 +350,8 @@ where
     async fn debug_instance(
         &self,
         req: crate::model::DebugInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.debug_instance(req, options).await
     }
 
@@ -362,9 +359,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -372,22 +368,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -418,8 +414,8 @@ where
     async fn list_ingress_rules(
         &self,
         req: crate::model::ListIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIngressRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIngressRulesResponse>> {
         self.inner.list_ingress_rules(req, options).await
     }
 
@@ -427,8 +423,8 @@ where
     async fn batch_update_ingress_rules(
         &self,
         req: crate::model::BatchUpdateIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchUpdateIngressRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchUpdateIngressRulesResponse>> {
         self.inner.batch_update_ingress_rules(req, options).await
     }
 
@@ -436,8 +432,8 @@ where
     async fn create_ingress_rule(
         &self,
         req: crate::model::CreateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallRule>> {
         self.inner.create_ingress_rule(req, options).await
     }
 
@@ -445,8 +441,8 @@ where
     async fn get_ingress_rule(
         &self,
         req: crate::model::GetIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallRule>> {
         self.inner.get_ingress_rule(req, options).await
     }
 
@@ -454,8 +450,8 @@ where
     async fn update_ingress_rule(
         &self,
         req: crate::model::UpdateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallRule>> {
         self.inner.update_ingress_rule(req, options).await
     }
 
@@ -463,8 +459,8 @@ where
     async fn delete_ingress_rule(
         &self,
         req: crate::model::DeleteIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_ingress_rule(req, options).await
     }
 
@@ -472,9 +468,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -482,8 +477,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
@@ -514,8 +509,8 @@ where
     async fn list_authorized_domains(
         &self,
         req: crate::model::ListAuthorizedDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuthorizedDomainsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuthorizedDomainsResponse>> {
         self.inner.list_authorized_domains(req, options).await
     }
 
@@ -523,9 +518,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -533,8 +527,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
@@ -565,8 +559,8 @@ where
     async fn list_authorized_certificates(
         &self,
         req: crate::model::ListAuthorizedCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuthorizedCertificatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuthorizedCertificatesResponse>> {
         self.inner.list_authorized_certificates(req, options).await
     }
 
@@ -574,8 +568,8 @@ where
     async fn get_authorized_certificate(
         &self,
         req: crate::model::GetAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedCertificate>> {
         self.inner.get_authorized_certificate(req, options).await
     }
 
@@ -583,8 +577,8 @@ where
     async fn create_authorized_certificate(
         &self,
         req: crate::model::CreateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedCertificate>> {
         self.inner.create_authorized_certificate(req, options).await
     }
 
@@ -592,8 +586,8 @@ where
     async fn update_authorized_certificate(
         &self,
         req: crate::model::UpdateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedCertificate>> {
         self.inner.update_authorized_certificate(req, options).await
     }
 
@@ -601,8 +595,8 @@ where
     async fn delete_authorized_certificate(
         &self,
         req: crate::model::DeleteAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_authorized_certificate(req, options).await
     }
 
@@ -610,9 +604,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -620,8 +613,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
@@ -652,8 +645,8 @@ where
     async fn list_domain_mappings(
         &self,
         req: crate::model::ListDomainMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDomainMappingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDomainMappingsResponse>> {
         self.inner.list_domain_mappings(req, options).await
     }
 
@@ -661,8 +654,8 @@ where
     async fn get_domain_mapping(
         &self,
         req: crate::model::GetDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DomainMapping>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DomainMapping>> {
         self.inner.get_domain_mapping(req, options).await
     }
 
@@ -670,8 +663,8 @@ where
     async fn create_domain_mapping(
         &self,
         req: crate::model::CreateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_domain_mapping(req, options).await
     }
 
@@ -679,8 +672,8 @@ where
     async fn update_domain_mapping(
         &self,
         req: crate::model::UpdateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_domain_mapping(req, options).await
     }
 
@@ -688,8 +681,8 @@ where
     async fn delete_domain_mapping(
         &self,
         req: crate::model::DeleteDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_domain_mapping(req, options).await
     }
 
@@ -697,9 +690,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -707,22 +699,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/appengine/v1/src/transport.rs b/src/generated/appengine/v1/src/transport.rs
index 167047fd4f..d3d8f69a15 100644
--- a/src/generated/appengine/v1/src/transport.rs
+++ b/src/generated/appengine/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Applications](super::stub::Applications) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Applications {
 }
 
 impl Applications {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Applications for Applications {
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Application>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Application>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76,9 +76,9 @@ impl super::stub::Applications for Applications {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -93,11 +93,11 @@ impl super::stub::Applications for Applications {
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/apps".to_string();
@@ -112,9 +112,9 @@ impl super::stub::Applications for Applications {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -129,13 +129,13 @@ impl super::stub::Applications for Applications {
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -174,9 +174,9 @@ impl super::stub::Applications for Applications {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -191,13 +191,13 @@ impl super::stub::Applications for Applications {
     async fn repair_application(
         &self,
         req: crate::model::RepairApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -224,9 +224,9 @@ impl super::stub::Applications for Applications {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -241,14 +241,13 @@ impl super::stub::Applications for Applications {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -280,9 +279,9 @@ impl super::stub::Applications for Applications {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297,13 +296,13 @@ impl super::stub::Applications for Applications {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -340,9 +339,9 @@ impl super::stub::Applications for Applications {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -356,15 +355,15 @@ impl super::stub::Applications for Applications {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -384,7 +383,7 @@ impl std::fmt::Debug for Services {
 }
 
 impl Services {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -394,13 +393,13 @@ impl super::stub::Services for Services {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429,9 +428,9 @@ impl super::stub::Services for Services {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446,13 +445,13 @@ impl super::stub::Services for Services {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +488,9 @@ impl super::stub::Services for Services {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,13 +505,13 @@ impl super::stub::Services for Services {
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -562,9 +561,9 @@ impl super::stub::Services for Services {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -579,13 +578,13 @@ impl super::stub::Services for Services {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -622,9 +621,9 @@ impl super::stub::Services for Services {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -639,14 +638,13 @@ impl super::stub::Services for Services {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -678,9 +676,9 @@ impl super::stub::Services for Services {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -695,13 +693,13 @@ impl super::stub::Services for Services {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -738,9 +736,9 @@ impl super::stub::Services for Services {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -754,15 +752,15 @@ impl super::stub::Services for Services {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -782,7 +780,7 @@ impl std::fmt::Debug for Versions {
 }
 
 impl Versions {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -792,13 +790,13 @@ impl super::stub::Versions for Versions {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -838,9 +836,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -855,13 +853,13 @@ impl super::stub::Versions for Versions {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -903,9 +901,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -920,13 +918,13 @@ impl super::stub::Versions for Versions {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -963,9 +961,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -980,13 +978,13 @@ impl super::stub::Versions for Versions {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1039,9 +1037,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1056,13 +1054,13 @@ impl super::stub::Versions for Versions {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1103,9 +1101,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1120,14 +1118,13 @@ impl super::stub::Versions for Versions {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1159,9 +1156,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1176,13 +1173,13 @@ impl super::stub::Versions for Versions {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1219,9 +1216,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1235,15 +1232,15 @@ impl super::stub::Versions for Versions {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1263,7 +1260,7 @@ impl std::fmt::Debug for Instances {
 }
 
 impl Instances {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1273,13 +1270,13 @@ impl super::stub::Instances for Instances {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1322,9 +1319,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1339,13 +1336,13 @@ impl super::stub::Instances for Instances {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1390,9 +1387,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1407,13 +1404,13 @@ impl super::stub::Instances for Instances {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1458,9 +1455,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1475,13 +1472,13 @@ impl super::stub::Instances for Instances {
     async fn debug_instance(
         &self,
         req: crate::model::DebugInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1526,9 +1523,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1543,14 +1540,13 @@ impl super::stub::Instances for Instances {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1582,9 +1578,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1599,13 +1595,13 @@ impl super::stub::Instances for Instances {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1642,9 +1638,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1658,15 +1654,15 @@ impl super::stub::Instances for Instances {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1686,7 +1682,7 @@ impl std::fmt::Debug for Firewall {
 }
 
 impl Firewall {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1696,13 +1692,13 @@ impl super::stub::Firewall for Firewall {
     async fn list_ingress_rules(
         &self,
         req: crate::model::ListIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIngressRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIngressRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1732,9 +1728,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1749,13 +1745,13 @@ impl super::stub::Firewall for Firewall {
     async fn batch_update_ingress_rules(
         &self,
         req: crate::model::BatchUpdateIngressRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchUpdateIngressRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchUpdateIngressRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1790,9 +1786,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1807,13 +1803,13 @@ impl super::stub::Firewall for Firewall {
     async fn create_ingress_rule(
         &self,
         req: crate::model::CreateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1840,9 +1836,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1857,13 +1853,13 @@ impl super::stub::Firewall for Firewall {
     async fn get_ingress_rule(
         &self,
         req: crate::model::GetIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1900,9 +1896,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1917,13 +1913,13 @@ impl super::stub::Firewall for Firewall {
     async fn update_ingress_rule(
         &self,
         req: crate::model::UpdateIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1972,9 +1968,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1989,13 +1985,13 @@ impl super::stub::Firewall for Firewall {
     async fn delete_ingress_rule(
         &self,
         req: crate::model::DeleteIngressRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2032,9 +2028,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2043,25 +2039,25 @@ impl super::stub::Firewall for Firewall {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2093,9 +2089,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2110,13 +2106,13 @@ impl super::stub::Firewall for Firewall {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2153,9 +2149,9 @@ impl super::stub::Firewall for Firewall {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2183,7 +2179,7 @@ impl std::fmt::Debug for AuthorizedDomains {
 }
 
 impl AuthorizedDomains {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2193,13 +2189,13 @@ impl super::stub::AuthorizedDomains for AuthorizedDomains {
     async fn list_authorized_domains(
         &self,
         req: crate::model::ListAuthorizedDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuthorizedDomainsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuthorizedDomainsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2228,9 +2224,9 @@ impl super::stub::AuthorizedDomains for AuthorizedDomains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2245,14 +2241,13 @@ impl super::stub::AuthorizedDomains for AuthorizedDomains {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2284,9 +2279,9 @@ impl super::stub::AuthorizedDomains for AuthorizedDomains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2301,13 +2296,13 @@ impl super::stub::AuthorizedDomains for AuthorizedDomains {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2344,9 +2339,9 @@ impl super::stub::AuthorizedDomains for AuthorizedDomains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2374,7 +2369,7 @@ impl std::fmt::Debug for AuthorizedCertificates {
 }
 
 impl AuthorizedCertificates {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2384,13 +2379,13 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
     async fn list_authorized_certificates(
         &self,
         req: crate::model::ListAuthorizedCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuthorizedCertificatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuthorizedCertificatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2420,9 +2415,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2437,13 +2432,13 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
     async fn get_authorized_certificate(
         &self,
         req: crate::model::GetAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedCertificate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2481,9 +2476,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2498,13 +2493,13 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
     async fn create_authorized_certificate(
         &self,
         req: crate::model::CreateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedCertificate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2531,9 +2526,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2548,13 +2543,13 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
     async fn update_authorized_certificate(
         &self,
         req: crate::model::UpdateAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedCertificate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedCertificate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2603,9 +2598,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2620,13 +2615,13 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
     async fn delete_authorized_certificate(
         &self,
         req: crate::model::DeleteAuthorizedCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2663,9 +2658,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2674,25 +2669,25 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2724,9 +2719,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2741,13 +2736,13 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2784,9 +2779,9 @@ impl super::stub::AuthorizedCertificates for AuthorizedCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2814,7 +2809,7 @@ impl std::fmt::Debug for DomainMappings {
 }
 
 impl DomainMappings {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2824,13 +2819,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn list_domain_mappings(
         &self,
         req: crate::model::ListDomainMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDomainMappingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDomainMappingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2859,9 +2854,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2876,13 +2871,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn get_domain_mapping(
         &self,
         req: crate::model::GetDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DomainMapping>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DomainMapping>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2919,9 +2914,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2936,13 +2931,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn create_domain_mapping(
         &self,
         req: crate::model::CreateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2970,9 +2965,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2987,13 +2982,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn update_domain_mapping(
         &self,
         req: crate::model::UpdateDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3042,9 +3037,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3059,13 +3054,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn delete_domain_mapping(
         &self,
         req: crate::model::DeleteDomainMappingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3102,9 +3097,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3119,14 +3114,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3158,9 +3152,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3175,13 +3169,13 @@ impl super::stub::DomainMappings for DomainMappings {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3218,9 +3212,9 @@ impl super::stub::DomainMappings for DomainMappings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3234,15 +3228,15 @@ impl super::stub::DomainMappings for DomainMappings {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/bigtable/admin/v2/Cargo.toml b/src/generated/bigtable/admin/v2/Cargo.toml
index b3052f3a0e..463460106a 100644
--- a/src/generated/bigtable/admin/v2/Cargo.toml
+++ b/src/generated/bigtable/admin/v2/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/bigtable/admin/v2/src/builder.rs b/src/generated/bigtable/admin/v2/src/builder.rs
index 4012df151d..2b32a95b66 100644
--- a/src/generated/bigtable/admin/v2/src/builder.rs
+++ b/src/generated/bigtable/admin/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod bigtable_instance_admin {
     /// A builder for [BigtableInstanceAdmin][crate::client::BigtableInstanceAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigtable_admin_v2::*;
     /// # use builder::bigtable_instance_admin::ClientBuilder;
     /// # use client::BigtableInstanceAdmin;
@@ -30,19 +30,18 @@ pub mod bigtable_instance_admin {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BigtableInstanceAdmin;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BigtableInstanceAdmin;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod bigtable_instance_admin {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BigtableInstanceAdmin>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod bigtable_instance_admin {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -105,7 +104,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120,7 +119,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -137,7 +136,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -217,8 +216,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -228,7 +227,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -256,7 +255,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -266,7 +265,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -279,8 +278,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -290,7 +289,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -318,7 +317,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -328,7 +327,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListInstancesRequest::parent].
@@ -347,8 +346,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -358,7 +357,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -386,7 +385,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -396,7 +395,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::Instance::name].
@@ -503,8 +502,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -514,7 +513,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::PartialUpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -546,7 +545,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -561,7 +560,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .partial_update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `partial_update_instance`.
@@ -578,7 +577,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -651,8 +650,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PartialUpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PartialUpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -662,7 +661,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -690,7 +689,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -700,7 +699,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteInstanceRequest::name].
@@ -713,8 +712,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -724,7 +723,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::CreateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -753,7 +752,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -768,7 +767,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .create_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_cluster`.
@@ -785,7 +784,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -852,8 +851,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -863,7 +862,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -891,7 +890,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -901,7 +900,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetClusterRequest::name].
@@ -914,8 +913,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -925,7 +924,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListClusters;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -953,7 +952,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -963,7 +962,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListClustersRequest::parent].
@@ -982,8 +981,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -993,7 +992,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::UpdateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1022,7 +1021,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1037,7 +1036,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .update_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_cluster`.
@@ -1054,7 +1053,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1167,8 +1166,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1178,7 +1177,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::PartialUpdateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1210,7 +1209,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1225,7 +1224,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .partial_update_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `partial_update_cluster`.
@@ -1244,7 +1243,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1317,8 +1316,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PartialUpdateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PartialUpdateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1328,7 +1327,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::DeleteCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1356,7 +1355,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1366,7 +1365,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .delete_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteClusterRequest::name].
@@ -1379,8 +1378,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1390,7 +1389,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::CreateAppProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1421,7 +1420,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1431,7 +1430,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .create_app_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAppProfileRequest::parent].
@@ -1480,8 +1479,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAppProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAppProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1491,7 +1490,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetAppProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1519,7 +1518,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1529,7 +1528,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_app_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAppProfileRequest::name].
@@ -1542,8 +1541,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAppProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAppProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1553,8 +1552,8 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListAppProfiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1585,7 +1584,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1595,14 +1594,16 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_app_profiles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAppProfilesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAppProfilesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1610,15 +1611,17 @@ pub mod bigtable_instance_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAppProfilesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAppProfilesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1644,8 +1647,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAppProfiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAppProfiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1655,7 +1658,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::UpdateAppProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1687,7 +1690,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1702,7 +1705,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .update_app_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_app_profile`.
@@ -1721,7 +1724,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1800,8 +1803,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAppProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAppProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1811,7 +1814,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::DeleteAppProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1842,7 +1845,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1852,7 +1855,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .delete_app_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAppProfileRequest::name].
@@ -1873,8 +1876,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAppProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAppProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1884,7 +1887,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1915,7 +1918,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1925,7 +1928,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1956,8 +1959,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1967,7 +1970,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1998,7 +2001,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2008,7 +2011,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2061,8 +2064,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2072,7 +2075,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2105,7 +2108,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2115,7 +2118,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2141,8 +2144,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2152,8 +2155,8 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListHotTablets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2184,7 +2187,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2194,14 +2197,16 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_hot_tablets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListHotTabletsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListHotTabletsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2209,15 +2214,17 @@ pub mod bigtable_instance_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListHotTabletsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListHotTabletsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2279,8 +2286,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListHotTablets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListHotTablets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2290,7 +2297,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::CreateLogicalView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2322,7 +2329,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2337,7 +2344,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .create_logical_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_logical_view`.
@@ -2356,7 +2363,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2423,8 +2430,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateLogicalView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateLogicalView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2434,7 +2441,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetLogicalView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2462,7 +2469,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2472,7 +2479,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_logical_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetLogicalViewRequest::name].
@@ -2485,8 +2492,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLogicalView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLogicalView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2496,8 +2503,8 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListLogicalViews;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2531,7 +2538,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2541,14 +2548,16 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_logical_views(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListLogicalViewsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListLogicalViewsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2556,15 +2565,17 @@ pub mod bigtable_instance_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListLogicalViewsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListLogicalViewsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2590,8 +2601,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLogicalViews {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLogicalViews {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2601,7 +2612,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::UpdateLogicalView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2633,7 +2644,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2648,7 +2659,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .update_logical_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_logical_view`.
@@ -2667,7 +2678,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2736,8 +2747,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateLogicalView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateLogicalView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2747,7 +2758,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::DeleteLogicalView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2778,7 +2789,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2788,7 +2799,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .delete_logical_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteLogicalViewRequest::name].
@@ -2807,8 +2818,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteLogicalView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteLogicalView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2818,7 +2829,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::CreateMaterializedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2850,7 +2861,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2865,7 +2876,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .create_materialized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_materialized_view`.
@@ -2884,7 +2895,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2951,8 +2962,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMaterializedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMaterializedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2962,7 +2973,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetMaterializedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2993,7 +3004,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3003,7 +3014,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_materialized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMaterializedViewRequest::name].
@@ -3016,8 +3027,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMaterializedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMaterializedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3027,8 +3038,8 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListMaterializedViews;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3062,7 +3073,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3072,14 +3083,16 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_materialized_views(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMaterializedViewsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMaterializedViewsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3087,17 +3100,17 @@ pub mod bigtable_instance_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMaterializedViewsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3123,8 +3136,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMaterializedViews {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMaterializedViews {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3134,7 +3147,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::UpdateMaterializedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3166,7 +3179,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3181,7 +3194,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .update_materialized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_materialized_view`.
@@ -3200,7 +3213,7 @@ pub mod bigtable_instance_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3269,8 +3282,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMaterializedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMaterializedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3280,7 +3293,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::DeleteMaterializedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3311,7 +3324,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3321,7 +3334,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .delete_materialized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteMaterializedViewRequest::name].
@@ -3340,8 +3353,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMaterializedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMaterializedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3351,8 +3364,8 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3388,7 +3401,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3398,15 +3411,15 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3415,17 +3428,17 @@ pub mod bigtable_instance_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3461,8 +3474,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3472,7 +3485,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3503,7 +3516,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3513,7 +3526,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3524,8 +3537,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3535,7 +3548,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3568,7 +3581,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3578,7 +3591,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3589,8 +3602,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3600,7 +3613,7 @@ pub mod bigtable_instance_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_instance_admin::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3633,7 +3646,7 @@ pub mod bigtable_instance_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3643,7 +3656,7 @@ pub mod bigtable_instance_admin {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3654,8 +3667,8 @@ pub mod bigtable_instance_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3667,7 +3680,7 @@ pub mod bigtable_table_admin {
     /// A builder for [BigtableTableAdmin][crate::client::BigtableTableAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigtable_admin_v2::*;
     /// # use builder::bigtable_table_admin::ClientBuilder;
     /// # use client::BigtableTableAdmin;
@@ -3677,19 +3690,18 @@ pub mod bigtable_table_admin {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BigtableTableAdmin;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BigtableTableAdmin;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3700,7 +3712,7 @@ pub mod bigtable_table_admin {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BigtableTableAdmin>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3713,7 +3725,7 @@ pub mod bigtable_table_admin {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3723,7 +3735,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CreateTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3751,7 +3763,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3761,7 +3773,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .create_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTableRequest::parent].
@@ -3815,8 +3827,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3826,7 +3838,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CreateTableFromSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3860,7 +3872,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3875,7 +3887,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .create_table_from_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_table_from_snapshot`.
@@ -3894,7 +3906,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3947,8 +3959,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTableFromSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTableFromSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3958,8 +3970,8 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ListTables;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3990,7 +4002,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4000,13 +4012,13 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .list_tables(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTablesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTablesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4015,15 +4027,17 @@ pub mod bigtable_table_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTablesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTablesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4055,8 +4069,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTables {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTables {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4066,7 +4080,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4094,7 +4108,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4104,7 +4118,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTableRequest::name].
@@ -4123,8 +4137,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4134,7 +4148,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::UpdateTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4163,7 +4177,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4178,7 +4192,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .update_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_table`.
@@ -4195,7 +4209,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4274,8 +4288,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4285,7 +4299,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DeleteTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4313,7 +4327,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4323,7 +4337,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .delete_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTableRequest::name].
@@ -4336,8 +4350,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4347,7 +4361,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::UndeleteTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4376,7 +4390,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4391,7 +4405,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .undelete_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undelete_table`.
@@ -4408,7 +4422,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4445,8 +4459,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeleteTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeleteTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4456,7 +4470,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CreateAuthorizedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4488,7 +4502,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4503,7 +4517,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .create_authorized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_authorized_view`.
@@ -4522,7 +4536,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4589,8 +4603,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAuthorizedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAuthorizedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4600,8 +4614,8 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ListAuthorizedViews;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4635,7 +4649,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4645,14 +4659,16 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .list_authorized_views(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAuthorizedViewsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAuthorizedViewsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4660,17 +4676,17 @@ pub mod bigtable_table_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAuthorizedViewsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4705,8 +4721,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAuthorizedViews {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAuthorizedViews {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4716,7 +4732,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetAuthorizedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4747,7 +4763,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4757,7 +4773,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_authorized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAuthorizedViewRequest::name].
@@ -4779,8 +4795,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAuthorizedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAuthorizedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4790,7 +4806,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::UpdateAuthorizedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4822,7 +4838,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4837,7 +4853,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .update_authorized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_authorized_view`.
@@ -4856,7 +4872,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4931,8 +4947,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAuthorizedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAuthorizedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4942,7 +4958,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DeleteAuthorizedView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4973,7 +4989,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4983,7 +4999,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .delete_authorized_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAuthorizedViewRequest::name].
@@ -5002,8 +5018,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAuthorizedView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAuthorizedView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5013,7 +5029,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ModifyColumnFamilies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5044,7 +5060,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5054,7 +5070,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .modify_column_families(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ModifyColumnFamiliesRequest::name].
@@ -5086,8 +5102,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ModifyColumnFamilies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ModifyColumnFamilies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5097,7 +5113,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DropRowRange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5125,7 +5141,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5135,7 +5151,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .drop_row_range(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DropRowRangeRequest::name].
@@ -5180,8 +5196,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DropRowRange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DropRowRange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5191,7 +5207,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GenerateConsistencyToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5224,7 +5240,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5234,7 +5250,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .generate_consistency_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GenerateConsistencyTokenRequest::name].
@@ -5247,8 +5263,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateConsistencyToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateConsistencyToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5258,7 +5274,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CheckConsistency;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5289,7 +5305,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5299,7 +5315,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .check_consistency(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CheckConsistencyRequest::name].
@@ -5362,8 +5378,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CheckConsistency {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CheckConsistency {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5373,7 +5389,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::SnapshotTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5402,7 +5418,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5417,7 +5433,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .snapshot_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `snapshot_table`.
@@ -5434,7 +5450,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5511,8 +5527,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SnapshotTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SnapshotTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5522,7 +5538,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5550,7 +5566,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5560,7 +5576,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSnapshotRequest::name].
@@ -5573,8 +5589,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5584,8 +5600,8 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ListSnapshots;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5616,7 +5632,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5626,13 +5642,13 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .list_snapshots(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSnapshotsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSnapshotsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5641,15 +5657,17 @@ pub mod bigtable_table_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSnapshotsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSnapshotsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5675,8 +5693,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSnapshots {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSnapshots {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5686,7 +5704,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DeleteSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5714,7 +5732,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5724,7 +5742,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .delete_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSnapshotRequest::name].
@@ -5737,8 +5755,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5748,7 +5766,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CreateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5777,7 +5795,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5792,7 +5810,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .create_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup`.
@@ -5809,7 +5827,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5876,8 +5894,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5887,7 +5905,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5915,7 +5933,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5925,7 +5943,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -5938,8 +5956,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5949,7 +5967,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::UpdateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5977,7 +5995,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5987,7 +6005,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .update_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backup][crate::model::UpdateBackupRequest::backup].
@@ -6036,8 +6054,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6047,7 +6065,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6075,7 +6093,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6085,7 +6103,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteBackupRequest::name].
@@ -6098,8 +6116,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6109,8 +6127,8 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6141,7 +6159,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6151,13 +6169,13 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6166,15 +6184,17 @@ pub mod bigtable_table_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6212,8 +6232,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6223,7 +6243,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::RestoreTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6252,7 +6272,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6267,7 +6287,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .restore_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_table`.
@@ -6284,7 +6304,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6351,8 +6371,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6362,7 +6382,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CopyBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6391,7 +6411,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6406,7 +6426,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .copy_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `copy_backup`.
@@ -6423,7 +6443,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6498,8 +6518,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CopyBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CopyBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6509,7 +6529,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6540,7 +6560,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6550,7 +6570,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -6581,8 +6601,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6592,7 +6612,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6623,7 +6643,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6633,7 +6653,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -6686,8 +6706,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6697,7 +6717,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6730,7 +6750,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6740,7 +6760,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -6766,8 +6786,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6777,7 +6797,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CreateSchemaBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6809,7 +6829,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6824,7 +6844,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .create_schema_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_schema_bundle`.
@@ -6843,7 +6863,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6910,8 +6930,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSchemaBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSchemaBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6921,7 +6941,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::UpdateSchemaBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6953,7 +6973,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6968,7 +6988,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .update_schema_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_schema_bundle`.
@@ -6987,7 +7007,7 @@ pub mod bigtable_table_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7062,8 +7082,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSchemaBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSchemaBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7073,7 +7093,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetSchemaBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7101,7 +7121,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7111,7 +7131,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_schema_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaBundleRequest::name].
@@ -7124,8 +7144,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchemaBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchemaBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7135,8 +7155,8 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ListSchemaBundles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7170,7 +7190,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7180,14 +7200,16 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .list_schema_bundles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSchemaBundlesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSchemaBundlesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -7195,15 +7217,17 @@ pub mod bigtable_table_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSchemaBundlesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSchemaBundlesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7229,8 +7253,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSchemaBundles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSchemaBundles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7240,7 +7264,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DeleteSchemaBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7271,7 +7295,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7281,7 +7305,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .delete_schema_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSchemaBundleRequest::name].
@@ -7300,8 +7324,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSchemaBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSchemaBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7311,8 +7335,8 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7348,7 +7372,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7358,15 +7382,15 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7375,17 +7399,17 @@ pub mod bigtable_table_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7421,8 +7445,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7432,7 +7456,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7463,7 +7487,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7473,7 +7497,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7484,8 +7508,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7495,7 +7519,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7528,7 +7552,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7538,7 +7562,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -7549,8 +7573,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7560,7 +7584,7 @@ pub mod bigtable_table_admin {
     /// # Example
     /// ```
     /// # use google_cloud_bigtable_admin_v2::builder::bigtable_table_admin::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigtable_admin_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7593,7 +7617,7 @@ pub mod bigtable_table_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7603,7 +7627,7 @@ pub mod bigtable_table_admin {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7614,8 +7638,8 @@ pub mod bigtable_table_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/bigtable/admin/v2/src/client.rs b/src/generated/bigtable/admin/v2/src/client.rs
index 64665ed031..8bdf52f355 100644
--- a/src/generated/bigtable/admin/v2/src/client.rs
+++ b/src/generated/bigtable/admin/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigtable_admin_v2::client::BigtableInstanceAdmin;
 /// let client = BigtableInstanceAdmin::builder().build().await?;
 /// // use `client` to make requests to the Cloud Bigtable Admin API.
@@ -68,15 +68,13 @@ impl BigtableInstanceAdmin {
     /// Returns a builder for [BigtableInstanceAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigtable_admin_v2::client::BigtableInstanceAdmin;
     /// let client = BigtableInstanceAdmin::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::bigtable_instance_admin::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::bigtable_instance_admin::client::Factory,
-        )
+        crate::new_client_builder(super::builder::bigtable_instance_admin::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -94,14 +92,14 @@ impl BigtableInstanceAdmin {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BigtableInstanceAdmin>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BigtableInstanceAdmin>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -111,13 +109,13 @@ impl BigtableInstanceAdmin {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BigtableInstanceAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BigtableInstanceAdmin> {
         super::transport::BigtableInstanceAdmin::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BigtableInstanceAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BigtableInstanceAdmin> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BigtableInstanceAdmin::new)
@@ -466,7 +464,7 @@ impl BigtableInstanceAdmin {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigtable_admin_v2::client::BigtableTableAdmin;
 /// let client = BigtableTableAdmin::builder().build().await?;
 /// // use `client` to make requests to the Cloud Bigtable Admin API.
@@ -515,15 +513,13 @@ impl BigtableTableAdmin {
     /// Returns a builder for [BigtableTableAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigtable_admin_v2::client::BigtableTableAdmin;
     /// let client = BigtableTableAdmin::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::bigtable_table_admin::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::bigtable_table_admin::client::Factory,
-        )
+        crate::new_client_builder(super::builder::bigtable_table_admin::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -541,14 +537,14 @@ impl BigtableTableAdmin {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BigtableTableAdmin>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BigtableTableAdmin>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -558,13 +554,13 @@ impl BigtableTableAdmin {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BigtableTableAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BigtableTableAdmin> {
         super::transport::BigtableTableAdmin::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BigtableTableAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BigtableTableAdmin> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BigtableTableAdmin::new)
diff --git a/src/generated/bigtable/admin/v2/src/lib.rs b/src/generated/bigtable/admin/v2/src/lib.rs
index 5f5a153875..1fa91602b1 100644
--- a/src/generated/bigtable/admin/v2/src/lib.rs
+++ b/src/generated/bigtable/admin/v2/src/lib.rs
@@ -47,8 +47,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -83,3 +83,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/bigtable/admin/v2/src/model.rs b/src/generated/bigtable/admin/v2/src/model.rs
index c969855659..394333e9fd 100644
--- a/src/generated/bigtable/admin/v2/src/model.rs
+++ b/src/generated/bigtable/admin/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -2041,7 +2041,7 @@ impl wkt::message::Message for ListAppProfilesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAppProfilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAppProfilesResponse {
     type PageItem = crate::model::AppProfile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2448,7 +2448,7 @@ impl wkt::message::Message for ListHotTabletsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListHotTabletsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListHotTabletsResponse {
     type PageItem = crate::model::HotTablet;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2843,7 +2843,7 @@ impl wkt::message::Message for ListLogicalViewsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListLogicalViewsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListLogicalViewsResponse {
     type PageItem = crate::model::LogicalView;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3519,7 +3519,7 @@ impl wkt::message::Message for ListMaterializedViewsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMaterializedViewsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMaterializedViewsResponse {
     type PageItem = crate::model::MaterializedView;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4767,7 +4767,7 @@ impl wkt::message::Message for ListTablesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTablesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTablesResponse {
     type PageItem = crate::model::Table;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6243,7 +6243,7 @@ impl wkt::message::Message for ListSnapshotsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSnapshotsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSnapshotsResponse {
     type PageItem = crate::model::Snapshot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7194,7 +7194,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7830,7 +7830,7 @@ impl wkt::message::Message for ListAuthorizedViewsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAuthorizedViewsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAuthorizedViewsResponse {
     type PageItem = crate::model::AuthorizedView;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8822,7 +8822,7 @@ impl wkt::message::Message for ListSchemaBundlesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSchemaBundlesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSchemaBundlesResponse {
     type PageItem = crate::model::SchemaBundle;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/bigtable/admin/v2/src/stub.rs b/src/generated/bigtable/admin/v2/src/stub.rs
index 5b146980b3..51b951437a 100644
--- a/src/generated/bigtable/admin/v2/src/stub.rs
+++ b/src/generated/bigtable/admin/v2/src/stub.rs
@@ -42,9 +42,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +74,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::Instance,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,9 +84,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn partial_update_instance(
         &self,
         _req: crate::model::PartialUpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,8 +95,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,9 +104,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn create_cluster(
         &self,
         _req: crate::model::CreateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,10 +115,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_cluster(
         &self,
         _req: crate::model::GetClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Cluster>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Cluster>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -128,9 +125,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_clusters(
         &self,
         _req: crate::model::ListClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,9 +136,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn update_cluster(
         &self,
         _req: crate::model::Cluster,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -150,9 +147,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn partial_update_cluster(
         &self,
         _req: crate::model::PartialUpdateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -161,8 +158,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn delete_cluster(
         &self,
         _req: crate::model::DeleteClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -170,10 +167,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn create_app_profile(
         &self,
         _req: crate::model::CreateAppProfileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AppProfile>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AppProfile>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -181,10 +177,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_app_profile(
         &self,
         _req: crate::model::GetAppProfileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AppProfile>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AppProfile>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -192,9 +187,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_app_profiles(
         &self,
         _req: crate::model::ListAppProfilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAppProfilesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAppProfilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -203,9 +198,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn update_app_profile(
         &self,
         _req: crate::model::UpdateAppProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -214,8 +209,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn delete_app_profile(
         &self,
         _req: crate::model::DeleteAppProfileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -223,9 +218,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -234,9 +229,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -245,10 +240,10 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -258,9 +253,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_hot_tablets(
         &self,
         _req: crate::model::ListHotTabletsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListHotTabletsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListHotTabletsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -269,9 +264,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn create_logical_view(
         &self,
         _req: crate::model::CreateLogicalViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -280,10 +275,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_logical_view(
         &self,
         _req: crate::model::GetLogicalViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LogicalView>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::LogicalView>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -291,9 +285,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_logical_views(
         &self,
         _req: crate::model::ListLogicalViewsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListLogicalViewsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListLogicalViewsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -302,9 +296,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn update_logical_view(
         &self,
         _req: crate::model::UpdateLogicalViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -313,8 +307,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn delete_logical_view(
         &self,
         _req: crate::model::DeleteLogicalViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -322,9 +316,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn create_materialized_view(
         &self,
         _req: crate::model::CreateMaterializedViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -333,9 +327,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_materialized_view(
         &self,
         _req: crate::model::GetMaterializedViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MaterializedView>>,
+        Output = crate::Result<crate::Response<crate::model::MaterializedView>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -344,11 +338,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_materialized_views(
         &self,
         _req: crate::model::ListMaterializedViewsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListMaterializedViewsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListMaterializedViewsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -357,9 +349,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn update_materialized_view(
         &self,
         _req: crate::model::UpdateMaterializedViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -368,8 +360,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn delete_materialized_view(
         &self,
         _req: crate::model::DeleteMaterializedViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -377,10 +369,10 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -390,9 +382,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -401,8 +393,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -410,8 +402,8 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -421,9 +413,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -432,9 +424,9 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -454,10 +446,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn create_table(
         &self,
         _req: crate::model::CreateTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -465,9 +456,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn create_table_from_snapshot(
         &self,
         _req: crate::model::CreateTableFromSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -476,9 +467,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn list_tables(
         &self,
         _req: crate::model::ListTablesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTablesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTablesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -487,10 +478,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_table(
         &self,
         _req: crate::model::GetTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -498,9 +488,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn update_table(
         &self,
         _req: crate::model::UpdateTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -509,8 +499,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn delete_table(
         &self,
         _req: crate::model::DeleteTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -518,9 +508,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn undelete_table(
         &self,
         _req: crate::model::UndeleteTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -529,9 +519,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn create_authorized_view(
         &self,
         _req: crate::model::CreateAuthorizedViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -540,9 +530,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn list_authorized_views(
         &self,
         _req: crate::model::ListAuthorizedViewsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAuthorizedViewsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAuthorizedViewsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -551,9 +541,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_authorized_view(
         &self,
         _req: crate::model::GetAuthorizedViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuthorizedView>>,
+        Output = crate::Result<crate::Response<crate::model::AuthorizedView>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -562,9 +552,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn update_authorized_view(
         &self,
         _req: crate::model::UpdateAuthorizedViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -573,8 +563,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn delete_authorized_view(
         &self,
         _req: crate::model::DeleteAuthorizedViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -582,10 +572,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn modify_column_families(
         &self,
         _req: crate::model::ModifyColumnFamiliesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -593,8 +582,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn drop_row_range(
         &self,
         _req: crate::model::DropRowRangeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -602,11 +591,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn generate_consistency_token(
         &self,
         _req: crate::model::GenerateConsistencyTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateConsistencyTokenResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateConsistencyTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -615,9 +602,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn check_consistency(
         &self,
         _req: crate::model::CheckConsistencyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CheckConsistencyResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CheckConsistencyResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -626,9 +613,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn snapshot_table(
         &self,
         _req: crate::model::SnapshotTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -637,10 +624,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_snapshot(
         &self,
         _req: crate::model::GetSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Snapshot>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Snapshot>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -648,9 +634,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn list_snapshots(
         &self,
         _req: crate::model::ListSnapshotsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSnapshotsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -659,8 +645,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn delete_snapshot(
         &self,
         _req: crate::model::DeleteSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -668,9 +654,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn create_backup(
         &self,
         _req: crate::model::CreateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -679,10 +665,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -690,10 +675,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn update_backup(
         &self,
         _req: crate::model::UpdateBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -701,8 +685,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -710,9 +694,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -721,9 +705,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn restore_table(
         &self,
         _req: crate::model::RestoreTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -732,9 +716,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn copy_backup(
         &self,
         _req: crate::model::CopyBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -743,9 +727,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -754,9 +738,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -765,10 +749,10 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -778,9 +762,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn create_schema_bundle(
         &self,
         _req: crate::model::CreateSchemaBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -789,9 +773,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn update_schema_bundle(
         &self,
         _req: crate::model::UpdateSchemaBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -800,9 +784,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_schema_bundle(
         &self,
         _req: crate::model::GetSchemaBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaBundle>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaBundle>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -811,9 +795,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn list_schema_bundles(
         &self,
         _req: crate::model::ListSchemaBundlesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSchemaBundlesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSchemaBundlesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -822,8 +806,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn delete_schema_bundle(
         &self,
         _req: crate::model::DeleteSchemaBundleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -831,10 +815,10 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -844,9 +828,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -855,8 +839,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -864,8 +848,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -875,9 +859,9 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -886,8 +870,8 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/bigtable/admin/v2/src/stub/dynamic.rs b/src/generated/bigtable/admin/v2/src/stub/dynamic.rs
index aab4f714f8..c26a6d4a37 100644
--- a/src/generated/bigtable/admin/v2/src/stub/dynamic.rs
+++ b/src/generated/bigtable/admin/v2/src/stub/dynamic.rs
@@ -20,226 +20,222 @@ pub trait BigtableInstanceAdmin: std::fmt::Debug + Send + Sync {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn update_instance(
         &self,
         req: crate::model::Instance,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn partial_update_instance(
         &self,
         req: crate::model::PartialUpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>>;
 
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>>;
 
     async fn update_cluster(
         &self,
         req: crate::model::Cluster,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn partial_update_cluster(
         &self,
         req: crate::model::PartialUpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_app_profile(
         &self,
         req: crate::model::CreateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppProfile>>;
 
     async fn get_app_profile(
         &self,
         req: crate::model::GetAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppProfile>>;
 
     async fn list_app_profiles(
         &self,
         req: crate::model::ListAppProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppProfilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppProfilesResponse>>;
 
     async fn update_app_profile(
         &self,
         req: crate::model::UpdateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_app_profile(
         &self,
         req: crate::model::DeleteAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_hot_tablets(
         &self,
         req: crate::model::ListHotTabletsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHotTabletsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHotTabletsResponse>>;
 
     async fn create_logical_view(
         &self,
         req: crate::model::CreateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_logical_view(
         &self,
         req: crate::model::GetLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LogicalView>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LogicalView>>;
 
     async fn list_logical_views(
         &self,
         req: crate::model::ListLogicalViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLogicalViewsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLogicalViewsResponse>>;
 
     async fn update_logical_view(
         &self,
         req: crate::model::UpdateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_logical_view(
         &self,
         req: crate::model::DeleteLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_materialized_view(
         &self,
         req: crate::model::CreateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_materialized_view(
         &self,
         req: crate::model::GetMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MaterializedView>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MaterializedView>>;
 
     async fn list_materialized_views(
         &self,
         req: crate::model::ListMaterializedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMaterializedViewsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMaterializedViewsResponse>>;
 
     async fn update_materialized_view(
         &self,
         req: crate::model::UpdateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_materialized_view(
         &self,
         req: crate::model::DeleteMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BigtableInstanceAdmin] also implement [BigtableInstanceAdmin].
@@ -249,8 +245,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -258,8 +254,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -267,8 +263,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -276,8 +272,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn update_instance(
         &self,
         req: crate::model::Instance,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::update_instance(self, req, options).await
     }
 
@@ -285,8 +281,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn partial_update_instance(
         &self,
         req: crate::model::PartialUpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::partial_update_instance(self, req, options).await
     }
 
@@ -294,8 +290,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -303,8 +299,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_cluster(self, req, options).await
     }
 
@@ -312,8 +308,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>> {
         T::get_cluster(self, req, options).await
     }
 
@@ -321,8 +317,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>> {
         T::list_clusters(self, req, options).await
     }
 
@@ -330,8 +326,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn update_cluster(
         &self,
         req: crate::model::Cluster,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_cluster(self, req, options).await
     }
 
@@ -339,8 +335,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn partial_update_cluster(
         &self,
         req: crate::model::PartialUpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::partial_update_cluster(self, req, options).await
     }
 
@@ -348,8 +344,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_cluster(self, req, options).await
     }
 
@@ -357,8 +353,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn create_app_profile(
         &self,
         req: crate::model::CreateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppProfile>> {
         T::create_app_profile(self, req, options).await
     }
 
@@ -366,8 +362,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_app_profile(
         &self,
         req: crate::model::GetAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppProfile>> {
         T::get_app_profile(self, req, options).await
     }
 
@@ -375,8 +371,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_app_profiles(
         &self,
         req: crate::model::ListAppProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppProfilesResponse>> {
         T::list_app_profiles(self, req, options).await
     }
 
@@ -384,8 +380,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn update_app_profile(
         &self,
         req: crate::model::UpdateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_app_profile(self, req, options).await
     }
 
@@ -393,8 +389,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn delete_app_profile(
         &self,
         req: crate::model::DeleteAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_app_profile(self, req, options).await
     }
 
@@ -402,8 +398,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -411,8 +407,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -420,10 +416,9 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -431,8 +426,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_hot_tablets(
         &self,
         req: crate::model::ListHotTabletsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHotTabletsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHotTabletsResponse>> {
         T::list_hot_tablets(self, req, options).await
     }
 
@@ -440,8 +435,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn create_logical_view(
         &self,
         req: crate::model::CreateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_logical_view(self, req, options).await
     }
 
@@ -449,8 +444,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_logical_view(
         &self,
         req: crate::model::GetLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LogicalView>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LogicalView>> {
         T::get_logical_view(self, req, options).await
     }
 
@@ -458,8 +453,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_logical_views(
         &self,
         req: crate::model::ListLogicalViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLogicalViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLogicalViewsResponse>> {
         T::list_logical_views(self, req, options).await
     }
 
@@ -467,8 +462,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn update_logical_view(
         &self,
         req: crate::model::UpdateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_logical_view(self, req, options).await
     }
 
@@ -476,8 +471,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn delete_logical_view(
         &self,
         req: crate::model::DeleteLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_logical_view(self, req, options).await
     }
 
@@ -485,8 +480,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn create_materialized_view(
         &self,
         req: crate::model::CreateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_materialized_view(self, req, options).await
     }
 
@@ -494,8 +489,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_materialized_view(
         &self,
         req: crate::model::GetMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MaterializedView>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MaterializedView>> {
         T::get_materialized_view(self, req, options).await
     }
 
@@ -503,8 +498,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_materialized_views(
         &self,
         req: crate::model::ListMaterializedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMaterializedViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMaterializedViewsResponse>> {
         T::list_materialized_views(self, req, options).await
     }
 
@@ -512,8 +507,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn update_materialized_view(
         &self,
         req: crate::model::UpdateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_materialized_view(self, req, options).await
     }
 
@@ -521,8 +516,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn delete_materialized_view(
         &self,
         req: crate::model::DeleteMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_materialized_view(self, req, options).await
     }
 
@@ -530,10 +525,9 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -541,8 +535,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -550,8 +544,8 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -559,22 +553,22 @@ impl<T: super::BigtableInstanceAdmin> BigtableInstanceAdmin for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -585,250 +579,246 @@ pub trait BigtableTableAdmin: std::fmt::Debug + Send + Sync {
     async fn create_table(
         &self,
         req: crate::model::CreateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn create_table_from_snapshot(
         &self,
         req: crate::model::CreateTableFromSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTablesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTablesResponse>>;
 
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn update_table(
         &self,
         req: crate::model::UpdateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn undelete_table(
         &self,
         req: crate::model::UndeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_authorized_view(
         &self,
         req: crate::model::CreateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_authorized_views(
         &self,
         req: crate::model::ListAuthorizedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuthorizedViewsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuthorizedViewsResponse>>;
 
     async fn get_authorized_view(
         &self,
         req: crate::model::GetAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedView>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedView>>;
 
     async fn update_authorized_view(
         &self,
         req: crate::model::UpdateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_authorized_view(
         &self,
         req: crate::model::DeleteAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn modify_column_families(
         &self,
         req: crate::model::ModifyColumnFamiliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn drop_row_range(
         &self,
         req: crate::model::DropRowRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn generate_consistency_token(
         &self,
         req: crate::model::GenerateConsistencyTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateConsistencyTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateConsistencyTokenResponse>>;
 
     async fn check_consistency(
         &self,
         req: crate::model::CheckConsistencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckConsistencyResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckConsistencyResponse>>;
 
     async fn snapshot_table(
         &self,
         req: crate::model::SnapshotTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>>;
 
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSnapshotsResponse>>;
 
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn restore_table(
         &self,
         req: crate::model::RestoreTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn copy_backup(
         &self,
         req: crate::model::CopyBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn create_schema_bundle(
         &self,
         req: crate::model::CreateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_schema_bundle(
         &self,
         req: crate::model::UpdateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_schema_bundle(
         &self,
         req: crate::model::GetSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaBundle>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaBundle>>;
 
     async fn list_schema_bundles(
         &self,
         req: crate::model::ListSchemaBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchemaBundlesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchemaBundlesResponse>>;
 
     async fn delete_schema_bundle(
         &self,
         req: crate::model::DeleteSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BigtableTableAdmin] also implement [BigtableTableAdmin].
@@ -838,8 +828,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn create_table(
         &self,
         req: crate::model::CreateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::create_table(self, req, options).await
     }
 
@@ -847,8 +837,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn create_table_from_snapshot(
         &self,
         req: crate::model::CreateTableFromSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_table_from_snapshot(self, req, options).await
     }
 
@@ -856,8 +846,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTablesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTablesResponse>> {
         T::list_tables(self, req, options).await
     }
 
@@ -865,8 +855,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::get_table(self, req, options).await
     }
 
@@ -874,8 +864,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn update_table(
         &self,
         req: crate::model::UpdateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_table(self, req, options).await
     }
 
@@ -883,8 +873,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_table(self, req, options).await
     }
 
@@ -892,8 +882,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn undelete_table(
         &self,
         req: crate::model::UndeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undelete_table(self, req, options).await
     }
 
@@ -901,8 +891,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn create_authorized_view(
         &self,
         req: crate::model::CreateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_authorized_view(self, req, options).await
     }
 
@@ -910,8 +900,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn list_authorized_views(
         &self,
         req: crate::model::ListAuthorizedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuthorizedViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuthorizedViewsResponse>> {
         T::list_authorized_views(self, req, options).await
     }
 
@@ -919,8 +909,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_authorized_view(
         &self,
         req: crate::model::GetAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizedView>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizedView>> {
         T::get_authorized_view(self, req, options).await
     }
 
@@ -928,8 +918,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn update_authorized_view(
         &self,
         req: crate::model::UpdateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_authorized_view(self, req, options).await
     }
 
@@ -937,8 +927,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn delete_authorized_view(
         &self,
         req: crate::model::DeleteAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_authorized_view(self, req, options).await
     }
 
@@ -946,8 +936,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn modify_column_families(
         &self,
         req: crate::model::ModifyColumnFamiliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::modify_column_families(self, req, options).await
     }
 
@@ -955,8 +945,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn drop_row_range(
         &self,
         req: crate::model::DropRowRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::drop_row_range(self, req, options).await
     }
 
@@ -964,9 +954,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn generate_consistency_token(
         &self,
         req: crate::model::GenerateConsistencyTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateConsistencyTokenResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateConsistencyTokenResponse>> {
         T::generate_consistency_token(self, req, options).await
     }
 
@@ -974,8 +963,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn check_consistency(
         &self,
         req: crate::model::CheckConsistencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckConsistencyResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckConsistencyResponse>> {
         T::check_consistency(self, req, options).await
     }
 
@@ -983,8 +972,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn snapshot_table(
         &self,
         req: crate::model::SnapshotTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::snapshot_table(self, req, options).await
     }
 
@@ -992,8 +981,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>> {
         T::get_snapshot(self, req, options).await
     }
 
@@ -1001,8 +990,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         T::list_snapshots(self, req, options).await
     }
 
@@ -1010,8 +999,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_snapshot(self, req, options).await
     }
 
@@ -1019,8 +1008,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup(self, req, options).await
     }
 
@@ -1028,8 +1017,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -1037,8 +1026,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::update_backup(self, req, options).await
     }
 
@@ -1046,8 +1035,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -1055,8 +1044,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -1064,8 +1053,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn restore_table(
         &self,
         req: crate::model::RestoreTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_table(self, req, options).await
     }
 
@@ -1073,8 +1062,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn copy_backup(
         &self,
         req: crate::model::CopyBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::copy_backup(self, req, options).await
     }
 
@@ -1082,8 +1071,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1091,8 +1080,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1100,10 +1089,9 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1111,8 +1099,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn create_schema_bundle(
         &self,
         req: crate::model::CreateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_schema_bundle(self, req, options).await
     }
 
@@ -1120,8 +1108,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn update_schema_bundle(
         &self,
         req: crate::model::UpdateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_schema_bundle(self, req, options).await
     }
 
@@ -1129,8 +1117,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_schema_bundle(
         &self,
         req: crate::model::GetSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaBundle>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaBundle>> {
         T::get_schema_bundle(self, req, options).await
     }
 
@@ -1138,8 +1126,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn list_schema_bundles(
         &self,
         req: crate::model::ListSchemaBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchemaBundlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchemaBundlesResponse>> {
         T::list_schema_bundles(self, req, options).await
     }
 
@@ -1147,8 +1135,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn delete_schema_bundle(
         &self,
         req: crate::model::DeleteSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_schema_bundle(self, req, options).await
     }
 
@@ -1156,10 +1144,9 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1167,8 +1154,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1176,8 +1163,8 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1185,22 +1172,22 @@ impl<T: super::BigtableTableAdmin> BigtableTableAdmin for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/bigtable/admin/v2/src/tracing.rs b/src/generated/bigtable/admin/v2/src/tracing.rs
index 219cde30d8..5a46791a88 100644
--- a/src/generated/bigtable/admin/v2/src/tracing.rs
+++ b/src/generated/bigtable/admin/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::Instance,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn partial_update_instance(
         &self,
         req: crate::model::PartialUpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.partial_update_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_cluster(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         self.inner.get_cluster(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         self.inner.list_clusters(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn update_cluster(
         &self,
         req: crate::model::Cluster,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_cluster(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn partial_update_cluster(
         &self,
         req: crate::model::PartialUpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.partial_update_cluster(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_cluster(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn create_app_profile(
         &self,
         req: crate::model::CreateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppProfile>> {
         self.inner.create_app_profile(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn get_app_profile(
         &self,
         req: crate::model::GetAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppProfile>> {
         self.inner.get_app_profile(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn list_app_profiles(
         &self,
         req: crate::model::ListAppProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppProfilesResponse>> {
         self.inner.list_app_profiles(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn update_app_profile(
         &self,
         req: crate::model::UpdateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_app_profile(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn delete_app_profile(
         &self,
         req: crate::model::DeleteAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_app_profile(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -212,9 +212,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -222,8 +221,8 @@ where
     async fn list_hot_tablets(
         &self,
         req: crate::model::ListHotTabletsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHotTabletsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHotTabletsResponse>> {
         self.inner.list_hot_tablets(req, options).await
     }
 
@@ -231,8 +230,8 @@ where
     async fn create_logical_view(
         &self,
         req: crate::model::CreateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_logical_view(req, options).await
     }
 
@@ -240,8 +239,8 @@ where
     async fn get_logical_view(
         &self,
         req: crate::model::GetLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LogicalView>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LogicalView>> {
         self.inner.get_logical_view(req, options).await
     }
 
@@ -249,8 +248,8 @@ where
     async fn list_logical_views(
         &self,
         req: crate::model::ListLogicalViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLogicalViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLogicalViewsResponse>> {
         self.inner.list_logical_views(req, options).await
     }
 
@@ -258,8 +257,8 @@ where
     async fn update_logical_view(
         &self,
         req: crate::model::UpdateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_logical_view(req, options).await
     }
 
@@ -267,8 +266,8 @@ where
     async fn delete_logical_view(
         &self,
         req: crate::model::DeleteLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_logical_view(req, options).await
     }
 
@@ -276,8 +275,8 @@ where
     async fn create_materialized_view(
         &self,
         req: crate::model::CreateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_materialized_view(req, options).await
     }
 
@@ -285,8 +284,8 @@ where
     async fn get_materialized_view(
         &self,
         req: crate::model::GetMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MaterializedView>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MaterializedView>> {
         self.inner.get_materialized_view(req, options).await
     }
 
@@ -294,8 +293,8 @@ where
     async fn list_materialized_views(
         &self,
         req: crate::model::ListMaterializedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMaterializedViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMaterializedViewsResponse>> {
         self.inner.list_materialized_views(req, options).await
     }
 
@@ -303,8 +302,8 @@ where
     async fn update_materialized_view(
         &self,
         req: crate::model::UpdateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_materialized_view(req, options).await
     }
 
@@ -312,8 +311,8 @@ where
     async fn delete_materialized_view(
         &self,
         req: crate::model::DeleteMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_materialized_view(req, options).await
     }
 
@@ -321,9 +320,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -331,8 +329,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -340,8 +338,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -349,22 +347,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -395,8 +393,8 @@ where
     async fn create_table(
         &self,
         req: crate::model::CreateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.create_table(req, options).await
     }
 
@@ -404,8 +402,8 @@ where
     async fn create_table_from_snapshot(
         &self,
         req: crate::model::CreateTableFromSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_table_from_snapshot(req, options).await
     }
 
@@ -413,8 +411,8 @@ where
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTablesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTablesResponse>> {
         self.inner.list_tables(req, options).await
     }
 
@@ -422,8 +420,8 @@ where
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.get_table(req, options).await
     }
 
@@ -431,8 +429,8 @@ where
     async fn update_table(
         &self,
         req: crate::model::UpdateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_table(req, options).await
     }
 
@@ -440,8 +438,8 @@ where
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_table(req, options).await
     }
 
@@ -449,8 +447,8 @@ where
     async fn undelete_table(
         &self,
         req: crate::model::UndeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undelete_table(req, options).await
     }
 
@@ -458,8 +456,8 @@ where
     async fn create_authorized_view(
         &self,
         req: crate::model::CreateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_authorized_view(req, options).await
     }
 
@@ -467,8 +465,8 @@ where
     async fn list_authorized_views(
         &self,
         req: crate::model::ListAuthorizedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuthorizedViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuthorizedViewsResponse>> {
         self.inner.list_authorized_views(req, options).await
     }
 
@@ -476,8 +474,8 @@ where
     async fn get_authorized_view(
         &self,
         req: crate::model::GetAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedView>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedView>> {
         self.inner.get_authorized_view(req, options).await
     }
 
@@ -485,8 +483,8 @@ where
     async fn update_authorized_view(
         &self,
         req: crate::model::UpdateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_authorized_view(req, options).await
     }
 
@@ -494,8 +492,8 @@ where
     async fn delete_authorized_view(
         &self,
         req: crate::model::DeleteAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_authorized_view(req, options).await
     }
 
@@ -503,8 +501,8 @@ where
     async fn modify_column_families(
         &self,
         req: crate::model::ModifyColumnFamiliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.modify_column_families(req, options).await
     }
 
@@ -512,8 +510,8 @@ where
     async fn drop_row_range(
         &self,
         req: crate::model::DropRowRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.drop_row_range(req, options).await
     }
 
@@ -521,8 +519,8 @@ where
     async fn generate_consistency_token(
         &self,
         req: crate::model::GenerateConsistencyTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateConsistencyTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateConsistencyTokenResponse>> {
         self.inner.generate_consistency_token(req, options).await
     }
 
@@ -530,8 +528,8 @@ where
     async fn check_consistency(
         &self,
         req: crate::model::CheckConsistencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckConsistencyResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckConsistencyResponse>> {
         self.inner.check_consistency(req, options).await
     }
 
@@ -539,8 +537,8 @@ where
     async fn snapshot_table(
         &self,
         req: crate::model::SnapshotTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.snapshot_table(req, options).await
     }
 
@@ -548,8 +546,8 @@ where
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         self.inner.get_snapshot(req, options).await
     }
 
@@ -557,8 +555,8 @@ where
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         self.inner.list_snapshots(req, options).await
     }
 
@@ -566,8 +564,8 @@ where
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_snapshot(req, options).await
     }
 
@@ -575,8 +573,8 @@ where
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup(req, options).await
     }
 
@@ -584,8 +582,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -593,8 +591,8 @@ where
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.update_backup(req, options).await
     }
 
@@ -602,8 +600,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -611,8 +609,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -620,8 +618,8 @@ where
     async fn restore_table(
         &self,
         req: crate::model::RestoreTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_table(req, options).await
     }
 
@@ -629,8 +627,8 @@ where
     async fn copy_backup(
         &self,
         req: crate::model::CopyBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.copy_backup(req, options).await
     }
 
@@ -638,8 +636,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -647,8 +645,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -656,9 +654,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -666,8 +663,8 @@ where
     async fn create_schema_bundle(
         &self,
         req: crate::model::CreateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_schema_bundle(req, options).await
     }
 
@@ -675,8 +672,8 @@ where
     async fn update_schema_bundle(
         &self,
         req: crate::model::UpdateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_schema_bundle(req, options).await
     }
 
@@ -684,8 +681,8 @@ where
     async fn get_schema_bundle(
         &self,
         req: crate::model::GetSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaBundle>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaBundle>> {
         self.inner.get_schema_bundle(req, options).await
     }
 
@@ -693,8 +690,8 @@ where
     async fn list_schema_bundles(
         &self,
         req: crate::model::ListSchemaBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchemaBundlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchemaBundlesResponse>> {
         self.inner.list_schema_bundles(req, options).await
     }
 
@@ -702,8 +699,8 @@ where
     async fn delete_schema_bundle(
         &self,
         req: crate::model::DeleteSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_schema_bundle(req, options).await
     }
 
@@ -711,9 +708,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -721,8 +717,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -730,8 +726,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -739,22 +735,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/bigtable/admin/v2/src/transport.rs b/src/generated/bigtable/admin/v2/src/transport.rs
index 087e05e250..03fe04ef46 100644
--- a/src/generated/bigtable/admin/v2/src/transport.rs
+++ b/src/generated/bigtable/admin/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [BigtableInstanceAdmin](super::stub::BigtableInstanceAdmin) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for BigtableInstanceAdmin {
 }
 
 impl BigtableInstanceAdmin {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76,9 +76,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -93,13 +93,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -136,9 +136,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -153,13 +153,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -187,9 +187,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -204,13 +204,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn update_instance(
         &self,
         req: crate::model::Instance,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -247,9 +247,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -264,13 +264,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn partial_update_instance(
         &self,
         req: crate::model::PartialUpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -325,9 +325,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342,13 +342,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -385,9 +385,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -396,24 +396,25 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -451,9 +452,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -468,13 +469,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -515,9 +516,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -532,13 +533,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -576,9 +577,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -593,13 +594,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn update_cluster(
         &self,
         req: crate::model::Cluster,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -640,9 +641,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -657,13 +658,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn partial_update_cluster(
         &self,
         req: crate::model::PartialUpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -722,9 +723,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -739,13 +740,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -786,9 +787,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -797,24 +798,25 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_app_profile(
         &self,
         req: crate::model::CreateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -853,9 +855,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -870,13 +872,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn get_app_profile(
         &self,
         req: crate::model::GetAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -917,9 +919,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -934,13 +936,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn list_app_profiles(
         &self,
         req: crate::model::ListAppProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppProfilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppProfilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -979,9 +981,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -996,13 +998,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn update_app_profile(
         &self,
         req: crate::model::UpdateAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1062,9 +1064,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1079,13 +1081,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn delete_app_profile(
         &self,
         req: crate::model::DeleteAppProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1127,9 +1129,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1138,24 +1140,25 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1266,9 +1269,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1283,13 +1286,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1400,9 +1403,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1417,14 +1420,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1535,9 +1537,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1552,13 +1554,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn list_hot_tablets(
         &self,
         req: crate::model::ListHotTabletsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHotTabletsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHotTabletsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1623,9 +1625,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1640,13 +1642,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn create_logical_view(
         &self,
         req: crate::model::CreateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1684,9 +1686,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1701,13 +1703,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn get_logical_view(
         &self,
         req: crate::model::GetLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LogicalView>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LogicalView>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1748,9 +1750,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1765,13 +1767,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn list_logical_views(
         &self,
         req: crate::model::ListLogicalViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLogicalViewsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLogicalViewsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1810,9 +1812,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1827,13 +1829,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn update_logical_view(
         &self,
         req: crate::model::UpdateLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1892,9 +1894,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1909,13 +1911,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn delete_logical_view(
         &self,
         req: crate::model::DeleteLogicalViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1957,9 +1959,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1968,24 +1970,25 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_materialized_view(
         &self,
         req: crate::model::CreateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2023,9 +2026,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2040,13 +2043,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn get_materialized_view(
         &self,
         req: crate::model::GetMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MaterializedView>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MaterializedView>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2087,9 +2090,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2104,13 +2107,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn list_materialized_views(
         &self,
         req: crate::model::ListMaterializedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMaterializedViewsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMaterializedViewsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2149,9 +2152,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2166,13 +2169,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn update_materialized_view(
         &self,
         req: crate::model::UpdateMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2231,9 +2234,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2248,13 +2251,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn delete_materialized_view(
         &self,
         req: crate::model::DeleteMaterializedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2296,9 +2299,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2307,25 +2310,25 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2363,9 +2366,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2380,13 +2383,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2419,9 +2422,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2436,13 +2439,13 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2475,9 +2478,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2486,24 +2489,25 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2536,9 +2540,9 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2547,25 +2551,26 @@ impl super::stub::BigtableInstanceAdmin for BigtableInstanceAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2585,7 +2590,7 @@ impl std::fmt::Debug for BigtableTableAdmin {
 }
 
 impl BigtableTableAdmin {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2595,13 +2600,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn create_table(
         &self,
         req: crate::model::CreateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2638,9 +2643,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2655,13 +2660,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn create_table_from_snapshot(
         &self,
         req: crate::model::CreateTableFromSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2698,9 +2703,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2715,13 +2720,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTablesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTablesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2761,9 +2766,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2778,13 +2783,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2826,9 +2831,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2843,13 +2848,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn update_table(
         &self,
         req: crate::model::UpdateTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2909,9 +2914,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2926,13 +2931,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2973,9 +2978,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2984,24 +2989,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn undelete_table(
         &self,
         req: crate::model::UndeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3042,9 +3048,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3059,13 +3065,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn create_authorized_view(
         &self,
         req: crate::model::CreateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3107,9 +3113,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3124,13 +3130,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn list_authorized_views(
         &self,
         req: crate::model::ListAuthorizedViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuthorizedViewsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuthorizedViewsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3174,9 +3180,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3191,13 +3197,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_authorized_view(
         &self,
         req: crate::model::GetAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizedView>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizedView>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3243,9 +3249,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3260,13 +3266,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn update_authorized_view(
         &self,
         req: crate::model::UpdateAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3330,9 +3336,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3347,13 +3353,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn delete_authorized_view(
         &self,
         req: crate::model::DeleteAuthorizedViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3399,9 +3405,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3410,24 +3416,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn modify_column_families(
         &self,
         req: crate::model::ModifyColumnFamiliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3468,9 +3475,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3485,13 +3492,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn drop_row_range(
         &self,
         req: crate::model::DropRowRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3532,9 +3539,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3543,24 +3550,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn generate_consistency_token(
         &self,
         req: crate::model::GenerateConsistencyTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateConsistencyTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateConsistencyTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3601,9 +3609,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3618,13 +3626,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn check_consistency(
         &self,
         req: crate::model::CheckConsistencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckConsistencyResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckConsistencyResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3665,9 +3673,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3682,13 +3690,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn snapshot_table(
         &self,
         req: crate::model::SnapshotTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3729,9 +3737,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3746,13 +3754,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3797,9 +3805,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3814,13 +3822,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3863,9 +3871,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3880,13 +3888,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3931,9 +3939,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3942,24 +3950,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4001,9 +4010,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4018,13 +4027,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4069,9 +4078,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4086,13 +4095,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4155,9 +4164,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4172,13 +4181,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4223,9 +4232,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4234,24 +4243,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4296,9 +4306,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4313,13 +4323,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn restore_table(
         &self,
         req: crate::model::RestoreTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4356,9 +4366,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4373,13 +4383,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn copy_backup(
         &self,
         req: crate::model::CopyBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4420,9 +4430,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4437,13 +4447,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4607,9 +4617,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4624,13 +4634,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4794,9 +4804,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4811,14 +4821,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4982,9 +4991,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4999,13 +5008,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn create_schema_bundle(
         &self,
         req: crate::model::CreateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5047,9 +5056,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5064,13 +5073,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn update_schema_bundle(
         &self,
         req: crate::model::UpdateSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5134,9 +5143,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5151,13 +5160,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_schema_bundle(
         &self,
         req: crate::model::GetSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaBundle>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaBundle>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5202,9 +5211,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5219,13 +5228,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn list_schema_bundles(
         &self,
         req: crate::model::ListSchemaBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchemaBundlesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchemaBundlesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5268,9 +5277,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5285,13 +5294,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn delete_schema_bundle(
         &self,
         req: crate::model::DeleteSchemaBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5337,9 +5346,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5348,25 +5357,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5404,9 +5413,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5421,13 +5430,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5460,9 +5469,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5477,13 +5486,13 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5516,9 +5525,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5527,24 +5536,25 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5577,9 +5587,9 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5588,25 +5598,26 @@ impl super::stub::BigtableTableAdmin for BigtableTableAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/accessapproval/v1/Cargo.toml b/src/generated/cloud/accessapproval/v1/Cargo.toml
index aa953e58ca..9d3794643b 100644
--- a/src/generated/cloud/accessapproval/v1/Cargo.toml
+++ b/src/generated/cloud/accessapproval/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/accessapproval/v1/src/builder.rs b/src/generated/cloud/accessapproval/v1/src/builder.rs
index 689c531e93..0942a71db1 100644
--- a/src/generated/cloud/accessapproval/v1/src/builder.rs
+++ b/src/generated/cloud/accessapproval/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod access_approval {
     /// A builder for [AccessApproval][crate::client::AccessApproval].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_accessapproval_v1::*;
     /// # use builder::access_approval::ClientBuilder;
     /// # use client::AccessApproval;
@@ -30,19 +30,18 @@ pub mod access_approval {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AccessApproval;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AccessApproval;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod access_approval {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AccessApproval>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod access_approval {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::ListApprovalRequests;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod access_approval {
             (*self.0.stub)
                 .list_approval_requests(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListApprovalRequestsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListApprovalRequestsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod access_approval {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListApprovalRequestsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -176,8 +177,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListApprovalRequests {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListApprovalRequests {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -187,7 +188,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::GetApprovalRequest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .get_approval_request(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApprovalRequestMessage::name].
@@ -239,8 +240,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApprovalRequest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApprovalRequest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -250,7 +251,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::ApproveApprovalRequest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -281,7 +282,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -291,7 +292,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .approve_approval_request(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ApproveApprovalRequestMessage::name].
@@ -320,8 +321,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApproveApprovalRequest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApproveApprovalRequest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -331,7 +332,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::DismissApprovalRequest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -362,7 +363,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -372,7 +373,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .dismiss_approval_request(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DismissApprovalRequestMessage::name].
@@ -383,8 +384,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DismissApprovalRequest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DismissApprovalRequest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -394,7 +395,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::InvalidateApprovalRequest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -427,7 +428,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -437,7 +438,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .invalidate_approval_request(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::InvalidateApprovalRequestMessage::name].
@@ -448,8 +449,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InvalidateApprovalRequest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InvalidateApprovalRequest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -459,7 +460,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::GetAccessApprovalSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -492,7 +493,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -502,7 +503,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .get_access_approval_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAccessApprovalSettingsMessage::name].
@@ -513,8 +514,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAccessApprovalSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAccessApprovalSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -524,7 +525,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::UpdateAccessApprovalSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -557,7 +558,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -567,7 +568,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .update_access_approval_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [settings][crate::model::UpdateAccessApprovalSettingsMessage::settings].
@@ -608,8 +609,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAccessApprovalSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAccessApprovalSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -619,7 +620,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::DeleteAccessApprovalSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -652,7 +653,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -662,7 +663,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .delete_access_approval_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAccessApprovalSettingsMessage::name].
@@ -673,8 +674,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAccessApprovalSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAccessApprovalSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -684,7 +685,7 @@ pub mod access_approval {
     /// # Example
     /// ```
     /// # use google_cloud_accessapproval_v1::builder::access_approval::GetAccessApprovalServiceAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_accessapproval_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -717,7 +718,7 @@ pub mod access_approval {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -727,7 +728,7 @@ pub mod access_approval {
             (*self.0.stub)
                 .get_access_approval_service_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAccessApprovalServiceAccountMessage::name].
@@ -738,8 +739,8 @@ pub mod access_approval {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAccessApprovalServiceAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAccessApprovalServiceAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/accessapproval/v1/src/client.rs b/src/generated/cloud/accessapproval/v1/src/client.rs
index 4bcd315b56..dfc4cdf7f5 100644
--- a/src/generated/cloud/accessapproval/v1/src/client.rs
+++ b/src/generated/cloud/accessapproval/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_accessapproval_v1::client::AccessApproval;
 /// let client = AccessApproval::builder().build().await?;
 /// // use `client` to make requests to the Access Approval API.
@@ -100,13 +100,13 @@ impl AccessApproval {
     /// Returns a builder for [AccessApproval].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_accessapproval_v1::client::AccessApproval;
     /// let client = AccessApproval::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::access_approval::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::access_approval::client::Factory)
+        crate::new_client_builder(super::builder::access_approval::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -124,14 +124,14 @@ impl AccessApproval {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AccessApproval>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AccessApproval>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -140,13 +140,13 @@ impl AccessApproval {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AccessApproval> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AccessApproval> {
         super::transport::AccessApproval::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AccessApproval> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AccessApproval> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AccessApproval::new)
diff --git a/src/generated/cloud/accessapproval/v1/src/lib.rs b/src/generated/cloud/accessapproval/v1/src/lib.rs
index cbbf9d12a9..9d8680ab42 100644
--- a/src/generated/cloud/accessapproval/v1/src/lib.rs
+++ b/src/generated/cloud/accessapproval/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/accessapproval/v1/src/model.rs b/src/generated/cloud/accessapproval/v1/src/model.rs
index 33762c63c2..1fec1adf95 100644
--- a/src/generated/cloud/accessapproval/v1/src/model.rs
+++ b/src/generated/cloud/accessapproval/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -1631,7 +1631,7 @@ impl wkt::message::Message for ListApprovalRequestsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListApprovalRequestsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListApprovalRequestsResponse {
     type PageItem = crate::model::ApprovalRequest;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/accessapproval/v1/src/stub.rs b/src/generated/cloud/accessapproval/v1/src/stub.rs
index b10b270c65..5840c07f9c 100644
--- a/src/generated/cloud/accessapproval/v1/src/stub.rs
+++ b/src/generated/cloud/accessapproval/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn list_approval_requests(
         &self,
         _req: crate::model::ListApprovalRequestsMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListApprovalRequestsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListApprovalRequestsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn get_approval_request(
         &self,
         _req: crate::model::GetApprovalRequestMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApprovalRequest>>,
+        Output = crate::Result<crate::Response<crate::model::ApprovalRequest>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn approve_approval_request(
         &self,
         _req: crate::model::ApproveApprovalRequestMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApprovalRequest>>,
+        Output = crate::Result<crate::Response<crate::model::ApprovalRequest>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn dismiss_approval_request(
         &self,
         _req: crate::model::DismissApprovalRequestMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApprovalRequest>>,
+        Output = crate::Result<crate::Response<crate::model::ApprovalRequest>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn invalidate_approval_request(
         &self,
         _req: crate::model::InvalidateApprovalRequestMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApprovalRequest>>,
+        Output = crate::Result<crate::Response<crate::model::ApprovalRequest>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn get_access_approval_settings(
         &self,
         _req: crate::model::GetAccessApprovalSettingsMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AccessApprovalSettings>>,
+        Output = crate::Result<crate::Response<crate::model::AccessApprovalSettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +108,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn update_access_approval_settings(
         &self,
         _req: crate::model::UpdateAccessApprovalSettingsMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AccessApprovalSettings>>,
+        Output = crate::Result<crate::Response<crate::model::AccessApprovalSettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,8 +119,8 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn delete_access_approval_settings(
         &self,
         _req: crate::model::DeleteAccessApprovalSettingsMessage,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -128,9 +128,9 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     fn get_access_approval_service_account(
         &self,
         _req: crate::model::GetAccessApprovalServiceAccountMessage,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AccessApprovalServiceAccount>>,
+        Output = crate::Result<crate::Response<crate::model::AccessApprovalServiceAccount>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/accessapproval/v1/src/stub/dynamic.rs b/src/generated/cloud/accessapproval/v1/src/stub/dynamic.rs
index 4370b5956b..d89d85ded2 100644
--- a/src/generated/cloud/accessapproval/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/accessapproval/v1/src/stub/dynamic.rs
@@ -20,56 +20,56 @@ pub trait AccessApproval: std::fmt::Debug + Send + Sync {
     async fn list_approval_requests(
         &self,
         req: crate::model::ListApprovalRequestsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApprovalRequestsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApprovalRequestsResponse>>;
 
     async fn get_approval_request(
         &self,
         req: crate::model::GetApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>>;
 
     async fn approve_approval_request(
         &self,
         req: crate::model::ApproveApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>>;
 
     async fn dismiss_approval_request(
         &self,
         req: crate::model::DismissApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>>;
 
     async fn invalidate_approval_request(
         &self,
         req: crate::model::InvalidateApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>>;
 
     async fn get_access_approval_settings(
         &self,
         req: crate::model::GetAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccessApprovalSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccessApprovalSettings>>;
 
     async fn update_access_approval_settings(
         &self,
         req: crate::model::UpdateAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccessApprovalSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccessApprovalSettings>>;
 
     async fn delete_access_approval_settings(
         &self,
         req: crate::model::DeleteAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_access_approval_service_account(
         &self,
         req: crate::model::GetAccessApprovalServiceAccountMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccessApprovalServiceAccount>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccessApprovalServiceAccount>>;
 }
 
 /// All implementations of [super::AccessApproval] also implement [AccessApproval].
@@ -79,8 +79,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn list_approval_requests(
         &self,
         req: crate::model::ListApprovalRequestsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApprovalRequestsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApprovalRequestsResponse>> {
         T::list_approval_requests(self, req, options).await
     }
 
@@ -88,8 +88,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn get_approval_request(
         &self,
         req: crate::model::GetApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>> {
         T::get_approval_request(self, req, options).await
     }
 
@@ -97,8 +97,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn approve_approval_request(
         &self,
         req: crate::model::ApproveApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>> {
         T::approve_approval_request(self, req, options).await
     }
 
@@ -106,8 +106,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn dismiss_approval_request(
         &self,
         req: crate::model::DismissApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>> {
         T::dismiss_approval_request(self, req, options).await
     }
 
@@ -115,8 +115,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn invalidate_approval_request(
         &self,
         req: crate::model::InvalidateApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApprovalRequest>> {
         T::invalidate_approval_request(self, req, options).await
     }
 
@@ -124,8 +124,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn get_access_approval_settings(
         &self,
         req: crate::model::GetAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccessApprovalSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccessApprovalSettings>> {
         T::get_access_approval_settings(self, req, options).await
     }
 
@@ -133,8 +133,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn update_access_approval_settings(
         &self,
         req: crate::model::UpdateAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccessApprovalSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccessApprovalSettings>> {
         T::update_access_approval_settings(self, req, options).await
     }
 
@@ -142,8 +142,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn delete_access_approval_settings(
         &self,
         req: crate::model::DeleteAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_access_approval_settings(self, req, options).await
     }
 
@@ -151,8 +151,8 @@ impl<T: super::AccessApproval> AccessApproval for T {
     async fn get_access_approval_service_account(
         &self,
         req: crate::model::GetAccessApprovalServiceAccountMessage,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccessApprovalServiceAccount>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccessApprovalServiceAccount>> {
         T::get_access_approval_service_account(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/accessapproval/v1/src/tracing.rs b/src/generated/cloud/accessapproval/v1/src/tracing.rs
index 7e61a4e238..8915aed414 100644
--- a/src/generated/cloud/accessapproval/v1/src/tracing.rs
+++ b/src/generated/cloud/accessapproval/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_approval_requests(
         &self,
         req: crate::model::ListApprovalRequestsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApprovalRequestsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApprovalRequestsResponse>> {
         self.inner.list_approval_requests(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_approval_request(
         &self,
         req: crate::model::GetApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         self.inner.get_approval_request(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn approve_approval_request(
         &self,
         req: crate::model::ApproveApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         self.inner.approve_approval_request(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn dismiss_approval_request(
         &self,
         req: crate::model::DismissApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         self.inner.dismiss_approval_request(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn invalidate_approval_request(
         &self,
         req: crate::model::InvalidateApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         self.inner.invalidate_approval_request(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_access_approval_settings(
         &self,
         req: crate::model::GetAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccessApprovalSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccessApprovalSettings>> {
         self.inner.get_access_approval_settings(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn update_access_approval_settings(
         &self,
         req: crate::model::UpdateAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccessApprovalSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccessApprovalSettings>> {
         self.inner
             .update_access_approval_settings(req, options)
             .await
@@ -106,8 +106,8 @@ where
     async fn delete_access_approval_settings(
         &self,
         req: crate::model::DeleteAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .delete_access_approval_settings(req, options)
             .await
@@ -117,8 +117,8 @@ where
     async fn get_access_approval_service_account(
         &self,
         req: crate::model::GetAccessApprovalServiceAccountMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccessApprovalServiceAccount>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccessApprovalServiceAccount>> {
         self.inner
             .get_access_approval_service_account(req, options)
             .await
diff --git a/src/generated/cloud/accessapproval/v1/src/transport.rs b/src/generated/cloud/accessapproval/v1/src/transport.rs
index b2e9fe7451..92f0197a14 100644
--- a/src/generated/cloud/accessapproval/v1/src/transport.rs
+++ b/src/generated/cloud/accessapproval/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AccessApproval](super::stub::AccessApproval) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AccessApproval {
 }
 
 impl AccessApproval {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn list_approval_requests(
         &self,
         req: crate::model::ListApprovalRequestsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApprovalRequestsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApprovalRequestsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -131,9 +131,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148,13 +148,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn get_approval_request(
         &self,
         req: crate::model::GetApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -257,9 +257,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -274,13 +274,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn approve_approval_request(
         &self,
         req: crate::model::ApproveApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -383,9 +383,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400,13 +400,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn dismiss_approval_request(
         &self,
         req: crate::model::DismissApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -509,9 +509,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -526,13 +526,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn invalidate_approval_request(
         &self,
         req: crate::model::InvalidateApprovalRequestMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApprovalRequest>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApprovalRequest>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -635,9 +635,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -652,13 +652,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn get_access_approval_settings(
         &self,
         req: crate::model::GetAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccessApprovalSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccessApprovalSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -755,9 +755,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -772,13 +772,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn update_access_approval_settings(
         &self,
         req: crate::model::UpdateAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccessApprovalSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccessApprovalSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -929,9 +929,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -946,13 +946,13 @@ impl super::stub::AccessApproval for AccessApproval {
     async fn delete_access_approval_settings(
         &self,
         req: crate::model::DeleteAccessApprovalSettingsMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1049,9 +1049,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1060,24 +1060,25 @@ impl super::stub::AccessApproval for AccessApproval {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_access_approval_service_account(
         &self,
         req: crate::model::GetAccessApprovalServiceAccountMessage,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccessApprovalServiceAccount>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccessApprovalServiceAccount>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1174,9 +1175,9 @@ impl super::stub::AccessApproval for AccessApproval {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/advisorynotifications/v1/Cargo.toml b/src/generated/cloud/advisorynotifications/v1/Cargo.toml
index e7a26d8210..ec68ab3c47 100644
--- a/src/generated/cloud/advisorynotifications/v1/Cargo.toml
+++ b/src/generated/cloud/advisorynotifications/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/advisorynotifications/v1/src/builder.rs b/src/generated/cloud/advisorynotifications/v1/src/builder.rs
index a2a3ca20e0..fdb069fb6a 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/builder.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod advisory_notifications_service {
     /// A builder for [AdvisoryNotificationsService][crate::client::AdvisoryNotificationsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_advisorynotifications_v1::*;
     /// # use builder::advisory_notifications_service::ClientBuilder;
     /// # use client::AdvisoryNotificationsService;
@@ -30,19 +30,18 @@ pub mod advisory_notifications_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AdvisoryNotificationsService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AdvisoryNotificationsService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod advisory_notifications_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AdvisoryNotificationsService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod advisory_notifications_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod advisory_notifications_service {
     /// # Example
     /// ```
     /// # use google_cloud_advisorynotifications_v1::builder::advisory_notifications_service::ListNotifications;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_advisorynotifications_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod advisory_notifications_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod advisory_notifications_service {
             (*self.0.stub)
                 .list_notifications(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNotificationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListNotificationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,15 +137,17 @@ pub mod advisory_notifications_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListNotificationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListNotificationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -182,8 +185,8 @@ pub mod advisory_notifications_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNotifications {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNotifications {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -193,7 +196,7 @@ pub mod advisory_notifications_service {
     /// # Example
     /// ```
     /// # use google_cloud_advisorynotifications_v1::builder::advisory_notifications_service::GetNotification;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_advisorynotifications_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -221,7 +224,7 @@ pub mod advisory_notifications_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -231,7 +234,7 @@ pub mod advisory_notifications_service {
             (*self.0.stub)
                 .get_notification(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNotificationRequest::name].
@@ -250,8 +253,8 @@ pub mod advisory_notifications_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNotification {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNotification {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -261,7 +264,7 @@ pub mod advisory_notifications_service {
     /// # Example
     /// ```
     /// # use google_cloud_advisorynotifications_v1::builder::advisory_notifications_service::GetSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_advisorynotifications_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -289,7 +292,7 @@ pub mod advisory_notifications_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -299,7 +302,7 @@ pub mod advisory_notifications_service {
             (*self.0.stub)
                 .get_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSettingsRequest::name].
@@ -312,8 +315,8 @@ pub mod advisory_notifications_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -323,7 +326,7 @@ pub mod advisory_notifications_service {
     /// # Example
     /// ```
     /// # use google_cloud_advisorynotifications_v1::builder::advisory_notifications_service::UpdateSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_advisorynotifications_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -351,7 +354,7 @@ pub mod advisory_notifications_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -361,7 +364,7 @@ pub mod advisory_notifications_service {
             (*self.0.stub)
                 .update_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [settings][crate::model::UpdateSettingsRequest::settings].
@@ -388,8 +391,8 @@ pub mod advisory_notifications_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/advisorynotifications/v1/src/client.rs b/src/generated/cloud/advisorynotifications/v1/src/client.rs
index 55f2cccfd3..aa60f843aa 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/client.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_advisorynotifications_v1::client::AdvisoryNotificationsService;
 /// let client = AdvisoryNotificationsService::builder().build().await?;
 /// // use `client` to make requests to the Advisory Notifications API.
@@ -66,15 +66,13 @@ impl AdvisoryNotificationsService {
     /// Returns a builder for [AdvisoryNotificationsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_advisorynotifications_v1::client::AdvisoryNotificationsService;
     /// let client = AdvisoryNotificationsService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::advisory_notifications_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::advisory_notifications_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::advisory_notifications_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl AdvisoryNotificationsService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::AdvisoryNotificationsService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -110,13 +108,13 @@ impl AdvisoryNotificationsService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AdvisoryNotificationsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AdvisoryNotificationsService> {
         super::transport::AdvisoryNotificationsService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AdvisoryNotificationsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AdvisoryNotificationsService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AdvisoryNotificationsService::new)
diff --git a/src/generated/cloud/advisorynotifications/v1/src/lib.rs b/src/generated/cloud/advisorynotifications/v1/src/lib.rs
index 242fb08f3c..31afc6170c 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/lib.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/advisorynotifications/v1/src/model.rs b/src/generated/cloud/advisorynotifications/v1/src/model.rs
index 0e1479b280..941fbbb71b 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/model.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -926,7 +926,7 @@ impl wkt::message::Message for ListNotificationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNotificationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNotificationsResponse {
     type PageItem = crate::model::Notification;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/advisorynotifications/v1/src/stub.rs b/src/generated/cloud/advisorynotifications/v1/src/stub.rs
index 253dc4c69d..09b3ba1994 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/stub.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AdvisoryNotificationsService: std::fmt::Debug + Send + Sync {
     fn list_notifications(
         &self,
         _req: crate::model::ListNotificationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNotificationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNotificationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AdvisoryNotificationsService: std::fmt::Debug + Send + Sync {
     fn get_notification(
         &self,
         _req: crate::model::GetNotificationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Notification>>,
+        Output = crate::Result<crate::Response<crate::model::Notification>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +64,9 @@ pub trait AdvisoryNotificationsService: std::fmt::Debug + Send + Sync {
     fn get_settings(
         &self,
         _req: crate::model::GetSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Settings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Settings>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +74,9 @@ pub trait AdvisoryNotificationsService: std::fmt::Debug + Send + Sync {
     fn update_settings(
         &self,
         _req: crate::model::UpdateSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Settings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Settings>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/advisorynotifications/v1/src/stub/dynamic.rs b/src/generated/cloud/advisorynotifications/v1/src/stub/dynamic.rs
index 63eb88fe56..bc2879fd28 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/stub/dynamic.rs
@@ -20,26 +20,26 @@ pub trait AdvisoryNotificationsService: std::fmt::Debug + Send + Sync {
     async fn list_notifications(
         &self,
         req: crate::model::ListNotificationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotificationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotificationsResponse>>;
 
     async fn get_notification(
         &self,
         req: crate::model::GetNotificationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Notification>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Notification>>;
 
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>>;
 
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>>;
 }
 
 /// All implementations of [super::AdvisoryNotificationsService] also implement [AdvisoryNotificationsService].
@@ -49,8 +49,8 @@ impl<T: super::AdvisoryNotificationsService> AdvisoryNotificationsService for T
     async fn list_notifications(
         &self,
         req: crate::model::ListNotificationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotificationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotificationsResponse>> {
         T::list_notifications(self, req, options).await
     }
 
@@ -58,8 +58,8 @@ impl<T: super::AdvisoryNotificationsService> AdvisoryNotificationsService for T
     async fn get_notification(
         &self,
         req: crate::model::GetNotificationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Notification>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Notification>> {
         T::get_notification(self, req, options).await
     }
 
@@ -67,8 +67,8 @@ impl<T: super::AdvisoryNotificationsService> AdvisoryNotificationsService for T
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>> {
         T::get_settings(self, req, options).await
     }
 
@@ -76,8 +76,8 @@ impl<T: super::AdvisoryNotificationsService> AdvisoryNotificationsService for T
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>> {
         T::update_settings(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/advisorynotifications/v1/src/tracing.rs b/src/generated/cloud/advisorynotifications/v1/src/tracing.rs
index da672b00e0..3083402925 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/tracing.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_notifications(
         &self,
         req: crate::model::ListNotificationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotificationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotificationsResponse>> {
         self.inner.list_notifications(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_notification(
         &self,
         req: crate::model::GetNotificationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Notification>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Notification>> {
         self.inner.get_notification(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         self.inner.get_settings(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         self.inner.update_settings(req, options).await
     }
 }
diff --git a/src/generated/cloud/advisorynotifications/v1/src/transport.rs b/src/generated/cloud/advisorynotifications/v1/src/transport.rs
index 7d2fa1e335..7b48219687 100644
--- a/src/generated/cloud/advisorynotifications/v1/src/transport.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AdvisoryNotificationsService](super::stub::AdvisoryNotificationsService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AdvisoryNotificationsService {
 }
 
 impl AdvisoryNotificationsService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
     async fn list_notifications(
         &self,
         req: crate::model::ListNotificationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotificationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotificationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -127,9 +127,9 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -144,13 +144,13 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
     async fn get_notification(
         &self,
         req: crate::model::GetNotificationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Notification>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Notification>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -230,9 +230,9 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -247,13 +247,13 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327,9 +327,9 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -344,13 +344,13 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -436,9 +436,9 @@ impl super::stub::AdvisoryNotificationsService for AdvisoryNotificationsService
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/aiplatform/v1/Cargo.toml b/src/generated/cloud/aiplatform/v1/Cargo.toml
index 3185839739..fadb329ceb 100644
--- a/src/generated/cloud/aiplatform/v1/Cargo.toml
+++ b/src/generated/cloud/aiplatform/v1/Cargo.toml
@@ -141,9 +141,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace         = true
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/aiplatform/v1/src/builder.rs b/src/generated/cloud/aiplatform/v1/src/builder.rs
index 3718ac094d..7c71cc55ad 100644
--- a/src/generated/cloud/aiplatform/v1/src/builder.rs
+++ b/src/generated/cloud/aiplatform/v1/src/builder.rs
@@ -22,7 +22,7 @@ pub mod data_foundry_service {
     /// A builder for [DataFoundryService][crate::client::DataFoundryService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::data_foundry_service::ClientBuilder;
     /// # use client::DataFoundryService;
@@ -32,19 +32,18 @@ pub mod data_foundry_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataFoundryService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataFoundryService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -55,7 +54,7 @@ pub mod data_foundry_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataFoundryService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -68,7 +67,7 @@ pub mod data_foundry_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -78,7 +77,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::GenerateSyntheticData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109,7 +108,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119,7 +118,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .generate_synthetic_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [location][crate::model::GenerateSyntheticDataRequest::location].
@@ -193,8 +192,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateSyntheticData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateSyntheticData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -204,8 +203,8 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -239,7 +238,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -249,15 +248,15 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -266,17 +265,17 @@ pub mod data_foundry_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -306,8 +305,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -317,7 +316,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -348,7 +347,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -358,7 +357,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -369,8 +368,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -380,7 +379,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -411,7 +410,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -421,7 +420,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -474,8 +473,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -485,7 +484,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -516,7 +515,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -526,7 +525,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -557,8 +556,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -568,7 +567,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -601,7 +600,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -611,7 +610,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -637,8 +636,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -648,8 +647,8 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -685,7 +684,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -695,15 +694,15 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -712,17 +711,17 @@ pub mod data_foundry_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -758,8 +757,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -769,7 +768,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -800,7 +799,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -810,7 +809,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -821,8 +820,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -832,7 +831,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -865,7 +864,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -875,7 +874,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -886,8 +885,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -897,7 +896,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -930,7 +929,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -940,7 +939,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -951,8 +950,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -962,7 +961,7 @@ pub mod data_foundry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::data_foundry_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -993,7 +992,7 @@ pub mod data_foundry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1003,7 +1002,7 @@ pub mod data_foundry_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -1032,8 +1031,8 @@ pub mod data_foundry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1047,7 +1046,7 @@ pub mod dataset_service {
     /// A builder for [DatasetService][crate::client::DatasetService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::dataset_service::ClientBuilder;
     /// # use client::DatasetService;
@@ -1057,19 +1056,18 @@ pub mod dataset_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DatasetService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DatasetService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1080,7 +1078,7 @@ pub mod dataset_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DatasetService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1093,7 +1091,7 @@ pub mod dataset_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1103,7 +1101,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::CreateDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1132,7 +1130,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1147,7 +1145,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .create_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_dataset`.
@@ -1166,7 +1164,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1225,8 +1223,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1236,7 +1234,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::GetDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1264,7 +1262,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1274,7 +1272,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDatasetRequest::name].
@@ -1305,8 +1303,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1316,7 +1314,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::UpdateDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1344,7 +1342,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1354,7 +1352,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .update_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [dataset][crate::model::UpdateDatasetRequest::dataset].
@@ -1403,8 +1401,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1414,8 +1412,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListDatasets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1446,7 +1444,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1456,13 +1454,13 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_datasets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDatasetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDatasetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1471,15 +1469,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDatasetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDatasetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1535,8 +1535,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDatasets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDatasets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1546,7 +1546,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::DeleteDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1575,7 +1575,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1590,7 +1590,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .delete_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_dataset`.
@@ -1606,7 +1606,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1643,8 +1643,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1654,7 +1654,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ImportData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1683,7 +1683,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1698,7 +1698,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .import_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_data`.
@@ -1717,7 +1717,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1767,8 +1767,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1778,7 +1778,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ExportData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1807,7 +1807,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1822,7 +1822,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .export_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_data`.
@@ -1841,7 +1841,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1900,8 +1900,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1911,7 +1911,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::CreateDatasetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1943,7 +1943,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1958,7 +1958,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .create_dataset_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_dataset_version`.
@@ -1977,7 +1977,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2036,8 +2036,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDatasetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDatasetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2047,7 +2047,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::UpdateDatasetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2078,7 +2078,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2088,7 +2088,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .update_dataset_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [dataset_version][crate::model::UpdateDatasetVersionRequest::dataset_version].
@@ -2137,8 +2137,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDatasetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDatasetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2148,7 +2148,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::DeleteDatasetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2180,7 +2180,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2195,7 +2195,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .delete_dataset_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_dataset_version`.
@@ -2211,7 +2211,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2248,8 +2248,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDatasetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDatasetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2259,7 +2259,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::GetDatasetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2290,7 +2290,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2300,7 +2300,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_dataset_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDatasetVersionRequest::name].
@@ -2331,8 +2331,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDatasetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDatasetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2342,8 +2342,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListDatasetVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2377,7 +2377,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2387,14 +2387,16 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_dataset_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDatasetVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDatasetVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2402,17 +2404,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDatasetVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2468,8 +2470,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDatasetVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDatasetVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2479,7 +2481,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::RestoreDatasetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2511,7 +2513,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2526,7 +2528,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .restore_dataset_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_dataset_version`.
@@ -2545,7 +2547,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2582,8 +2584,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreDatasetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreDatasetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2593,8 +2595,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListDataItems;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2625,7 +2627,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2635,13 +2637,13 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_data_items(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataItemsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDataItemsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2650,15 +2652,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataItemsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataItemsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2714,8 +2718,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataItems {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataItems {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2725,8 +2729,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::SearchDataItems;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2757,7 +2761,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2767,14 +2771,16 @@ pub mod dataset_service {
             (*self.0.stub)
                 .search_data_items(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchDataItemsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchDataItemsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2782,15 +2788,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchDataItemsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchDataItemsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2926,8 +2934,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchDataItems {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchDataItems {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2937,8 +2945,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListSavedQueries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2972,7 +2980,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2982,14 +2990,16 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_saved_queries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSavedQueriesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSavedQueriesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2997,15 +3007,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSavedQueriesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSavedQueriesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3061,8 +3073,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSavedQueries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSavedQueries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3072,7 +3084,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::DeleteSavedQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3104,7 +3116,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3119,7 +3131,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .delete_saved_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_saved_query`.
@@ -3135,7 +3147,7 @@ pub mod dataset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3172,8 +3184,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSavedQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSavedQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3183,7 +3195,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::GetAnnotationSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3214,7 +3226,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3224,7 +3236,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_annotation_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAnnotationSpecRequest::name].
@@ -3255,8 +3267,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAnnotationSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAnnotationSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3266,8 +3278,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListAnnotations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3298,7 +3310,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3308,14 +3320,16 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_annotations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAnnotationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAnnotationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3323,15 +3337,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAnnotationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAnnotationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3387,8 +3403,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAnnotations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAnnotations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3398,8 +3414,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3433,7 +3449,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3443,15 +3459,15 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3460,17 +3476,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3500,8 +3516,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3511,7 +3527,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3542,7 +3558,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3552,7 +3568,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3563,8 +3579,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3574,7 +3590,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3605,7 +3621,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3615,7 +3631,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -3668,8 +3684,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3679,7 +3695,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3710,7 +3726,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3720,7 +3736,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -3751,8 +3767,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3762,7 +3778,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3795,7 +3811,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3805,7 +3821,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -3831,8 +3847,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3842,8 +3858,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3879,7 +3895,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3889,15 +3905,15 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3906,17 +3922,17 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3952,8 +3968,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3963,7 +3979,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3994,7 +4010,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4004,7 +4020,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4015,8 +4031,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4026,7 +4042,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4059,7 +4075,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4069,7 +4085,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4080,8 +4096,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4091,7 +4107,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4124,7 +4140,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4134,7 +4150,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4145,8 +4161,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4156,7 +4172,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::dataset_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4187,7 +4203,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4197,7 +4213,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -4226,8 +4242,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4241,7 +4257,7 @@ pub mod deployment_resource_pool_service {
     /// A builder for [DeploymentResourcePoolService][crate::client::DeploymentResourcePoolService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::deployment_resource_pool_service::ClientBuilder;
     /// # use client::DeploymentResourcePoolService;
@@ -4251,19 +4267,18 @@ pub mod deployment_resource_pool_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DeploymentResourcePoolService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DeploymentResourcePoolService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4274,7 +4289,7 @@ pub mod deployment_resource_pool_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DeploymentResourcePoolService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4287,7 +4302,7 @@ pub mod deployment_resource_pool_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4297,7 +4312,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::CreateDeploymentResourcePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4331,7 +4346,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4346,7 +4361,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .create_deployment_resource_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_deployment_resource_pool`.
@@ -4365,7 +4380,7 @@ pub mod deployment_resource_pool_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4435,8 +4450,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeploymentResourcePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeploymentResourcePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4446,7 +4461,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::GetDeploymentResourcePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4479,7 +4494,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4489,7 +4504,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .get_deployment_resource_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeploymentResourcePoolRequest::name].
@@ -4502,8 +4517,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeploymentResourcePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeploymentResourcePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4513,8 +4528,8 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::ListDeploymentResourcePools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4550,7 +4565,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4560,15 +4575,15 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .list_deployment_resource_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDeploymentResourcePoolsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4577,17 +4592,17 @@ pub mod deployment_resource_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDeploymentResourcePoolsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4613,8 +4628,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeploymentResourcePools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeploymentResourcePools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4624,7 +4639,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::UpdateDeploymentResourcePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4658,7 +4673,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4673,7 +4688,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .update_deployment_resource_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_deployment_resource_pool`.
@@ -4692,7 +4707,7 @@ pub mod deployment_resource_pool_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4765,8 +4780,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDeploymentResourcePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDeploymentResourcePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4776,7 +4791,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::DeleteDeploymentResourcePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4810,7 +4825,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4825,7 +4840,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .delete_deployment_resource_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_deployment_resource_pool`.
@@ -4841,7 +4856,7 @@ pub mod deployment_resource_pool_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4878,8 +4893,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDeploymentResourcePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDeploymentResourcePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4889,8 +4904,8 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::QueryDeployedModels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4924,7 +4939,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4934,14 +4949,16 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .query_deployed_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::QueryDeployedModelsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::QueryDeployedModelsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4949,17 +4966,17 @@ pub mod deployment_resource_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::QueryDeployedModelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4985,8 +5002,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryDeployedModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryDeployedModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4996,8 +5013,8 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5031,7 +5048,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5041,15 +5058,15 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5058,17 +5075,17 @@ pub mod deployment_resource_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5098,8 +5115,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5109,7 +5126,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5140,7 +5157,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5150,7 +5167,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5161,8 +5178,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5172,7 +5189,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5203,7 +5220,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5213,7 +5230,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -5266,8 +5283,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5277,7 +5294,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5308,7 +5325,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5318,7 +5335,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -5349,8 +5366,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5360,7 +5377,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5393,7 +5410,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5403,7 +5420,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -5429,8 +5446,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5440,8 +5457,8 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5477,7 +5494,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5487,15 +5504,15 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5504,17 +5521,17 @@ pub mod deployment_resource_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5550,8 +5567,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5561,7 +5578,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5592,7 +5609,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5602,7 +5619,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5613,8 +5630,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5624,7 +5641,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5657,7 +5674,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5667,7 +5684,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5678,8 +5695,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5689,7 +5706,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5722,7 +5739,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5732,7 +5749,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5743,8 +5760,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5754,7 +5771,7 @@ pub mod deployment_resource_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::deployment_resource_pool_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5785,7 +5802,7 @@ pub mod deployment_resource_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5795,7 +5812,7 @@ pub mod deployment_resource_pool_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -5824,8 +5841,8 @@ pub mod deployment_resource_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5839,7 +5856,7 @@ pub mod endpoint_service {
     /// A builder for [EndpointService][crate::client::EndpointService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::endpoint_service::ClientBuilder;
     /// # use client::EndpointService;
@@ -5849,19 +5866,18 @@ pub mod endpoint_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EndpointService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EndpointService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5872,7 +5888,7 @@ pub mod endpoint_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EndpointService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5885,7 +5901,7 @@ pub mod endpoint_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5895,7 +5911,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::CreateEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5924,7 +5940,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5939,7 +5955,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .create_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_endpoint`.
@@ -5958,7 +5974,7 @@ pub mod endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6023,8 +6039,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6034,7 +6050,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::GetEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6062,7 +6078,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6072,7 +6088,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .get_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEndpointRequest::name].
@@ -6085,8 +6101,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6096,8 +6112,8 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::ListEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6128,7 +6144,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6138,13 +6154,13 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .list_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEndpointsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListEndpointsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6153,15 +6169,17 @@ pub mod endpoint_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEndpointsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEndpointsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6217,8 +6235,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6228,7 +6246,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::UpdateEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6256,7 +6274,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6266,7 +6284,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .update_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::UpdateEndpointRequest::endpoint].
@@ -6315,8 +6333,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6326,7 +6344,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::UpdateEndpointLongRunning;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6360,7 +6378,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6375,7 +6393,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .update_endpoint_long_running(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_endpoint_long_running`.
@@ -6394,7 +6412,7 @@ pub mod endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6445,8 +6463,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEndpointLongRunning {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEndpointLongRunning {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6456,7 +6474,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::DeleteEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6485,7 +6503,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6500,7 +6518,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .delete_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_endpoint`.
@@ -6516,7 +6534,7 @@ pub mod endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6553,8 +6571,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6564,7 +6582,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::DeployModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6593,7 +6611,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6608,7 +6626,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .deploy_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy_model`.
@@ -6627,7 +6645,7 @@ pub mod endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6698,8 +6716,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6709,7 +6727,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::UndeployModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6738,7 +6756,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6753,7 +6771,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .undeploy_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undeploy_model`.
@@ -6772,7 +6790,7 @@ pub mod endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6829,8 +6847,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeployModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeployModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6840,7 +6858,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::MutateDeployedModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6872,7 +6890,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6887,7 +6905,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .mutate_deployed_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `mutate_deployed_model`.
@@ -6906,7 +6924,7 @@ pub mod endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6987,8 +7005,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MutateDeployedModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MutateDeployedModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6998,8 +7016,8 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7033,7 +7051,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7043,15 +7061,15 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7060,17 +7078,17 @@ pub mod endpoint_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7100,8 +7118,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7111,7 +7129,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7142,7 +7160,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7152,7 +7170,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -7163,8 +7181,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7174,7 +7192,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7205,7 +7223,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7215,7 +7233,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -7268,8 +7286,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7279,7 +7297,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7310,7 +7328,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7320,7 +7338,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -7351,8 +7369,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7362,7 +7380,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7395,7 +7413,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7405,7 +7423,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -7431,8 +7449,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7442,8 +7460,8 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7479,7 +7497,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7489,15 +7507,15 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7506,17 +7524,17 @@ pub mod endpoint_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7552,8 +7570,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7563,7 +7581,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7594,7 +7612,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7604,7 +7622,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7615,8 +7633,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7626,7 +7644,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7659,7 +7677,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7669,7 +7687,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -7680,8 +7698,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7691,7 +7709,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7724,7 +7742,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7734,7 +7752,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7745,8 +7763,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7756,7 +7774,7 @@ pub mod endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::endpoint_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7787,7 +7805,7 @@ pub mod endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7797,7 +7815,7 @@ pub mod endpoint_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -7826,8 +7844,8 @@ pub mod endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7841,7 +7859,7 @@ pub mod evaluation_service {
     /// A builder for [EvaluationService][crate::client::EvaluationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::evaluation_service::ClientBuilder;
     /// # use client::EvaluationService;
@@ -7851,19 +7869,18 @@ pub mod evaluation_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EvaluationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EvaluationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7874,7 +7891,7 @@ pub mod evaluation_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EvaluationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7887,7 +7904,7 @@ pub mod evaluation_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7897,7 +7914,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::EvaluateInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7928,7 +7945,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7938,7 +7955,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .evaluate_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [location][crate::model::EvaluateInstancesRequest::location].
@@ -8339,8 +8356,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EvaluateInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EvaluateInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8350,8 +8367,8 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8385,7 +8402,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8395,15 +8412,15 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8412,17 +8429,17 @@ pub mod evaluation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8452,8 +8469,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8463,7 +8480,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8494,7 +8511,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8504,7 +8521,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -8515,8 +8532,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8526,7 +8543,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8557,7 +8574,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8567,7 +8584,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -8620,8 +8637,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8631,7 +8648,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8662,7 +8679,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8672,7 +8689,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -8703,8 +8720,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8714,7 +8731,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8747,7 +8764,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8757,7 +8774,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -8783,8 +8800,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8794,8 +8811,8 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8831,7 +8848,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8841,15 +8858,15 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8858,17 +8875,17 @@ pub mod evaluation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8904,8 +8921,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8915,7 +8932,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8946,7 +8963,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8956,7 +8973,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8967,8 +8984,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8978,7 +8995,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9011,7 +9028,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9021,7 +9038,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -9032,8 +9049,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9043,7 +9060,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9076,7 +9093,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9086,7 +9103,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9097,8 +9114,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9108,7 +9125,7 @@ pub mod evaluation_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::evaluation_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9139,7 +9156,7 @@ pub mod evaluation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9149,7 +9166,7 @@ pub mod evaluation_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -9178,8 +9195,8 @@ pub mod evaluation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9193,7 +9210,7 @@ pub mod feature_online_store_admin_service {
     /// A builder for [FeatureOnlineStoreAdminService][crate::client::FeatureOnlineStoreAdminService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::feature_online_store_admin_service::ClientBuilder;
     /// # use client::FeatureOnlineStoreAdminService;
@@ -9203,19 +9220,18 @@ pub mod feature_online_store_admin_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FeatureOnlineStoreAdminService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FeatureOnlineStoreAdminService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -9226,7 +9242,7 @@ pub mod feature_online_store_admin_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FeatureOnlineStoreAdminService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -9239,7 +9255,7 @@ pub mod feature_online_store_admin_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -9249,7 +9265,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::CreateFeatureOnlineStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9283,7 +9299,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9298,7 +9314,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .create_feature_online_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_feature_online_store`.
@@ -9317,7 +9333,7 @@ pub mod feature_online_store_admin_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9384,8 +9400,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeatureOnlineStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeatureOnlineStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9395,7 +9411,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::GetFeatureOnlineStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9426,7 +9442,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9436,7 +9452,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .get_feature_online_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureOnlineStoreRequest::name].
@@ -9449,8 +9465,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeatureOnlineStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeatureOnlineStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9460,8 +9476,8 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::ListFeatureOnlineStores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9497,7 +9513,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9507,15 +9523,15 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .list_feature_online_stores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListFeatureOnlineStoresResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9524,17 +9540,17 @@ pub mod feature_online_store_admin_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFeatureOnlineStoresResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9572,8 +9588,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatureOnlineStores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatureOnlineStores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9583,7 +9599,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::UpdateFeatureOnlineStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9617,7 +9633,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9632,7 +9648,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .update_feature_online_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_feature_online_store`.
@@ -9651,7 +9667,7 @@ pub mod feature_online_store_admin_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9720,8 +9736,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeatureOnlineStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeatureOnlineStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9731,7 +9747,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::DeleteFeatureOnlineStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9765,7 +9781,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9780,7 +9796,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .delete_feature_online_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature_online_store`.
@@ -9796,7 +9812,7 @@ pub mod feature_online_store_admin_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9839,8 +9855,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeatureOnlineStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeatureOnlineStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9850,7 +9866,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::CreateFeatureView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9882,7 +9898,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9897,7 +9913,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .create_feature_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_feature_view`.
@@ -9916,7 +9932,7 @@ pub mod feature_online_store_admin_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9989,8 +10005,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeatureView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeatureView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10000,7 +10016,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::GetFeatureView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10028,7 +10044,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10038,7 +10054,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .get_feature_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureViewRequest::name].
@@ -10051,8 +10067,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeatureView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeatureView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10062,8 +10078,8 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::ListFeatureViews;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10097,7 +10113,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10107,14 +10123,16 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .list_feature_views(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeatureViewsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFeatureViewsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -10122,15 +10140,17 @@ pub mod feature_online_store_admin_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFeatureViewsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFeatureViewsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10168,8 +10188,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatureViews {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatureViews {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10179,7 +10199,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::UpdateFeatureView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10211,7 +10231,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10226,7 +10246,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .update_feature_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_feature_view`.
@@ -10245,7 +10265,7 @@ pub mod feature_online_store_admin_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10314,8 +10334,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeatureView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeatureView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10325,7 +10345,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::DeleteFeatureView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10357,7 +10377,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10372,7 +10392,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .delete_feature_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature_view`.
@@ -10388,7 +10408,7 @@ pub mod feature_online_store_admin_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10425,8 +10445,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeatureView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeatureView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10436,7 +10456,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::SyncFeatureView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10464,7 +10484,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10474,7 +10494,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .sync_feature_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feature_view][crate::model::SyncFeatureViewRequest::feature_view].
@@ -10487,8 +10507,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SyncFeatureView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SyncFeatureView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10498,7 +10518,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::GetFeatureViewSync;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10529,7 +10549,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10539,7 +10559,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .get_feature_view_sync(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureViewSyncRequest::name].
@@ -10552,8 +10572,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeatureViewSync {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeatureViewSync {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10563,8 +10583,8 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::ListFeatureViewSyncs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10598,7 +10618,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10608,14 +10628,16 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .list_feature_view_syncs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeatureViewSyncsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFeatureViewSyncsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -10623,17 +10645,17 @@ pub mod feature_online_store_admin_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFeatureViewSyncsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10671,8 +10693,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatureViewSyncs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatureViewSyncs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10682,8 +10704,8 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10717,7 +10739,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10727,15 +10749,15 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10744,17 +10766,17 @@ pub mod feature_online_store_admin_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10784,8 +10806,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10795,7 +10817,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10826,7 +10848,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10836,7 +10858,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -10847,8 +10869,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10858,7 +10880,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10889,7 +10911,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10899,7 +10921,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -10952,8 +10974,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10963,7 +10985,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10994,7 +11016,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11004,7 +11026,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -11035,8 +11057,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11046,7 +11068,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11079,7 +11101,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11089,7 +11111,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -11115,8 +11137,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11126,8 +11148,8 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11163,7 +11185,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11173,15 +11195,15 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11190,17 +11212,17 @@ pub mod feature_online_store_admin_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11236,8 +11258,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11247,7 +11269,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11278,7 +11300,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11288,7 +11310,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -11299,8 +11321,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11310,7 +11332,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11343,7 +11365,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11353,7 +11375,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -11364,8 +11386,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11375,7 +11397,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11408,7 +11430,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11418,7 +11440,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -11429,8 +11451,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11440,7 +11462,7 @@ pub mod feature_online_store_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_admin_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11471,7 +11493,7 @@ pub mod feature_online_store_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11481,7 +11503,7 @@ pub mod feature_online_store_admin_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -11510,8 +11532,8 @@ pub mod feature_online_store_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11525,7 +11547,7 @@ pub mod feature_online_store_service {
     /// A builder for [FeatureOnlineStoreService][crate::client::FeatureOnlineStoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::feature_online_store_service::ClientBuilder;
     /// # use client::FeatureOnlineStoreService;
@@ -11535,19 +11557,18 @@ pub mod feature_online_store_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FeatureOnlineStoreService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FeatureOnlineStoreService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11558,7 +11579,7 @@ pub mod feature_online_store_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FeatureOnlineStoreService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11571,7 +11592,7 @@ pub mod feature_online_store_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11581,7 +11602,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::FetchFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11612,7 +11633,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11622,7 +11643,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .fetch_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feature_view][crate::model::FetchFeatureValuesRequest::feature_view].
@@ -11662,8 +11683,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11673,7 +11694,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::SearchNearestEntities;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11704,7 +11725,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11714,7 +11735,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .search_nearest_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feature_view][crate::model::SearchNearestEntitiesRequest::feature_view].
@@ -11755,8 +11776,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchNearestEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchNearestEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11766,7 +11787,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::GenerateFetchAccessToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11799,7 +11820,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11809,7 +11830,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .generate_fetch_access_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feature_view][crate::model::GenerateFetchAccessTokenRequest::feature_view].
@@ -11820,8 +11841,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateFetchAccessToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateFetchAccessToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11831,8 +11852,8 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11866,7 +11887,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11876,15 +11897,15 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11893,17 +11914,17 @@ pub mod feature_online_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11933,8 +11954,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11944,7 +11965,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11975,7 +11996,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11985,7 +12006,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -11996,8 +12017,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12007,7 +12028,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12038,7 +12059,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12048,7 +12069,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -12101,8 +12122,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12112,7 +12133,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12143,7 +12164,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12153,7 +12174,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -12184,8 +12205,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12195,7 +12216,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12228,7 +12249,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12238,7 +12259,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -12264,8 +12285,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12275,8 +12296,8 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12312,7 +12333,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12322,15 +12343,15 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12339,17 +12360,17 @@ pub mod feature_online_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12385,8 +12406,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12396,7 +12417,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12427,7 +12448,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12437,7 +12458,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -12448,8 +12469,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12459,7 +12480,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12492,7 +12513,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12502,7 +12523,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -12513,8 +12534,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12524,7 +12545,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12557,7 +12578,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12567,7 +12588,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -12578,8 +12599,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12589,7 +12610,7 @@ pub mod feature_online_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_online_store_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12620,7 +12641,7 @@ pub mod feature_online_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12630,7 +12651,7 @@ pub mod feature_online_store_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -12659,8 +12680,8 @@ pub mod feature_online_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12674,7 +12695,7 @@ pub mod feature_registry_service {
     /// A builder for [FeatureRegistryService][crate::client::FeatureRegistryService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::feature_registry_service::ClientBuilder;
     /// # use client::FeatureRegistryService;
@@ -12684,19 +12705,18 @@ pub mod feature_registry_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FeatureRegistryService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FeatureRegistryService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -12707,7 +12727,7 @@ pub mod feature_registry_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FeatureRegistryService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -12720,7 +12740,7 @@ pub mod feature_registry_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -12730,7 +12750,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::CreateFeatureGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -12762,7 +12782,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12777,7 +12797,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .create_feature_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_feature_group`.
@@ -12796,7 +12816,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12863,8 +12883,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeatureGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeatureGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12874,7 +12894,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::GetFeatureGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12902,7 +12922,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12912,7 +12932,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .get_feature_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureGroupRequest::name].
@@ -12925,8 +12945,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeatureGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeatureGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12936,8 +12956,8 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::ListFeatureGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12971,7 +12991,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12981,14 +13001,16 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .list_feature_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeatureGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFeatureGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -12996,15 +13018,17 @@ pub mod feature_registry_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFeatureGroupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFeatureGroupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13042,8 +13066,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatureGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatureGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13053,7 +13077,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::UpdateFeatureGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -13085,7 +13109,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13100,7 +13124,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .update_feature_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_feature_group`.
@@ -13119,7 +13143,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13188,8 +13212,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeatureGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeatureGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13199,7 +13223,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::DeleteFeatureGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -13231,7 +13255,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13246,7 +13270,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .delete_feature_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature_group`.
@@ -13262,7 +13286,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13305,8 +13329,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeatureGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeatureGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13316,7 +13340,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::CreateFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -13345,7 +13369,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13360,7 +13384,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .create_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_feature`.
@@ -13379,7 +13403,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13446,8 +13470,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13457,7 +13481,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::BatchCreateFeatures;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -13489,7 +13513,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13504,7 +13528,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .batch_create_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_create_features`.
@@ -13523,7 +13547,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13573,8 +13597,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13584,7 +13608,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::GetFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13612,7 +13636,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13622,7 +13646,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .get_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureRequest::name].
@@ -13635,8 +13659,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13646,8 +13670,8 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::ListFeatures;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13678,7 +13702,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13688,13 +13712,13 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .list_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeaturesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListFeaturesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13703,15 +13727,17 @@ pub mod feature_registry_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFeaturesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFeaturesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13773,8 +13799,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13784,7 +13810,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::UpdateFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -13813,7 +13839,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13828,7 +13854,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .update_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_feature`.
@@ -13847,7 +13873,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13916,8 +13942,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13927,7 +13953,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::DeleteFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -13956,7 +13982,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13971,7 +13997,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .delete_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature`.
@@ -13987,7 +14013,7 @@ pub mod feature_registry_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14024,8 +14050,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14035,8 +14061,8 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14070,7 +14096,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14080,15 +14106,15 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14097,17 +14123,17 @@ pub mod feature_registry_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14137,8 +14163,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14148,7 +14174,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14179,7 +14205,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14189,7 +14215,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -14200,8 +14226,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14211,7 +14237,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14242,7 +14268,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14252,7 +14278,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -14305,8 +14331,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14316,7 +14342,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14347,7 +14373,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14357,7 +14383,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -14388,8 +14414,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14399,7 +14425,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14432,7 +14458,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14442,7 +14468,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -14468,8 +14494,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14479,8 +14505,8 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14516,7 +14542,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14526,15 +14552,15 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14543,17 +14569,17 @@ pub mod feature_registry_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14589,8 +14615,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14600,7 +14626,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14631,7 +14657,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14641,7 +14667,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -14652,8 +14678,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14663,7 +14689,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14696,7 +14722,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14706,7 +14732,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -14717,8 +14743,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14728,7 +14754,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14761,7 +14787,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14771,7 +14797,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -14782,8 +14808,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14793,7 +14819,7 @@ pub mod feature_registry_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::feature_registry_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14824,7 +14850,7 @@ pub mod feature_registry_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14834,7 +14860,7 @@ pub mod feature_registry_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -14863,8 +14889,8 @@ pub mod feature_registry_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14878,7 +14904,7 @@ pub mod featurestore_online_serving_service {
     /// A builder for [FeaturestoreOnlineServingService][crate::client::FeaturestoreOnlineServingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::featurestore_online_serving_service::ClientBuilder;
     /// # use client::FeaturestoreOnlineServingService;
@@ -14888,19 +14914,18 @@ pub mod featurestore_online_serving_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FeaturestoreOnlineServingService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FeaturestoreOnlineServingService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -14911,7 +14936,7 @@ pub mod featurestore_online_serving_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FeaturestoreOnlineServingService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -14924,7 +14949,7 @@ pub mod featurestore_online_serving_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -14934,7 +14959,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::ReadFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14965,7 +14990,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14975,7 +15000,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .read_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entity_type][crate::model::ReadFeatureValuesRequest::entity_type].
@@ -15018,8 +15043,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15029,7 +15054,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::WriteFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15060,7 +15085,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15070,7 +15095,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .write_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entity_type][crate::model::WriteFeatureValuesRequest::entity_type].
@@ -15096,8 +15121,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WriteFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WriteFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15107,8 +15132,8 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15142,7 +15167,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15152,15 +15177,15 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15169,17 +15194,17 @@ pub mod featurestore_online_serving_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15209,8 +15234,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15220,7 +15245,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15251,7 +15276,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15261,7 +15286,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -15272,8 +15297,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15283,7 +15308,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15314,7 +15339,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15324,7 +15349,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -15377,8 +15402,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15388,7 +15413,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15419,7 +15444,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15429,7 +15454,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -15460,8 +15485,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15471,7 +15496,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15504,7 +15529,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15514,7 +15539,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -15540,8 +15565,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15551,8 +15576,8 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15588,7 +15613,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15598,15 +15623,15 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15615,17 +15640,17 @@ pub mod featurestore_online_serving_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15661,8 +15686,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15672,7 +15697,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15703,7 +15728,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15713,7 +15738,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -15724,8 +15749,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15735,7 +15760,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15768,7 +15793,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15778,7 +15803,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -15789,8 +15814,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15800,7 +15825,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15833,7 +15858,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15843,7 +15868,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -15854,8 +15879,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15865,7 +15890,7 @@ pub mod featurestore_online_serving_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_online_serving_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15896,7 +15921,7 @@ pub mod featurestore_online_serving_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15906,7 +15931,7 @@ pub mod featurestore_online_serving_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -15935,8 +15960,8 @@ pub mod featurestore_online_serving_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15950,7 +15975,7 @@ pub mod featurestore_service {
     /// A builder for [FeaturestoreService][crate::client::FeaturestoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::featurestore_service::ClientBuilder;
     /// # use client::FeaturestoreService;
@@ -15960,19 +15985,18 @@ pub mod featurestore_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FeaturestoreService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FeaturestoreService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -15983,7 +16007,7 @@ pub mod featurestore_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FeaturestoreService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -15996,7 +16020,7 @@ pub mod featurestore_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -16006,7 +16030,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::CreateFeaturestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16038,7 +16062,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16053,7 +16077,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .create_featurestore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_featurestore`.
@@ -16072,7 +16096,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16139,8 +16163,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeaturestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeaturestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16150,7 +16174,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::GetFeaturestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16178,7 +16202,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16188,7 +16212,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .get_featurestore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeaturestoreRequest::name].
@@ -16201,8 +16225,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeaturestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeaturestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16212,8 +16236,8 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ListFeaturestores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16247,7 +16271,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16257,14 +16281,16 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .list_featurestores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeaturestoresResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFeaturestoresResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -16272,15 +16298,17 @@ pub mod featurestore_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFeaturestoresResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFeaturestoresResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16336,8 +16364,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeaturestores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeaturestores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16347,7 +16375,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::UpdateFeaturestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16379,7 +16407,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16394,7 +16422,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .update_featurestore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_featurestore`.
@@ -16413,7 +16441,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16482,8 +16510,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeaturestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeaturestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16493,7 +16521,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::DeleteFeaturestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16525,7 +16553,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16540,7 +16568,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .delete_featurestore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_featurestore`.
@@ -16556,7 +16584,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16599,8 +16627,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeaturestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeaturestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16610,7 +16638,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::CreateEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16642,7 +16670,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16657,7 +16685,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .create_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_entity_type`.
@@ -16676,7 +16704,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16739,8 +16767,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16750,7 +16778,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::GetEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16778,7 +16806,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16788,7 +16816,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .get_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntityTypeRequest::name].
@@ -16801,8 +16829,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16812,8 +16840,8 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ListEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16844,7 +16872,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16854,14 +16882,16 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .list_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntityTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEntityTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -16869,15 +16899,17 @@ pub mod featurestore_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntityTypesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntityTypesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16933,8 +16965,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16944,7 +16976,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::UpdateEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16975,7 +17007,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16985,7 +17017,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .update_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entity_type][crate::model::UpdateEntityTypeRequest::entity_type].
@@ -17030,8 +17062,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17041,7 +17073,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::DeleteEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17073,7 +17105,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17088,7 +17120,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .delete_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_entity_type`.
@@ -17104,7 +17136,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17147,8 +17179,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17158,7 +17190,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::CreateFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17187,7 +17219,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17202,7 +17234,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .create_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_feature`.
@@ -17221,7 +17253,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17288,8 +17320,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17299,7 +17331,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::BatchCreateFeatures;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17331,7 +17363,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17346,7 +17378,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .batch_create_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_create_features`.
@@ -17365,7 +17397,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17415,8 +17447,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17426,7 +17458,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::GetFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17454,7 +17486,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17464,7 +17496,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .get_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureRequest::name].
@@ -17477,8 +17509,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17488,8 +17520,8 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ListFeatures;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17520,7 +17552,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17530,13 +17562,13 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .list_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeaturesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListFeaturesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17545,15 +17577,17 @@ pub mod featurestore_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFeaturesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFeaturesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17615,8 +17649,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17626,7 +17660,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::UpdateFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17654,7 +17688,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17664,7 +17698,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .update_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feature][crate::model::UpdateFeatureRequest::feature].
@@ -17709,8 +17743,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17720,7 +17754,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::DeleteFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17749,7 +17783,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17764,7 +17798,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .delete_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature`.
@@ -17780,7 +17814,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17817,8 +17851,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17828,7 +17862,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ImportFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17860,7 +17894,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17875,7 +17909,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .import_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_feature_values`.
@@ -17894,7 +17928,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -18061,8 +18095,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18072,7 +18106,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::BatchReadFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -18104,7 +18138,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18119,7 +18153,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .batch_read_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_read_feature_values`.
@@ -18138,7 +18172,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -18285,8 +18319,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchReadFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchReadFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18296,7 +18330,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ExportFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -18328,7 +18362,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18343,7 +18377,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .export_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_feature_values`.
@@ -18362,7 +18396,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -18500,8 +18534,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18511,7 +18545,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::DeleteFeatureValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -18543,7 +18577,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18558,7 +18592,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .delete_feature_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature_values`.
@@ -18577,7 +18611,7 @@ pub mod featurestore_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -18664,8 +18698,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeatureValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeatureValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18675,8 +18709,8 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::SearchFeatures;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18707,7 +18741,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18717,14 +18751,16 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .search_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchFeaturesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchFeaturesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -18732,15 +18768,17 @@ pub mod featurestore_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchFeaturesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchFeaturesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18772,8 +18810,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18783,8 +18821,8 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18818,7 +18856,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18828,15 +18866,15 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18845,17 +18883,17 @@ pub mod featurestore_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18885,8 +18923,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18896,7 +18934,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18927,7 +18965,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18937,7 +18975,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -18948,8 +18986,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18959,7 +18997,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18990,7 +19028,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19000,7 +19038,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -19053,8 +19091,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19064,7 +19102,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19095,7 +19133,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19105,7 +19143,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -19136,8 +19174,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19147,7 +19185,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19180,7 +19218,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19190,7 +19228,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -19216,8 +19254,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19227,8 +19265,8 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19264,7 +19302,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19274,15 +19312,15 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19291,17 +19329,17 @@ pub mod featurestore_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19337,8 +19375,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19348,7 +19386,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19379,7 +19417,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19389,7 +19427,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -19400,8 +19438,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19411,7 +19449,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19444,7 +19482,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19454,7 +19492,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -19465,8 +19503,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19476,7 +19514,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19509,7 +19547,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19519,7 +19557,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -19530,8 +19568,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19541,7 +19579,7 @@ pub mod featurestore_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::featurestore_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19572,7 +19610,7 @@ pub mod featurestore_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19582,7 +19620,7 @@ pub mod featurestore_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -19611,8 +19649,8 @@ pub mod featurestore_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19626,7 +19664,7 @@ pub mod gen_ai_cache_service {
     /// A builder for [GenAiCacheService][crate::client::GenAiCacheService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::gen_ai_cache_service::ClientBuilder;
     /// # use client::GenAiCacheService;
@@ -19636,19 +19674,18 @@ pub mod gen_ai_cache_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GenAiCacheService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GenAiCacheService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -19659,7 +19696,7 @@ pub mod gen_ai_cache_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GenAiCacheService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -19672,7 +19709,7 @@ pub mod gen_ai_cache_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -19682,7 +19719,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::CreateCachedContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19713,7 +19750,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19723,7 +19760,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .create_cached_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCachedContentRequest::parent].
@@ -19758,8 +19795,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCachedContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCachedContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19769,7 +19806,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::GetCachedContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19800,7 +19837,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19810,7 +19847,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .get_cached_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCachedContentRequest::name].
@@ -19823,8 +19860,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCachedContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCachedContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19834,7 +19871,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::UpdateCachedContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19865,7 +19902,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19875,7 +19912,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .update_cached_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [cached_content][crate::model::UpdateCachedContentRequest::cached_content].
@@ -19924,8 +19961,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCachedContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCachedContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19935,7 +19972,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::DeleteCachedContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19966,7 +20003,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19976,7 +20013,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .delete_cached_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteCachedContentRequest::name].
@@ -19989,8 +20026,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCachedContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCachedContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20000,8 +20037,8 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::ListCachedContents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20035,7 +20072,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20045,14 +20082,16 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .list_cached_contents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCachedContentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCachedContentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -20060,17 +20099,17 @@ pub mod gen_ai_cache_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCachedContentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20096,8 +20135,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCachedContents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCachedContents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20107,8 +20146,8 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20142,7 +20181,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20152,15 +20191,15 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20169,17 +20208,17 @@ pub mod gen_ai_cache_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20209,8 +20248,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20220,7 +20259,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20251,7 +20290,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20261,7 +20300,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -20272,8 +20311,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20283,7 +20322,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20314,7 +20353,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20324,7 +20363,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -20377,8 +20416,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20388,7 +20427,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20419,7 +20458,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20429,7 +20468,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -20460,8 +20499,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20471,7 +20510,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20504,7 +20543,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20514,7 +20553,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -20540,8 +20579,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20551,8 +20590,8 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20588,7 +20627,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20598,15 +20637,15 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20615,17 +20654,17 @@ pub mod gen_ai_cache_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20661,8 +20700,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20672,7 +20711,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20703,7 +20742,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20713,7 +20752,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -20724,8 +20763,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20735,7 +20774,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20768,7 +20807,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20778,7 +20817,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -20789,8 +20828,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20800,7 +20839,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20833,7 +20872,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20843,7 +20882,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -20854,8 +20893,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20865,7 +20904,7 @@ pub mod gen_ai_cache_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_cache_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20896,7 +20935,7 @@ pub mod gen_ai_cache_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20906,7 +20945,7 @@ pub mod gen_ai_cache_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -20935,8 +20974,8 @@ pub mod gen_ai_cache_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20950,7 +20989,7 @@ pub mod gen_ai_tuning_service {
     /// A builder for [GenAiTuningService][crate::client::GenAiTuningService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::gen_ai_tuning_service::ClientBuilder;
     /// # use client::GenAiTuningService;
@@ -20960,19 +20999,18 @@ pub mod gen_ai_tuning_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GenAiTuningService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GenAiTuningService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -20983,7 +21021,7 @@ pub mod gen_ai_tuning_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GenAiTuningService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -20996,7 +21034,7 @@ pub mod gen_ai_tuning_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -21006,7 +21044,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::CreateTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21034,7 +21072,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21044,7 +21082,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .create_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTuningJobRequest::parent].
@@ -21079,8 +21117,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21090,7 +21128,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::GetTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21118,7 +21156,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21128,7 +21166,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .get_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTuningJobRequest::name].
@@ -21141,8 +21179,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21152,8 +21190,8 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::ListTuningJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21184,7 +21222,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21194,14 +21232,16 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .list_tuning_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTuningJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTuningJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -21209,15 +21249,17 @@ pub mod gen_ai_tuning_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTuningJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTuningJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21249,8 +21291,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTuningJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTuningJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21260,7 +21302,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::CancelTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21288,7 +21330,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21298,7 +21340,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .cancel_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelTuningJobRequest::name].
@@ -21311,8 +21353,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21322,7 +21364,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::RebaseTunedModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -21354,7 +21396,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21369,7 +21411,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .rebase_tuned_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `rebase_tuned_model`.
@@ -21388,7 +21430,7 @@ pub mod gen_ai_tuning_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -21489,8 +21531,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RebaseTunedModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RebaseTunedModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21500,8 +21542,8 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21535,7 +21577,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21545,15 +21587,15 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21562,17 +21604,17 @@ pub mod gen_ai_tuning_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21602,8 +21644,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21613,7 +21655,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21644,7 +21686,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21654,7 +21696,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -21665,8 +21707,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21676,7 +21718,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21707,7 +21749,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21717,7 +21759,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -21770,8 +21812,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21781,7 +21823,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21812,7 +21854,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21822,7 +21864,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -21853,8 +21895,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21864,7 +21906,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21897,7 +21939,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21907,7 +21949,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -21933,8 +21975,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21944,8 +21986,8 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21981,7 +22023,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21991,15 +22033,15 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -22008,17 +22050,17 @@ pub mod gen_ai_tuning_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22054,8 +22096,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22065,7 +22107,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22096,7 +22138,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22106,7 +22148,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -22117,8 +22159,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22128,7 +22170,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22161,7 +22203,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22171,7 +22213,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -22182,8 +22224,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22193,7 +22235,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22226,7 +22268,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22236,7 +22278,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -22247,8 +22289,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22258,7 +22300,7 @@ pub mod gen_ai_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::gen_ai_tuning_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22289,7 +22331,7 @@ pub mod gen_ai_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22299,7 +22341,7 @@ pub mod gen_ai_tuning_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -22328,8 +22370,8 @@ pub mod gen_ai_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22343,7 +22385,7 @@ pub mod index_endpoint_service {
     /// A builder for [IndexEndpointService][crate::client::IndexEndpointService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::index_endpoint_service::ClientBuilder;
     /// # use client::IndexEndpointService;
@@ -22353,19 +22395,18 @@ pub mod index_endpoint_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::IndexEndpointService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = IndexEndpointService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -22376,7 +22417,7 @@ pub mod index_endpoint_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::IndexEndpointService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -22389,7 +22430,7 @@ pub mod index_endpoint_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -22399,7 +22440,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::CreateIndexEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -22431,7 +22472,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22446,7 +22487,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .create_index_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_index_endpoint`.
@@ -22465,7 +22506,7 @@ pub mod index_endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -22524,8 +22565,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIndexEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIndexEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22535,7 +22576,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::GetIndexEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22566,7 +22607,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22576,7 +22617,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .get_index_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIndexEndpointRequest::name].
@@ -22589,8 +22630,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIndexEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIndexEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22600,8 +22641,8 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::ListIndexEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -22635,7 +22676,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22645,14 +22686,16 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .list_index_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListIndexEndpointsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListIndexEndpointsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -22660,17 +22703,17 @@ pub mod index_endpoint_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListIndexEndpointsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22720,8 +22763,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIndexEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIndexEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22731,7 +22774,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::UpdateIndexEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22762,7 +22805,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22772,7 +22815,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .update_index_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [index_endpoint][crate::model::UpdateIndexEndpointRequest::index_endpoint].
@@ -22821,8 +22864,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIndexEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIndexEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22832,7 +22875,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::DeleteIndexEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -22864,7 +22907,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22879,7 +22922,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .delete_index_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_index_endpoint`.
@@ -22895,7 +22938,7 @@ pub mod index_endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -22932,8 +22975,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIndexEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIndexEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22943,7 +22986,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::DeployIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -22972,7 +23015,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22987,7 +23030,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .deploy_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy_index`.
@@ -23006,7 +23049,7 @@ pub mod index_endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -23065,8 +23108,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23076,7 +23119,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::UndeployIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -23105,7 +23148,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23120,7 +23163,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .undeploy_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undeploy_index`.
@@ -23139,7 +23182,7 @@ pub mod index_endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -23184,8 +23227,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeployIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeployIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23195,7 +23238,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::MutateDeployedIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -23227,7 +23270,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23242,7 +23285,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .mutate_deployed_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `mutate_deployed_index`.
@@ -23261,7 +23304,7 @@ pub mod index_endpoint_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -23320,8 +23363,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MutateDeployedIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MutateDeployedIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23331,8 +23374,8 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -23366,7 +23409,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23376,15 +23419,15 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -23393,17 +23436,17 @@ pub mod index_endpoint_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -23433,8 +23476,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23444,7 +23487,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23475,7 +23518,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23485,7 +23528,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -23496,8 +23539,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23507,7 +23550,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23538,7 +23581,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23548,7 +23591,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -23601,8 +23644,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23612,7 +23655,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23643,7 +23686,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23653,7 +23696,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -23684,8 +23727,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23695,7 +23738,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23728,7 +23771,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23738,7 +23781,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -23764,8 +23807,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23775,8 +23818,8 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -23812,7 +23855,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23822,15 +23865,15 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -23839,17 +23882,17 @@ pub mod index_endpoint_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -23885,8 +23928,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23896,7 +23939,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23927,7 +23970,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23937,7 +23980,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -23948,8 +23991,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23959,7 +24002,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23992,7 +24035,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24002,7 +24045,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -24013,8 +24056,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24024,7 +24067,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24057,7 +24100,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24067,7 +24110,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -24078,8 +24121,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24089,7 +24132,7 @@ pub mod index_endpoint_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_endpoint_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24120,7 +24163,7 @@ pub mod index_endpoint_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24130,7 +24173,7 @@ pub mod index_endpoint_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -24159,8 +24202,8 @@ pub mod index_endpoint_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24174,7 +24217,7 @@ pub mod index_service {
     /// A builder for [IndexService][crate::client::IndexService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::index_service::ClientBuilder;
     /// # use client::IndexService;
@@ -24184,19 +24227,18 @@ pub mod index_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::IndexService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = IndexService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -24207,7 +24249,7 @@ pub mod index_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::IndexService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -24220,7 +24262,7 @@ pub mod index_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -24230,7 +24272,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::CreateIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -24259,7 +24301,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24274,7 +24316,7 @@ pub mod index_service {
             (*self.0.stub)
                 .create_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_index`.
@@ -24291,7 +24333,7 @@ pub mod index_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -24350,8 +24392,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24361,7 +24403,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::GetIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24389,7 +24431,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24399,7 +24441,7 @@ pub mod index_service {
             (*self.0.stub)
                 .get_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIndexRequest::name].
@@ -24412,8 +24454,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24423,8 +24465,8 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::ListIndexes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -24455,7 +24497,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24465,13 +24507,13 @@ pub mod index_service {
             (*self.0.stub)
                 .list_indexes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListIndexesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListIndexesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -24480,15 +24522,17 @@ pub mod index_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListIndexesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListIndexesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -24538,8 +24582,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIndexes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIndexes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24549,7 +24593,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::UpdateIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -24578,7 +24622,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24593,7 +24637,7 @@ pub mod index_service {
             (*self.0.stub)
                 .update_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_index`.
@@ -24610,7 +24654,7 @@ pub mod index_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -24679,8 +24723,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24690,7 +24734,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::DeleteIndex;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -24719,7 +24763,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24734,7 +24778,7 @@ pub mod index_service {
             (*self.0.stub)
                 .delete_index(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_index`.
@@ -24750,7 +24794,7 @@ pub mod index_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -24787,8 +24831,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIndex {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIndex {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24798,7 +24842,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::UpsertDatapoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24829,7 +24873,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24839,7 +24883,7 @@ pub mod index_service {
             (*self.0.stub)
                 .upsert_datapoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [index][crate::model::UpsertDatapointsRequest::index].
@@ -24881,8 +24925,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpsertDatapoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpsertDatapoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24892,7 +24936,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::RemoveDatapoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24923,7 +24967,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24933,7 +24977,7 @@ pub mod index_service {
             (*self.0.stub)
                 .remove_datapoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [index][crate::model::RemoveDatapointsRequest::index].
@@ -24957,8 +25001,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveDatapoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveDatapoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24968,8 +25012,8 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -25003,7 +25047,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25013,15 +25057,15 @@ pub mod index_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -25030,17 +25074,17 @@ pub mod index_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -25070,8 +25114,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25081,7 +25125,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25112,7 +25156,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25122,7 +25166,7 @@ pub mod index_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -25133,8 +25177,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25144,7 +25188,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25175,7 +25219,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25185,7 +25229,7 @@ pub mod index_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -25238,8 +25282,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25249,7 +25293,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25280,7 +25324,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25290,7 +25334,7 @@ pub mod index_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -25321,8 +25365,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25332,7 +25376,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25365,7 +25409,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25375,7 +25419,7 @@ pub mod index_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -25401,8 +25445,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25412,8 +25456,8 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -25449,7 +25493,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25459,15 +25503,15 @@ pub mod index_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -25476,17 +25520,17 @@ pub mod index_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -25522,8 +25566,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25533,7 +25577,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25564,7 +25608,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25574,7 +25618,7 @@ pub mod index_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -25585,8 +25629,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25596,7 +25640,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25629,7 +25673,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25639,7 +25683,7 @@ pub mod index_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -25650,8 +25694,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25661,7 +25705,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25694,7 +25738,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25704,7 +25748,7 @@ pub mod index_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -25715,8 +25759,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25726,7 +25770,7 @@ pub mod index_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::index_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25757,7 +25801,7 @@ pub mod index_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25767,7 +25811,7 @@ pub mod index_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -25796,8 +25840,8 @@ pub mod index_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25811,7 +25855,7 @@ pub mod job_service {
     /// A builder for [JobService][crate::client::JobService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::job_service::ClientBuilder;
     /// # use client::JobService;
@@ -25821,19 +25865,18 @@ pub mod job_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::JobService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = JobService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -25844,7 +25887,7 @@ pub mod job_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::JobService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -25857,7 +25900,7 @@ pub mod job_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -25867,7 +25910,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CreateCustomJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25895,7 +25938,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25905,7 +25948,7 @@ pub mod job_service {
             (*self.0.stub)
                 .create_custom_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCustomJobRequest::parent].
@@ -25940,8 +25983,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCustomJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCustomJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25951,7 +25994,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetCustomJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25979,7 +26022,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25989,7 +26032,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_custom_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCustomJobRequest::name].
@@ -26002,8 +26045,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCustomJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCustomJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26013,8 +26056,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListCustomJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -26045,7 +26088,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26055,14 +26098,16 @@ pub mod job_service {
             (*self.0.stub)
                 .list_custom_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCustomJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCustomJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -26070,15 +26115,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCustomJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCustomJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -26128,8 +26175,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCustomJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCustomJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26139,7 +26186,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteCustomJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -26168,7 +26215,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26183,7 +26230,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_custom_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_custom_job`.
@@ -26199,7 +26246,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -26236,8 +26283,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCustomJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCustomJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26247,7 +26294,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CancelCustomJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26275,7 +26322,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26285,7 +26332,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_custom_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelCustomJobRequest::name].
@@ -26298,8 +26345,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelCustomJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelCustomJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26309,7 +26356,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CreateDataLabelingJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26340,7 +26387,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26350,7 +26397,7 @@ pub mod job_service {
             (*self.0.stub)
                 .create_data_labeling_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDataLabelingJobRequest::parent].
@@ -26385,8 +26432,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataLabelingJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataLabelingJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26396,7 +26443,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetDataLabelingJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26427,7 +26474,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26437,7 +26484,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_data_labeling_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataLabelingJobRequest::name].
@@ -26450,8 +26497,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataLabelingJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataLabelingJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26461,8 +26508,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListDataLabelingJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -26496,7 +26543,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26506,14 +26553,16 @@ pub mod job_service {
             (*self.0.stub)
                 .list_data_labeling_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataLabelingJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataLabelingJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -26521,17 +26570,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataLabelingJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -26587,8 +26636,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataLabelingJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataLabelingJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26598,7 +26647,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteDataLabelingJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -26630,7 +26679,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26645,7 +26694,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_data_labeling_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_data_labeling_job`.
@@ -26661,7 +26710,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -26698,8 +26747,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataLabelingJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataLabelingJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26709,7 +26758,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CancelDataLabelingJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26740,7 +26789,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26750,7 +26799,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_data_labeling_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelDataLabelingJobRequest::name].
@@ -26763,8 +26812,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelDataLabelingJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelDataLabelingJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26774,7 +26823,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CreateHyperparameterTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26807,7 +26856,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26817,7 +26866,7 @@ pub mod job_service {
             (*self.0.stub)
                 .create_hyperparameter_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateHyperparameterTuningJobRequest::parent].
@@ -26855,8 +26904,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateHyperparameterTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateHyperparameterTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26866,7 +26915,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetHyperparameterTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26899,7 +26948,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26909,7 +26958,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_hyperparameter_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetHyperparameterTuningJobRequest::name].
@@ -26922,8 +26971,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHyperparameterTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHyperparameterTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26933,8 +26982,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListHyperparameterTuningJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -26970,7 +27019,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26980,15 +27029,15 @@ pub mod job_service {
             (*self.0.stub)
                 .list_hyperparameter_tuning_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListHyperparameterTuningJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -26997,17 +27046,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListHyperparameterTuningJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -27057,8 +27106,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListHyperparameterTuningJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListHyperparameterTuningJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27068,7 +27117,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteHyperparameterTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -27102,7 +27151,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27117,7 +27166,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_hyperparameter_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_hyperparameter_tuning_job`.
@@ -27133,7 +27182,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -27170,8 +27219,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteHyperparameterTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteHyperparameterTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27181,7 +27230,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CancelHyperparameterTuningJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27214,7 +27263,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27224,7 +27273,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_hyperparameter_tuning_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelHyperparameterTuningJobRequest::name].
@@ -27237,8 +27286,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelHyperparameterTuningJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelHyperparameterTuningJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27248,7 +27297,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CreateNasJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27276,7 +27325,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27286,7 +27335,7 @@ pub mod job_service {
             (*self.0.stub)
                 .create_nas_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateNasJobRequest::parent].
@@ -27321,8 +27370,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNasJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNasJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27332,7 +27381,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetNasJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27360,7 +27409,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27370,7 +27419,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_nas_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNasJobRequest::name].
@@ -27383,8 +27432,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNasJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNasJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27394,8 +27443,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListNasJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -27426,7 +27475,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27436,13 +27485,13 @@ pub mod job_service {
             (*self.0.stub)
                 .list_nas_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNasJobsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListNasJobsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -27451,15 +27500,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListNasJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListNasJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -27509,8 +27560,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNasJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNasJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27520,7 +27571,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteNasJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -27549,7 +27600,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27564,7 +27615,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_nas_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_nas_job`.
@@ -27580,7 +27631,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -27617,8 +27668,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNasJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNasJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27628,7 +27679,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CancelNasJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27656,7 +27707,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27666,7 +27717,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_nas_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelNasJobRequest::name].
@@ -27679,8 +27730,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelNasJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelNasJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27690,7 +27741,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetNasTrialDetail;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27721,7 +27772,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27731,7 +27782,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_nas_trial_detail(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNasTrialDetailRequest::name].
@@ -27744,8 +27795,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNasTrialDetail {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNasTrialDetail {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27755,8 +27806,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListNasTrialDetails;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -27790,7 +27841,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27800,14 +27851,16 @@ pub mod job_service {
             (*self.0.stub)
                 .list_nas_trial_details(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNasTrialDetailsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListNasTrialDetailsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -27815,17 +27868,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListNasTrialDetailsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -27851,8 +27904,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNasTrialDetails {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNasTrialDetails {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27862,7 +27915,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CreateBatchPredictionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27895,7 +27948,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27905,7 +27958,7 @@ pub mod job_service {
             (*self.0.stub)
                 .create_batch_prediction_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateBatchPredictionJobRequest::parent].
@@ -27940,8 +27993,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBatchPredictionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBatchPredictionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27951,7 +28004,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetBatchPredictionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27982,7 +28035,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27992,7 +28045,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_batch_prediction_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBatchPredictionJobRequest::name].
@@ -28005,8 +28058,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBatchPredictionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBatchPredictionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28016,8 +28069,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListBatchPredictionJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -28053,7 +28106,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28063,15 +28116,15 @@ pub mod job_service {
             (*self.0.stub)
                 .list_batch_prediction_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListBatchPredictionJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -28080,17 +28133,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBatchPredictionJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -28140,8 +28193,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBatchPredictionJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBatchPredictionJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28151,7 +28204,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteBatchPredictionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -28185,7 +28238,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28200,7 +28253,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_batch_prediction_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_batch_prediction_job`.
@@ -28216,7 +28269,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -28253,8 +28306,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBatchPredictionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBatchPredictionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28264,7 +28317,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CancelBatchPredictionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28297,7 +28350,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28307,7 +28360,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_batch_prediction_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelBatchPredictionJobRequest::name].
@@ -28320,8 +28373,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelBatchPredictionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelBatchPredictionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28331,7 +28384,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CreateModelDeploymentMonitoringJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28364,7 +28417,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28374,7 +28427,7 @@ pub mod job_service {
             (*self.0.stub)
                 .create_model_deployment_monitoring_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateModelDeploymentMonitoringJobRequest::parent].
@@ -28412,8 +28465,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateModelDeploymentMonitoringJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateModelDeploymentMonitoringJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28423,8 +28476,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::SearchModelDeploymentMonitoringStatsAnomalies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -28462,7 +28515,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28474,15 +28527,15 @@ pub mod job_service {
             (*self.0.stub)
                 .search_model_deployment_monitoring_stats_anomalies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -28491,17 +28544,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -28593,8 +28646,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchModelDeploymentMonitoringStatsAnomalies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchModelDeploymentMonitoringStatsAnomalies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28604,7 +28657,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetModelDeploymentMonitoringJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28637,7 +28690,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28647,7 +28700,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_model_deployment_monitoring_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetModelDeploymentMonitoringJobRequest::name].
@@ -28660,8 +28713,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetModelDeploymentMonitoringJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetModelDeploymentMonitoringJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28671,8 +28724,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListModelDeploymentMonitoringJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -28708,7 +28761,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28718,15 +28771,15 @@ pub mod job_service {
             (*self.0.stub)
                 .list_model_deployment_monitoring_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListModelDeploymentMonitoringJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -28735,17 +28788,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListModelDeploymentMonitoringJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -28795,8 +28848,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModelDeploymentMonitoringJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModelDeploymentMonitoringJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28806,7 +28859,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::UpdateModelDeploymentMonitoringJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -28840,7 +28893,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28855,7 +28908,7 @@ pub mod job_service {
             (*self.0.stub)
                 .update_model_deployment_monitoring_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_model_deployment_monitoring_job`.
@@ -28874,7 +28927,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -28950,8 +29003,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateModelDeploymentMonitoringJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateModelDeploymentMonitoringJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28961,7 +29014,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteModelDeploymentMonitoringJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -28995,7 +29048,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29010,7 +29063,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_model_deployment_monitoring_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_model_deployment_monitoring_job`.
@@ -29026,7 +29079,7 @@ pub mod job_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -29063,8 +29116,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteModelDeploymentMonitoringJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteModelDeploymentMonitoringJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29074,7 +29127,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::PauseModelDeploymentMonitoringJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29107,7 +29160,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29117,7 +29170,7 @@ pub mod job_service {
             (*self.0.stub)
                 .pause_model_deployment_monitoring_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::PauseModelDeploymentMonitoringJobRequest::name].
@@ -29130,8 +29183,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PauseModelDeploymentMonitoringJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PauseModelDeploymentMonitoringJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29141,7 +29194,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ResumeModelDeploymentMonitoringJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29174,7 +29227,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29184,7 +29237,7 @@ pub mod job_service {
             (*self.0.stub)
                 .resume_model_deployment_monitoring_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ResumeModelDeploymentMonitoringJobRequest::name].
@@ -29197,8 +29250,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeModelDeploymentMonitoringJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeModelDeploymentMonitoringJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29208,8 +29261,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -29243,7 +29296,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29253,15 +29306,15 @@ pub mod job_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -29270,17 +29323,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -29310,8 +29363,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29321,7 +29374,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29352,7 +29405,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29362,7 +29415,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -29373,8 +29426,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29384,7 +29437,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29415,7 +29468,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29425,7 +29478,7 @@ pub mod job_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -29478,8 +29531,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29489,7 +29542,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29520,7 +29573,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29530,7 +29583,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -29561,8 +29614,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29572,7 +29625,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29605,7 +29658,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29615,7 +29668,7 @@ pub mod job_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -29641,8 +29694,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29652,8 +29705,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -29689,7 +29742,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29699,15 +29752,15 @@ pub mod job_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -29716,17 +29769,17 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -29762,8 +29815,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29773,7 +29826,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29804,7 +29857,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29814,7 +29867,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -29825,8 +29878,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29836,7 +29889,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29869,7 +29922,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29879,7 +29932,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -29890,8 +29943,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29901,7 +29954,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29934,7 +29987,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29944,7 +29997,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -29955,8 +30008,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29966,7 +30019,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::job_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29997,7 +30050,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30007,7 +30060,7 @@ pub mod job_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -30036,8 +30089,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30051,7 +30104,7 @@ pub mod llm_utility_service {
     /// A builder for [LlmUtilityService][crate::client::LlmUtilityService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::llm_utility_service::ClientBuilder;
     /// # use client::LlmUtilityService;
@@ -30061,19 +30114,18 @@ pub mod llm_utility_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::LlmUtilityService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = LlmUtilityService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -30084,7 +30136,7 @@ pub mod llm_utility_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::LlmUtilityService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -30097,7 +30149,7 @@ pub mod llm_utility_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -30107,7 +30159,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::CountTokens;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30135,7 +30187,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30145,7 +30197,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .count_tokens(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::CountTokensRequest::endpoint].
@@ -30233,8 +30285,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CountTokens {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CountTokens {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30244,7 +30296,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::ComputeTokens;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30272,7 +30324,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30282,7 +30334,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .compute_tokens(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::ComputeTokensRequest::endpoint].
@@ -30323,8 +30375,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ComputeTokens {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ComputeTokens {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30334,8 +30386,8 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -30369,7 +30421,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30379,15 +30431,15 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -30396,17 +30448,17 @@ pub mod llm_utility_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -30436,8 +30488,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30447,7 +30499,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30478,7 +30530,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30488,7 +30540,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -30499,8 +30551,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30510,7 +30562,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30541,7 +30593,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30551,7 +30603,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -30604,8 +30656,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30615,7 +30667,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30646,7 +30698,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30656,7 +30708,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -30687,8 +30739,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30698,7 +30750,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30731,7 +30783,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30741,7 +30793,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -30767,8 +30819,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30778,8 +30830,8 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -30815,7 +30867,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30825,15 +30877,15 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -30842,17 +30894,17 @@ pub mod llm_utility_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -30888,8 +30940,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30899,7 +30951,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30930,7 +30982,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30940,7 +30992,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -30951,8 +31003,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30962,7 +31014,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30995,7 +31047,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31005,7 +31057,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -31016,8 +31068,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31027,7 +31079,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31060,7 +31112,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31070,7 +31122,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -31081,8 +31133,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31092,7 +31144,7 @@ pub mod llm_utility_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::llm_utility_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31123,7 +31175,7 @@ pub mod llm_utility_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31133,7 +31185,7 @@ pub mod llm_utility_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -31162,8 +31214,8 @@ pub mod llm_utility_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31177,7 +31229,7 @@ pub mod match_service {
     /// A builder for [MatchService][crate::client::MatchService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::match_service::ClientBuilder;
     /// # use client::MatchService;
@@ -31187,19 +31239,18 @@ pub mod match_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MatchService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MatchService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -31210,7 +31261,7 @@ pub mod match_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MatchService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -31223,7 +31274,7 @@ pub mod match_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -31233,7 +31284,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::FindNeighbors;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31261,7 +31312,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31271,7 +31322,7 @@ pub mod match_service {
             (*self.0.stub)
                 .find_neighbors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [index_endpoint][crate::model::FindNeighborsRequest::index_endpoint].
@@ -31307,8 +31358,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FindNeighbors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FindNeighbors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31318,7 +31369,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::ReadIndexDatapoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31349,7 +31400,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31359,7 +31410,7 @@ pub mod match_service {
             (*self.0.stub)
                 .read_index_datapoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [index_endpoint][crate::model::ReadIndexDatapointsRequest::index_endpoint].
@@ -31389,8 +31440,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadIndexDatapoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadIndexDatapoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31400,8 +31451,8 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -31435,7 +31486,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31445,15 +31496,15 @@ pub mod match_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -31462,17 +31513,17 @@ pub mod match_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -31502,8 +31553,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31513,7 +31564,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31544,7 +31595,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31554,7 +31605,7 @@ pub mod match_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -31565,8 +31616,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31576,7 +31627,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31607,7 +31658,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31617,7 +31668,7 @@ pub mod match_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -31670,8 +31721,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31681,7 +31732,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31712,7 +31763,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31722,7 +31773,7 @@ pub mod match_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -31753,8 +31804,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31764,7 +31815,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31797,7 +31848,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31807,7 +31858,7 @@ pub mod match_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -31833,8 +31884,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31844,8 +31895,8 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -31881,7 +31932,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31891,15 +31942,15 @@ pub mod match_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -31908,17 +31959,17 @@ pub mod match_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -31954,8 +32005,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31965,7 +32016,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31996,7 +32047,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32006,7 +32057,7 @@ pub mod match_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -32017,8 +32068,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32028,7 +32079,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32061,7 +32112,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32071,7 +32122,7 @@ pub mod match_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -32082,8 +32133,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32093,7 +32144,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32126,7 +32177,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32136,7 +32187,7 @@ pub mod match_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -32147,8 +32198,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32158,7 +32209,7 @@ pub mod match_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::match_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32189,7 +32240,7 @@ pub mod match_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32199,7 +32250,7 @@ pub mod match_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -32228,8 +32279,8 @@ pub mod match_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32243,7 +32294,7 @@ pub mod metadata_service {
     /// A builder for [MetadataService][crate::client::MetadataService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::metadata_service::ClientBuilder;
     /// # use client::MetadataService;
@@ -32253,19 +32304,18 @@ pub mod metadata_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MetadataService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MetadataService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -32276,7 +32326,7 @@ pub mod metadata_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MetadataService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -32289,7 +32339,7 @@ pub mod metadata_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -32299,7 +32349,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::CreateMetadataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -32331,7 +32381,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32346,7 +32396,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_metadata_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_metadata_store`.
@@ -32365,7 +32415,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -32430,8 +32480,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMetadataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMetadataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32441,7 +32491,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetMetadataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32472,7 +32522,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32482,7 +32532,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_metadata_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMetadataStoreRequest::name].
@@ -32495,8 +32545,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMetadataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMetadataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32506,8 +32556,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListMetadataStores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -32541,7 +32591,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32551,14 +32601,16 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_metadata_stores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMetadataStoresResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMetadataStoresResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -32566,17 +32618,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMetadataStoresResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -32602,8 +32654,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMetadataStores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMetadataStores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32613,7 +32665,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::DeleteMetadataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -32645,7 +32697,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32660,7 +32712,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_metadata_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_metadata_store`.
@@ -32677,7 +32729,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -32721,8 +32773,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMetadataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMetadataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32732,7 +32784,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::CreateArtifact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32760,7 +32812,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32770,7 +32822,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_artifact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateArtifactRequest::parent].
@@ -32811,8 +32863,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateArtifact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateArtifact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32822,7 +32874,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetArtifact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32850,7 +32902,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32860,7 +32912,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_artifact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetArtifactRequest::name].
@@ -32873,8 +32925,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetArtifact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetArtifact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32884,8 +32936,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListArtifacts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -32916,7 +32968,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32926,13 +32978,13 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_artifacts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListArtifactsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListArtifactsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -32941,15 +32993,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListArtifactsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListArtifactsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -32987,8 +33041,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListArtifacts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListArtifacts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32998,7 +33052,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::UpdateArtifact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33026,7 +33080,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33036,7 +33090,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .update_artifact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [artifact][crate::model::UpdateArtifactRequest::artifact].
@@ -33087,8 +33141,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateArtifact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateArtifact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33098,7 +33152,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::DeleteArtifact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -33127,7 +33181,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33142,7 +33196,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_artifact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_artifact`.
@@ -33158,7 +33212,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -33201,8 +33255,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteArtifact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteArtifact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33212,7 +33266,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::PurgeArtifacts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -33241,7 +33295,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33256,7 +33310,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .purge_artifacts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_artifacts`.
@@ -33275,7 +33329,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -33326,8 +33380,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeArtifacts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeArtifacts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33337,7 +33391,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::CreateContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33365,7 +33419,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33375,7 +33429,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateContextRequest::parent].
@@ -33416,8 +33470,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33427,7 +33481,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33455,7 +33509,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33465,7 +33519,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetContextRequest::name].
@@ -33478,8 +33532,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33489,8 +33543,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListContexts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -33521,7 +33575,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33531,13 +33585,13 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_contexts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListContextsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListContextsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -33546,15 +33600,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListContextsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListContextsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -33592,8 +33648,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListContexts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListContexts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33603,7 +33659,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::UpdateContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33631,7 +33687,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33641,7 +33697,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .update_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [context][crate::model::UpdateContextRequest::context].
@@ -33692,8 +33748,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33703,7 +33759,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::DeleteContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -33732,7 +33788,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33747,7 +33803,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_context`.
@@ -33763,7 +33819,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -33812,8 +33868,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33823,7 +33879,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::PurgeContexts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -33852,7 +33908,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33867,7 +33923,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .purge_contexts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_contexts`.
@@ -33886,7 +33942,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -33937,8 +33993,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeContexts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeContexts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33948,7 +34004,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::AddContextArtifactsAndExecutions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33981,7 +34037,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33991,7 +34047,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .add_context_artifacts_and_executions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [context][crate::model::AddContextArtifactsAndExecutionsRequest::context].
@@ -34026,8 +34082,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddContextArtifactsAndExecutions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddContextArtifactsAndExecutions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34037,7 +34093,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::AddContextChildren;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34068,7 +34124,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34078,7 +34134,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .add_context_children(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [context][crate::model::AddContextChildrenRequest::context].
@@ -34102,8 +34158,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddContextChildren {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddContextChildren {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34113,7 +34169,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::RemoveContextChildren;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34144,7 +34200,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34154,7 +34210,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .remove_context_children(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [context][crate::model::RemoveContextChildrenRequest::context].
@@ -34178,8 +34234,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveContextChildren {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveContextChildren {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34189,7 +34245,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::QueryContextLineageSubgraph;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34222,7 +34278,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34232,7 +34288,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .query_context_lineage_subgraph(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [context][crate::model::QueryContextLineageSubgraphRequest::context].
@@ -34245,8 +34301,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryContextLineageSubgraph {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryContextLineageSubgraph {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34256,7 +34312,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::CreateExecution;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34284,7 +34340,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34294,7 +34350,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_execution(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateExecutionRequest::parent].
@@ -34335,8 +34391,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateExecution {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateExecution {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34346,7 +34402,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetExecution;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34374,7 +34430,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34384,7 +34440,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_execution(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetExecutionRequest::name].
@@ -34397,8 +34453,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetExecution {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetExecution {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34408,8 +34464,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListExecutions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -34440,7 +34496,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34450,14 +34506,16 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_executions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListExecutionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListExecutionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -34465,15 +34523,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListExecutionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListExecutionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -34511,8 +34571,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListExecutions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListExecutions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34522,7 +34582,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::UpdateExecution;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34550,7 +34610,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34560,7 +34620,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .update_execution(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [execution][crate::model::UpdateExecutionRequest::execution].
@@ -34611,8 +34671,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateExecution {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateExecution {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34622,7 +34682,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::DeleteExecution;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -34651,7 +34711,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34666,7 +34726,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_execution(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_execution`.
@@ -34682,7 +34742,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -34725,8 +34785,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteExecution {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteExecution {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34736,7 +34796,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::PurgeExecutions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -34765,7 +34825,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34780,7 +34840,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .purge_executions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_executions`.
@@ -34799,7 +34859,7 @@ pub mod metadata_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -34850,8 +34910,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeExecutions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeExecutions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34861,7 +34921,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::AddExecutionEvents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34892,7 +34952,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34902,7 +34962,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .add_execution_events(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [execution][crate::model::AddExecutionEventsRequest::execution].
@@ -34926,8 +34986,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddExecutionEvents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddExecutionEvents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34937,7 +34997,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::QueryExecutionInputsAndOutputs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34970,7 +35030,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34980,7 +35040,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .query_execution_inputs_and_outputs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [execution][crate::model::QueryExecutionInputsAndOutputsRequest::execution].
@@ -34993,8 +35053,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryExecutionInputsAndOutputs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryExecutionInputsAndOutputs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35004,7 +35064,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::CreateMetadataSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35035,7 +35095,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35045,7 +35105,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_metadata_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateMetadataSchemaRequest::parent].
@@ -35086,8 +35146,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMetadataSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMetadataSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35097,7 +35157,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetMetadataSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35128,7 +35188,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35138,7 +35198,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_metadata_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMetadataSchemaRequest::name].
@@ -35151,8 +35211,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMetadataSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMetadataSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35162,8 +35222,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListMetadataSchemas;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -35197,7 +35257,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35207,14 +35267,16 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_metadata_schemas(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMetadataSchemasResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMetadataSchemasResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -35222,17 +35284,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMetadataSchemasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -35264,8 +35326,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMetadataSchemas {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMetadataSchemas {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35275,7 +35337,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::QueryArtifactLineageSubgraph;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35308,7 +35370,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35318,7 +35380,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .query_artifact_lineage_subgraph(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [artifact][crate::model::QueryArtifactLineageSubgraphRequest::artifact].
@@ -35343,8 +35405,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryArtifactLineageSubgraph {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryArtifactLineageSubgraph {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35354,8 +35416,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -35389,7 +35451,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35399,15 +35461,15 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -35416,17 +35478,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -35456,8 +35518,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35467,7 +35529,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35498,7 +35560,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35508,7 +35570,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -35519,8 +35581,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35530,7 +35592,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35561,7 +35623,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35571,7 +35633,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -35624,8 +35686,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35635,7 +35697,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35666,7 +35728,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35676,7 +35738,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -35707,8 +35769,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35718,7 +35780,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35751,7 +35813,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35761,7 +35823,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -35787,8 +35849,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35798,8 +35860,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -35835,7 +35897,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35845,15 +35907,15 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -35862,17 +35924,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -35908,8 +35970,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35919,7 +35981,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35950,7 +36012,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35960,7 +36022,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -35971,8 +36033,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35982,7 +36044,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36015,7 +36077,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36025,7 +36087,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -36036,8 +36098,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36047,7 +36109,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36080,7 +36142,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36090,7 +36152,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -36101,8 +36163,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36112,7 +36174,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::metadata_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36143,7 +36205,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36153,7 +36215,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -36182,8 +36244,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36197,7 +36259,7 @@ pub mod migration_service {
     /// A builder for [MigrationService][crate::client::MigrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::migration_service::ClientBuilder;
     /// # use client::MigrationService;
@@ -36207,19 +36269,18 @@ pub mod migration_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MigrationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MigrationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -36230,7 +36291,7 @@ pub mod migration_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MigrationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -36243,7 +36304,7 @@ pub mod migration_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -36253,8 +36314,8 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::SearchMigratableResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -36290,7 +36351,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36300,15 +36361,15 @@ pub mod migration_service {
             (*self.0.stub)
                 .search_migratable_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::SearchMigratableResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -36317,17 +36378,17 @@ pub mod migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchMigratableResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -36359,8 +36420,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchMigratableResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchMigratableResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36370,7 +36431,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::BatchMigrateResources;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -36402,7 +36463,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36417,7 +36478,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .batch_migrate_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_migrate_resources`.
@@ -36436,7 +36497,7 @@ pub mod migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -36486,8 +36547,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchMigrateResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchMigrateResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36497,8 +36558,8 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -36532,7 +36593,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36542,15 +36603,15 @@ pub mod migration_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -36559,17 +36620,17 @@ pub mod migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -36599,8 +36660,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36610,7 +36671,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36641,7 +36702,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36651,7 +36712,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -36662,8 +36723,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36673,7 +36734,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36704,7 +36765,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36714,7 +36775,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -36767,8 +36828,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36778,7 +36839,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36809,7 +36870,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36819,7 +36880,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -36850,8 +36911,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36861,7 +36922,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36894,7 +36955,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36904,7 +36965,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -36930,8 +36991,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36941,8 +37002,8 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -36978,7 +37039,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36988,15 +37049,15 @@ pub mod migration_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -37005,17 +37066,17 @@ pub mod migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -37051,8 +37112,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37062,7 +37123,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37093,7 +37154,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37103,7 +37164,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -37114,8 +37175,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37125,7 +37186,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37158,7 +37219,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37168,7 +37229,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -37179,8 +37240,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37190,7 +37251,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37223,7 +37284,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37233,7 +37294,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -37244,8 +37305,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37255,7 +37316,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::migration_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37286,7 +37347,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37296,7 +37357,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -37325,8 +37386,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37340,7 +37401,7 @@ pub mod model_garden_service {
     /// A builder for [ModelGardenService][crate::client::ModelGardenService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::model_garden_service::ClientBuilder;
     /// # use client::ModelGardenService;
@@ -37350,19 +37411,18 @@ pub mod model_garden_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ModelGardenService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ModelGardenService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -37373,7 +37433,7 @@ pub mod model_garden_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ModelGardenService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -37386,7 +37446,7 @@ pub mod model_garden_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -37396,7 +37456,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::GetPublisherModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37427,7 +37487,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37437,7 +37497,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .get_publisher_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPublisherModelRequest::name].
@@ -37474,8 +37534,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPublisherModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPublisherModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37485,7 +37545,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::Deploy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -37514,7 +37574,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37529,7 +37589,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .deploy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy`.
@@ -37548,7 +37608,7 @@ pub mod model_garden_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -37677,8 +37737,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Deploy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Deploy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37688,8 +37748,8 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -37723,7 +37783,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37733,15 +37793,15 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -37750,17 +37810,17 @@ pub mod model_garden_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -37790,8 +37850,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37801,7 +37861,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37832,7 +37892,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37842,7 +37902,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -37853,8 +37913,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37864,7 +37924,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37895,7 +37955,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37905,7 +37965,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -37958,8 +38018,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37969,7 +38029,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38000,7 +38060,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38010,7 +38070,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -38041,8 +38101,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38052,7 +38112,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38085,7 +38145,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38095,7 +38155,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -38121,8 +38181,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38132,8 +38192,8 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -38169,7 +38229,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38179,15 +38239,15 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -38196,17 +38256,17 @@ pub mod model_garden_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -38242,8 +38302,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38253,7 +38313,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38284,7 +38344,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38294,7 +38354,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -38305,8 +38365,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38316,7 +38376,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38349,7 +38409,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38359,7 +38419,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -38370,8 +38430,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38381,7 +38441,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38414,7 +38474,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38424,7 +38484,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -38435,8 +38495,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38446,7 +38506,7 @@ pub mod model_garden_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_garden_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38477,7 +38537,7 @@ pub mod model_garden_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38487,7 +38547,7 @@ pub mod model_garden_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -38516,8 +38576,8 @@ pub mod model_garden_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38531,7 +38591,7 @@ pub mod model_service {
     /// A builder for [ModelService][crate::client::ModelService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::model_service::ClientBuilder;
     /// # use client::ModelService;
@@ -38541,19 +38601,18 @@ pub mod model_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ModelService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ModelService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -38564,7 +38623,7 @@ pub mod model_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ModelService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -38577,7 +38636,7 @@ pub mod model_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -38587,7 +38646,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::UploadModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -38616,7 +38675,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38631,7 +38690,7 @@ pub mod model_service {
             (*self.0.stub)
                 .upload_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `upload_model`.
@@ -38650,7 +38709,7 @@ pub mod model_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -38727,8 +38786,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UploadModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UploadModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38738,7 +38797,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::GetModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38766,7 +38825,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38776,7 +38835,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetModelRequest::name].
@@ -38789,8 +38848,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38800,8 +38859,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListModels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -38832,7 +38891,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38842,13 +38901,13 @@ pub mod model_service {
             (*self.0.stub)
                 .list_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListModelsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListModelsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -38857,15 +38916,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListModelsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListModelsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -38921,8 +38982,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38932,8 +38993,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListModelVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -38967,7 +39028,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38977,14 +39038,16 @@ pub mod model_service {
             (*self.0.stub)
                 .list_model_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListModelVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListModelVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -38992,15 +39055,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListModelVersionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListModelVersionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -39056,8 +39121,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModelVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModelVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39067,8 +39132,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListModelVersionCheckpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -39104,7 +39169,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39114,15 +39179,15 @@ pub mod model_service {
             (*self.0.stub)
                 .list_model_version_checkpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListModelVersionCheckpointsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -39131,17 +39196,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListModelVersionCheckpointsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -39167,8 +39232,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModelVersionCheckpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModelVersionCheckpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39178,7 +39243,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::UpdateModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39206,7 +39271,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39216,7 +39281,7 @@ pub mod model_service {
             (*self.0.stub)
                 .update_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model][crate::model::UpdateModelRequest::model].
@@ -39265,8 +39330,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39276,7 +39341,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::UpdateExplanationDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -39310,7 +39375,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39325,7 +39390,7 @@ pub mod model_service {
             (*self.0.stub)
                 .update_explanation_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_explanation_dataset`.
@@ -39344,7 +39409,7 @@ pub mod model_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -39399,8 +39464,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateExplanationDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateExplanationDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39410,7 +39475,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::DeleteModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -39439,7 +39504,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39454,7 +39519,7 @@ pub mod model_service {
             (*self.0.stub)
                 .delete_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_model`.
@@ -39470,7 +39535,7 @@ pub mod model_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -39507,8 +39572,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39518,7 +39583,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::DeleteModelVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -39550,7 +39615,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39565,7 +39630,7 @@ pub mod model_service {
             (*self.0.stub)
                 .delete_model_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_model_version`.
@@ -39581,7 +39646,7 @@ pub mod model_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -39618,8 +39683,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteModelVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteModelVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39629,7 +39694,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::MergeVersionAliases;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39660,7 +39725,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39670,7 +39735,7 @@ pub mod model_service {
             (*self.0.stub)
                 .merge_version_aliases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::MergeVersionAliasesRequest::name].
@@ -39696,8 +39761,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MergeVersionAliases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MergeVersionAliases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39707,7 +39772,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ExportModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -39736,7 +39801,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39751,7 +39816,7 @@ pub mod model_service {
             (*self.0.stub)
                 .export_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_model`.
@@ -39770,7 +39835,7 @@ pub mod model_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -39829,8 +39894,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39840,7 +39905,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::CopyModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -39869,7 +39934,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39884,7 +39949,7 @@ pub mod model_service {
             (*self.0.stub)
                 .copy_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `copy_model`.
@@ -39903,7 +39968,7 @@ pub mod model_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -40003,8 +40068,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CopyModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CopyModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40014,7 +40079,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ImportModelEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40045,7 +40110,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40055,7 +40120,7 @@ pub mod model_service {
             (*self.0.stub)
                 .import_model_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ImportModelEvaluationRequest::parent].
@@ -40090,8 +40155,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportModelEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportModelEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40101,7 +40166,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::BatchImportModelEvaluationSlices;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40134,7 +40199,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40144,7 +40209,7 @@ pub mod model_service {
             (*self.0.stub)
                 .batch_import_model_evaluation_slices(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchImportModelEvaluationSlicesRequest::parent].
@@ -40170,8 +40235,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchImportModelEvaluationSlices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchImportModelEvaluationSlices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40181,7 +40246,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::BatchImportEvaluatedAnnotations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40214,7 +40279,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40224,7 +40289,7 @@ pub mod model_service {
             (*self.0.stub)
                 .batch_import_evaluated_annotations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchImportEvaluatedAnnotationsRequest::parent].
@@ -40250,8 +40315,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchImportEvaluatedAnnotations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchImportEvaluatedAnnotations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40261,7 +40326,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::GetModelEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40292,7 +40357,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40302,7 +40367,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_model_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetModelEvaluationRequest::name].
@@ -40315,8 +40380,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetModelEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetModelEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40326,8 +40391,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListModelEvaluations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -40361,7 +40426,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40371,14 +40436,16 @@ pub mod model_service {
             (*self.0.stub)
                 .list_model_evaluations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListModelEvaluationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListModelEvaluationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -40386,17 +40453,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListModelEvaluationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -40446,8 +40513,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModelEvaluations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModelEvaluations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40457,7 +40524,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::GetModelEvaluationSlice;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40490,7 +40557,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40500,7 +40567,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_model_evaluation_slice(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetModelEvaluationSliceRequest::name].
@@ -40513,8 +40580,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetModelEvaluationSlice {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetModelEvaluationSlice {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40524,8 +40591,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListModelEvaluationSlices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -40561,7 +40628,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40571,15 +40638,15 @@ pub mod model_service {
             (*self.0.stub)
                 .list_model_evaluation_slices(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListModelEvaluationSlicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -40588,17 +40655,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListModelEvaluationSlicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -40648,8 +40715,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModelEvaluationSlices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModelEvaluationSlices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40659,8 +40726,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -40694,7 +40761,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40704,15 +40771,15 @@ pub mod model_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -40721,17 +40788,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -40761,8 +40828,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40772,7 +40839,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40803,7 +40870,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40813,7 +40880,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -40824,8 +40891,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40835,7 +40902,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40866,7 +40933,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40876,7 +40943,7 @@ pub mod model_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -40929,8 +40996,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40940,7 +41007,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40971,7 +41038,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40981,7 +41048,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -41012,8 +41079,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41023,7 +41090,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41056,7 +41123,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41066,7 +41133,7 @@ pub mod model_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -41092,8 +41159,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41103,8 +41170,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -41140,7 +41207,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41150,15 +41217,15 @@ pub mod model_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -41167,17 +41234,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -41213,8 +41280,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41224,7 +41291,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41255,7 +41322,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41265,7 +41332,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -41276,8 +41343,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41287,7 +41354,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41320,7 +41387,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41330,7 +41397,7 @@ pub mod model_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -41341,8 +41408,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41352,7 +41419,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41385,7 +41452,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41395,7 +41462,7 @@ pub mod model_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -41406,8 +41473,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41417,7 +41484,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::model_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41448,7 +41515,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41458,7 +41525,7 @@ pub mod model_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -41487,8 +41554,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41502,7 +41569,7 @@ pub mod notebook_service {
     /// A builder for [NotebookService][crate::client::NotebookService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::notebook_service::ClientBuilder;
     /// # use client::NotebookService;
@@ -41512,19 +41579,18 @@ pub mod notebook_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NotebookService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NotebookService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -41535,7 +41601,7 @@ pub mod notebook_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NotebookService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -41548,7 +41614,7 @@ pub mod notebook_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -41558,7 +41624,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::CreateNotebookRuntimeTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -41592,7 +41658,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41607,7 +41673,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .create_notebook_runtime_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_notebook_runtime_template`.
@@ -41626,7 +41692,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -41697,8 +41763,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNotebookRuntimeTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNotebookRuntimeTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41708,7 +41774,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::GetNotebookRuntimeTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41741,7 +41807,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41751,7 +41817,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .get_notebook_runtime_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNotebookRuntimeTemplateRequest::name].
@@ -41764,8 +41830,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNotebookRuntimeTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNotebookRuntimeTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41775,8 +41841,8 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::ListNotebookRuntimeTemplates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -41812,7 +41878,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41822,15 +41888,15 @@ pub mod notebook_service {
             (*self.0.stub)
                 .list_notebook_runtime_templates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListNotebookRuntimeTemplatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -41839,17 +41905,17 @@ pub mod notebook_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListNotebookRuntimeTemplatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -41905,8 +41971,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNotebookRuntimeTemplates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNotebookRuntimeTemplates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41916,7 +41982,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::DeleteNotebookRuntimeTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -41950,7 +42016,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41965,7 +42031,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .delete_notebook_runtime_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_notebook_runtime_template`.
@@ -41981,7 +42047,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -42018,8 +42084,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNotebookRuntimeTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNotebookRuntimeTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42029,7 +42095,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::UpdateNotebookRuntimeTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42062,7 +42128,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42072,7 +42138,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .update_notebook_runtime_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [notebook_runtime_template][crate::model::UpdateNotebookRuntimeTemplateRequest::notebook_runtime_template].
@@ -42124,8 +42190,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateNotebookRuntimeTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateNotebookRuntimeTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42135,7 +42201,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::AssignNotebookRuntime;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -42167,7 +42233,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42182,7 +42248,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .assign_notebook_runtime(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `assign_notebook_runtime`.
@@ -42201,7 +42267,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -42274,8 +42340,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AssignNotebookRuntime {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AssignNotebookRuntime {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42285,7 +42351,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::GetNotebookRuntime;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42316,7 +42382,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42326,7 +42392,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .get_notebook_runtime(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNotebookRuntimeRequest::name].
@@ -42339,8 +42405,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNotebookRuntime {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNotebookRuntime {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42350,8 +42416,8 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::ListNotebookRuntimes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -42385,7 +42451,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42395,14 +42461,16 @@ pub mod notebook_service {
             (*self.0.stub)
                 .list_notebook_runtimes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNotebookRuntimesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListNotebookRuntimesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -42410,17 +42478,17 @@ pub mod notebook_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListNotebookRuntimesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -42476,8 +42544,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNotebookRuntimes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNotebookRuntimes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42487,7 +42555,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::DeleteNotebookRuntime;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -42519,7 +42587,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42534,7 +42602,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .delete_notebook_runtime(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_notebook_runtime`.
@@ -42550,7 +42618,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -42587,8 +42655,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNotebookRuntime {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNotebookRuntime {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42598,7 +42666,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::UpgradeNotebookRuntime;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -42630,7 +42698,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42645,7 +42713,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .upgrade_notebook_runtime(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `upgrade_notebook_runtime`.
@@ -42664,7 +42732,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -42701,8 +42769,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpgradeNotebookRuntime {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpgradeNotebookRuntime {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42712,7 +42780,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::StartNotebookRuntime;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -42744,7 +42812,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42759,7 +42827,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .start_notebook_runtime(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_notebook_runtime`.
@@ -42778,7 +42846,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -42815,8 +42883,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartNotebookRuntime {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartNotebookRuntime {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42826,7 +42894,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::StopNotebookRuntime;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -42858,7 +42926,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42873,7 +42941,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .stop_notebook_runtime(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_notebook_runtime`.
@@ -42892,7 +42960,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -42929,8 +42997,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopNotebookRuntime {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopNotebookRuntime {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42940,7 +43008,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::CreateNotebookExecutionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -42974,7 +43042,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42989,7 +43057,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .create_notebook_execution_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_notebook_execution_job`.
@@ -43008,7 +43076,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -43073,8 +43141,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNotebookExecutionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNotebookExecutionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43084,7 +43152,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::GetNotebookExecutionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43117,7 +43185,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43127,7 +43195,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .get_notebook_execution_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNotebookExecutionJobRequest::name].
@@ -43146,8 +43214,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNotebookExecutionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNotebookExecutionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43157,8 +43225,8 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::ListNotebookExecutionJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -43194,7 +43262,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43204,15 +43272,15 @@ pub mod notebook_service {
             (*self.0.stub)
                 .list_notebook_execution_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListNotebookExecutionJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -43221,17 +43289,17 @@ pub mod notebook_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListNotebookExecutionJobsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -43275,8 +43343,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNotebookExecutionJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNotebookExecutionJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43286,7 +43354,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::DeleteNotebookExecutionJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -43320,7 +43388,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43335,7 +43403,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .delete_notebook_execution_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_notebook_execution_job`.
@@ -43351,7 +43419,7 @@ pub mod notebook_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -43388,8 +43456,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNotebookExecutionJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNotebookExecutionJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43399,8 +43467,8 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -43434,7 +43502,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43444,15 +43512,15 @@ pub mod notebook_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -43461,17 +43529,17 @@ pub mod notebook_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -43501,8 +43569,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43512,7 +43580,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43543,7 +43611,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43553,7 +43621,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -43564,8 +43632,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43575,7 +43643,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43606,7 +43674,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43616,7 +43684,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -43669,8 +43737,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43680,7 +43748,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43711,7 +43779,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43721,7 +43789,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -43752,8 +43820,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43763,7 +43831,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43796,7 +43864,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43806,7 +43874,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -43832,8 +43900,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43843,8 +43911,8 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -43880,7 +43948,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43890,15 +43958,15 @@ pub mod notebook_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -43907,17 +43975,17 @@ pub mod notebook_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -43953,8 +44021,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43964,7 +44032,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43995,7 +44063,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44005,7 +44073,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -44016,8 +44084,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44027,7 +44095,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44060,7 +44128,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44070,7 +44138,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -44081,8 +44149,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44092,7 +44160,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44125,7 +44193,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44135,7 +44203,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -44146,8 +44214,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44157,7 +44225,7 @@ pub mod notebook_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::notebook_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44188,7 +44256,7 @@ pub mod notebook_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44198,7 +44266,7 @@ pub mod notebook_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -44227,8 +44295,8 @@ pub mod notebook_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44242,7 +44310,7 @@ pub mod persistent_resource_service {
     /// A builder for [PersistentResourceService][crate::client::PersistentResourceService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::persistent_resource_service::ClientBuilder;
     /// # use client::PersistentResourceService;
@@ -44252,19 +44320,18 @@ pub mod persistent_resource_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PersistentResourceService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PersistentResourceService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -44275,7 +44342,7 @@ pub mod persistent_resource_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PersistentResourceService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -44288,7 +44355,7 @@ pub mod persistent_resource_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -44298,7 +44365,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::CreatePersistentResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -44332,7 +44399,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44347,7 +44414,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .create_persistent_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_persistent_resource`.
@@ -44366,7 +44433,7 @@ pub mod persistent_resource_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -44433,8 +44500,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePersistentResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePersistentResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44444,7 +44511,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::GetPersistentResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44475,7 +44542,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44485,7 +44552,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .get_persistent_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPersistentResourceRequest::name].
@@ -44498,8 +44565,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPersistentResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPersistentResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44509,8 +44576,8 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::ListPersistentResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -44546,7 +44613,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44556,15 +44623,15 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .list_persistent_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListPersistentResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -44573,17 +44640,17 @@ pub mod persistent_resource_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPersistentResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -44609,8 +44676,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPersistentResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPersistentResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44620,7 +44687,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::DeletePersistentResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -44654,7 +44721,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44669,7 +44736,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .delete_persistent_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_persistent_resource`.
@@ -44685,7 +44752,7 @@ pub mod persistent_resource_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -44722,8 +44789,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePersistentResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePersistentResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44733,7 +44800,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::UpdatePersistentResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -44767,7 +44834,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44782,7 +44849,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .update_persistent_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_persistent_resource`.
@@ -44801,7 +44868,7 @@ pub mod persistent_resource_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -44874,8 +44941,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePersistentResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePersistentResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44885,7 +44952,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::RebootPersistentResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -44919,7 +44986,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44934,7 +45001,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .reboot_persistent_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reboot_persistent_resource`.
@@ -44953,7 +45020,7 @@ pub mod persistent_resource_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -44990,8 +45057,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RebootPersistentResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RebootPersistentResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45001,8 +45068,8 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -45036,7 +45103,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45046,15 +45113,15 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -45063,17 +45130,17 @@ pub mod persistent_resource_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -45103,8 +45170,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45114,7 +45181,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45145,7 +45212,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45155,7 +45222,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -45166,8 +45233,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45177,7 +45244,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45208,7 +45275,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45218,7 +45285,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -45271,8 +45338,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45282,7 +45349,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45313,7 +45380,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45323,7 +45390,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -45354,8 +45421,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45365,7 +45432,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45398,7 +45465,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45408,7 +45475,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -45434,8 +45501,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45445,8 +45512,8 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -45482,7 +45549,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45492,15 +45559,15 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -45509,17 +45576,17 @@ pub mod persistent_resource_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -45555,8 +45622,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45566,7 +45633,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45597,7 +45664,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45607,7 +45674,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -45618,8 +45685,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45629,7 +45696,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45662,7 +45729,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45672,7 +45739,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -45683,8 +45750,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45694,7 +45761,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45727,7 +45794,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45737,7 +45804,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -45748,8 +45815,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45759,7 +45826,7 @@ pub mod persistent_resource_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::persistent_resource_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45790,7 +45857,7 @@ pub mod persistent_resource_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45800,7 +45867,7 @@ pub mod persistent_resource_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -45829,8 +45896,8 @@ pub mod persistent_resource_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45844,7 +45911,7 @@ pub mod pipeline_service {
     /// A builder for [PipelineService][crate::client::PipelineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::pipeline_service::ClientBuilder;
     /// # use client::PipelineService;
@@ -45854,19 +45921,18 @@ pub mod pipeline_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PipelineService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PipelineService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -45877,7 +45943,7 @@ pub mod pipeline_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PipelineService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -45890,7 +45956,7 @@ pub mod pipeline_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -45900,7 +45966,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::CreateTrainingPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45931,7 +45997,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45941,7 +46007,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .create_training_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTrainingPipelineRequest::parent].
@@ -45976,8 +46042,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTrainingPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTrainingPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45987,7 +46053,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::GetTrainingPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46018,7 +46084,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46028,7 +46094,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .get_training_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTrainingPipelineRequest::name].
@@ -46041,8 +46107,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTrainingPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTrainingPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46052,8 +46118,8 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::ListTrainingPipelines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -46087,7 +46153,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46097,14 +46163,16 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .list_training_pipelines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTrainingPipelinesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTrainingPipelinesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -46112,17 +46180,17 @@ pub mod pipeline_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTrainingPipelinesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -46172,8 +46240,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTrainingPipelines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTrainingPipelines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46183,7 +46251,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::DeleteTrainingPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -46215,7 +46283,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46230,7 +46298,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .delete_training_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_training_pipeline`.
@@ -46246,7 +46314,7 @@ pub mod pipeline_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -46283,8 +46351,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTrainingPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTrainingPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46294,7 +46362,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::CancelTrainingPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46325,7 +46393,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46335,7 +46403,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .cancel_training_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelTrainingPipelineRequest::name].
@@ -46348,8 +46416,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelTrainingPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelTrainingPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46359,7 +46427,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::CreatePipelineJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46390,7 +46458,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46400,7 +46468,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .create_pipeline_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePipelineJobRequest::parent].
@@ -46441,8 +46509,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePipelineJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePipelineJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46452,7 +46520,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::GetPipelineJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46480,7 +46548,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46490,7 +46558,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .get_pipeline_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPipelineJobRequest::name].
@@ -46503,8 +46571,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPipelineJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPipelineJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46514,8 +46582,8 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::ListPipelineJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -46549,7 +46617,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46559,14 +46627,16 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .list_pipeline_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPipelineJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPipelineJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -46574,15 +46644,17 @@ pub mod pipeline_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPipelineJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPipelineJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -46638,8 +46710,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPipelineJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPipelineJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46649,7 +46721,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::DeletePipelineJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -46681,7 +46753,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46696,7 +46768,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .delete_pipeline_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_pipeline_job`.
@@ -46712,7 +46784,7 @@ pub mod pipeline_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -46749,8 +46821,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePipelineJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePipelineJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46760,7 +46832,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::BatchDeletePipelineJobs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -46794,7 +46866,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46809,7 +46881,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .batch_delete_pipeline_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_delete_pipeline_jobs`.
@@ -46828,7 +46900,7 @@ pub mod pipeline_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -46878,8 +46950,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeletePipelineJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeletePipelineJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46889,7 +46961,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::CancelPipelineJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46920,7 +46992,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46930,7 +47002,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .cancel_pipeline_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelPipelineJobRequest::name].
@@ -46943,8 +47015,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelPipelineJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelPipelineJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46954,7 +47026,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::BatchCancelPipelineJobs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -46988,7 +47060,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47003,7 +47075,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .batch_cancel_pipeline_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_cancel_pipeline_jobs`.
@@ -47022,7 +47094,7 @@ pub mod pipeline_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -47072,8 +47144,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCancelPipelineJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCancelPipelineJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47083,8 +47155,8 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -47118,7 +47190,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47128,15 +47200,15 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -47145,17 +47217,17 @@ pub mod pipeline_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -47185,8 +47257,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47196,7 +47268,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47227,7 +47299,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47237,7 +47309,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -47248,8 +47320,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47259,7 +47331,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47290,7 +47362,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47300,7 +47372,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -47353,8 +47425,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47364,7 +47436,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47395,7 +47467,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47405,7 +47477,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -47436,8 +47508,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47447,7 +47519,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47480,7 +47552,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47490,7 +47562,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -47516,8 +47588,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47527,8 +47599,8 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -47564,7 +47636,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47574,15 +47646,15 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -47591,17 +47663,17 @@ pub mod pipeline_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -47637,8 +47709,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47648,7 +47720,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47679,7 +47751,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47689,7 +47761,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -47700,8 +47772,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47711,7 +47783,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47744,7 +47816,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47754,7 +47826,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -47765,8 +47837,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47776,7 +47848,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47809,7 +47881,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47819,7 +47891,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -47830,8 +47902,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47841,7 +47913,7 @@ pub mod pipeline_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::pipeline_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47872,7 +47944,7 @@ pub mod pipeline_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47882,7 +47954,7 @@ pub mod pipeline_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -47911,8 +47983,8 @@ pub mod pipeline_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47926,7 +47998,7 @@ pub mod prediction_service {
     /// A builder for [PredictionService][crate::client::PredictionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::prediction_service::ClientBuilder;
     /// # use client::PredictionService;
@@ -47936,19 +48008,18 @@ pub mod prediction_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PredictionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PredictionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -47959,7 +48030,7 @@ pub mod prediction_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PredictionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -47972,7 +48043,7 @@ pub mod prediction_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -47982,7 +48053,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::Predict;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48010,7 +48081,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48020,7 +48091,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .predict(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::PredictRequest::endpoint].
@@ -48075,8 +48146,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Predict {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Predict {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48086,7 +48157,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::RawPredict;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48114,7 +48185,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48124,7 +48195,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .raw_predict(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::RawPredictRequest::endpoint].
@@ -48155,8 +48226,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RawPredict {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RawPredict {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48166,7 +48237,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::DirectPredict;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48194,7 +48265,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48204,7 +48275,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .direct_predict(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::DirectPredictRequest::endpoint].
@@ -48246,8 +48317,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DirectPredict {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DirectPredict {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48257,7 +48328,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::DirectRawPredict;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48288,7 +48359,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48298,7 +48369,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .direct_raw_predict(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::DirectRawPredictRequest::endpoint].
@@ -48323,8 +48394,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DirectRawPredict {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DirectRawPredict {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48334,7 +48405,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::Explain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48362,7 +48433,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48372,7 +48443,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .explain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [endpoint][crate::model::ExplainRequest::endpoint].
@@ -48443,8 +48514,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Explain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Explain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48454,7 +48525,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::GenerateContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48482,7 +48553,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48492,7 +48563,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .generate_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model][crate::model::GenerateContentRequest::model].
@@ -48629,8 +48700,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48640,7 +48711,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::EmbedContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48668,7 +48739,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48678,7 +48749,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .embed_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model][crate::model::EmbedContentRequest::model].
@@ -48791,8 +48862,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EmbedContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EmbedContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48802,8 +48873,8 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -48837,7 +48908,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48847,15 +48918,15 @@ pub mod prediction_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -48864,17 +48935,17 @@ pub mod prediction_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -48904,8 +48975,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48915,7 +48986,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48946,7 +49017,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48956,7 +49027,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -48967,8 +49038,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48978,7 +49049,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49009,7 +49080,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49019,7 +49090,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -49072,8 +49143,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49083,7 +49154,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49114,7 +49185,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49124,7 +49195,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -49155,8 +49226,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49166,7 +49237,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49199,7 +49270,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49209,7 +49280,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -49235,8 +49306,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49246,8 +49317,8 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -49283,7 +49354,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49293,15 +49364,15 @@ pub mod prediction_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -49310,17 +49381,17 @@ pub mod prediction_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -49356,8 +49427,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49367,7 +49438,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49398,7 +49469,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49408,7 +49479,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -49419,8 +49490,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49430,7 +49501,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49463,7 +49534,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49473,7 +49544,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -49484,8 +49555,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49495,7 +49566,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49528,7 +49599,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49538,7 +49609,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -49549,8 +49620,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49560,7 +49631,7 @@ pub mod prediction_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::prediction_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49591,7 +49662,7 @@ pub mod prediction_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49601,7 +49672,7 @@ pub mod prediction_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -49630,8 +49701,8 @@ pub mod prediction_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49645,7 +49716,7 @@ pub mod reasoning_engine_execution_service {
     /// A builder for [ReasoningEngineExecutionService][crate::client::ReasoningEngineExecutionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::reasoning_engine_execution_service::ClientBuilder;
     /// # use client::ReasoningEngineExecutionService;
@@ -49655,19 +49726,18 @@ pub mod reasoning_engine_execution_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReasoningEngineExecutionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReasoningEngineExecutionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -49678,7 +49748,7 @@ pub mod reasoning_engine_execution_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReasoningEngineExecutionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -49691,7 +49761,7 @@ pub mod reasoning_engine_execution_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -49701,7 +49771,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::QueryReasoningEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49732,7 +49802,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49742,7 +49812,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .query_reasoning_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::QueryReasoningEngineRequest::name].
@@ -49779,8 +49849,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryReasoningEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryReasoningEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49790,8 +49860,8 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -49825,7 +49895,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49835,15 +49905,15 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -49852,17 +49922,17 @@ pub mod reasoning_engine_execution_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -49892,8 +49962,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49903,7 +49973,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49934,7 +50004,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49944,7 +50014,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -49955,8 +50025,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49966,7 +50036,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49997,7 +50067,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50007,7 +50077,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -50060,8 +50130,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50071,7 +50141,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50102,7 +50172,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50112,7 +50182,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -50143,8 +50213,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50154,7 +50224,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50187,7 +50257,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50197,7 +50267,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -50223,8 +50293,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50234,8 +50304,8 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -50271,7 +50341,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50281,15 +50351,15 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -50298,17 +50368,17 @@ pub mod reasoning_engine_execution_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -50344,8 +50414,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50355,7 +50425,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50386,7 +50456,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50396,7 +50466,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -50407,8 +50477,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50418,7 +50488,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50451,7 +50521,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50461,7 +50531,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -50472,8 +50542,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50483,7 +50553,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50516,7 +50586,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50526,7 +50596,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -50537,8 +50607,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50548,7 +50618,7 @@ pub mod reasoning_engine_execution_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_execution_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50579,7 +50649,7 @@ pub mod reasoning_engine_execution_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50589,7 +50659,7 @@ pub mod reasoning_engine_execution_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -50618,8 +50688,8 @@ pub mod reasoning_engine_execution_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50633,7 +50703,7 @@ pub mod reasoning_engine_service {
     /// A builder for [ReasoningEngineService][crate::client::ReasoningEngineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::reasoning_engine_service::ClientBuilder;
     /// # use client::ReasoningEngineService;
@@ -50643,19 +50713,18 @@ pub mod reasoning_engine_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReasoningEngineService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReasoningEngineService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -50666,7 +50735,7 @@ pub mod reasoning_engine_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReasoningEngineService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -50679,7 +50748,7 @@ pub mod reasoning_engine_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -50689,7 +50758,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::CreateReasoningEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -50721,7 +50790,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50736,7 +50805,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .create_reasoning_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_reasoning_engine`.
@@ -50755,7 +50824,7 @@ pub mod reasoning_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -50814,8 +50883,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReasoningEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReasoningEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50825,7 +50894,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::GetReasoningEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50856,7 +50925,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50866,7 +50935,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .get_reasoning_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReasoningEngineRequest::name].
@@ -50879,8 +50948,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReasoningEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReasoningEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50890,8 +50959,8 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::ListReasoningEngines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -50925,7 +50994,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50935,14 +51004,16 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .list_reasoning_engines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReasoningEnginesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReasoningEnginesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -50950,17 +51021,17 @@ pub mod reasoning_engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListReasoningEnginesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -50992,8 +51063,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReasoningEngines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReasoningEngines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51003,7 +51074,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::UpdateReasoningEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -51035,7 +51106,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51050,7 +51121,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .update_reasoning_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_reasoning_engine`.
@@ -51069,7 +51140,7 @@ pub mod reasoning_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -51138,8 +51209,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateReasoningEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateReasoningEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51149,7 +51220,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::DeleteReasoningEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -51181,7 +51252,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51196,7 +51267,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .delete_reasoning_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_reasoning_engine`.
@@ -51212,7 +51283,7 @@ pub mod reasoning_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -51255,8 +51326,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReasoningEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReasoningEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51266,8 +51337,8 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -51301,7 +51372,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51311,15 +51382,15 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -51328,17 +51399,17 @@ pub mod reasoning_engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -51368,8 +51439,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51379,7 +51450,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51410,7 +51481,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51420,7 +51491,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -51431,8 +51502,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51442,7 +51513,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51473,7 +51544,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51483,7 +51554,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -51536,8 +51607,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51547,7 +51618,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51578,7 +51649,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51588,7 +51659,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -51619,8 +51690,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51630,7 +51701,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51663,7 +51734,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51673,7 +51744,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -51699,8 +51770,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51710,8 +51781,8 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -51747,7 +51818,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51757,15 +51828,15 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -51774,17 +51845,17 @@ pub mod reasoning_engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -51820,8 +51891,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51831,7 +51902,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51862,7 +51933,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51872,7 +51943,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -51883,8 +51954,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51894,7 +51965,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51927,7 +51998,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51937,7 +52008,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -51948,8 +52019,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51959,7 +52030,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51992,7 +52063,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52002,7 +52073,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -52013,8 +52084,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52024,7 +52095,7 @@ pub mod reasoning_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::reasoning_engine_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52055,7 +52126,7 @@ pub mod reasoning_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52065,7 +52136,7 @@ pub mod reasoning_engine_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -52094,8 +52165,8 @@ pub mod reasoning_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52109,7 +52180,7 @@ pub mod schedule_service {
     /// A builder for [ScheduleService][crate::client::ScheduleService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::schedule_service::ClientBuilder;
     /// # use client::ScheduleService;
@@ -52119,19 +52190,18 @@ pub mod schedule_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ScheduleService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ScheduleService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -52142,7 +52212,7 @@ pub mod schedule_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ScheduleService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -52155,7 +52225,7 @@ pub mod schedule_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -52165,7 +52235,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::CreateSchedule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52193,7 +52263,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52203,7 +52273,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .create_schedule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateScheduleRequest::parent].
@@ -52238,8 +52308,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSchedule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSchedule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52249,7 +52319,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::DeleteSchedule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -52278,7 +52348,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52293,7 +52363,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .delete_schedule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_schedule`.
@@ -52309,7 +52379,7 @@ pub mod schedule_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -52346,8 +52416,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSchedule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSchedule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52357,7 +52427,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::GetSchedule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52385,7 +52455,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52395,7 +52465,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .get_schedule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetScheduleRequest::name].
@@ -52408,8 +52478,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchedule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchedule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52419,8 +52489,8 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::ListSchedules;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -52451,7 +52521,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52461,13 +52531,13 @@ pub mod schedule_service {
             (*self.0.stub)
                 .list_schedules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSchedulesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSchedulesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -52476,15 +52546,17 @@ pub mod schedule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSchedulesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSchedulesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -52522,8 +52594,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSchedules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSchedules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52533,7 +52605,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::PauseSchedule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52561,7 +52633,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52571,7 +52643,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .pause_schedule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::PauseScheduleRequest::name].
@@ -52584,8 +52656,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PauseSchedule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PauseSchedule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52595,7 +52667,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::ResumeSchedule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52623,7 +52695,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52633,7 +52705,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .resume_schedule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ResumeScheduleRequest::name].
@@ -52652,8 +52724,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeSchedule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeSchedule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52663,7 +52735,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::UpdateSchedule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52691,7 +52763,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52701,7 +52773,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .update_schedule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [schedule][crate::model::UpdateScheduleRequest::schedule].
@@ -52750,8 +52822,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSchedule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSchedule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52761,8 +52833,8 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -52796,7 +52868,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52806,15 +52878,15 @@ pub mod schedule_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -52823,17 +52895,17 @@ pub mod schedule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -52863,8 +52935,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52874,7 +52946,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52905,7 +52977,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52915,7 +52987,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -52926,8 +52998,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52937,7 +53009,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52968,7 +53040,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52978,7 +53050,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -53031,8 +53103,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53042,7 +53114,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53073,7 +53145,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53083,7 +53155,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -53114,8 +53186,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53125,7 +53197,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53158,7 +53230,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53168,7 +53240,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -53194,8 +53266,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53205,8 +53277,8 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -53242,7 +53314,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53252,15 +53324,15 @@ pub mod schedule_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -53269,17 +53341,17 @@ pub mod schedule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -53315,8 +53387,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53326,7 +53398,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53357,7 +53429,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53367,7 +53439,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -53378,8 +53450,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53389,7 +53461,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53422,7 +53494,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53432,7 +53504,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -53443,8 +53515,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53454,7 +53526,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53487,7 +53559,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53497,7 +53569,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -53508,8 +53580,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53519,7 +53591,7 @@ pub mod schedule_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::schedule_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53550,7 +53622,7 @@ pub mod schedule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53560,7 +53632,7 @@ pub mod schedule_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -53589,8 +53661,8 @@ pub mod schedule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53604,7 +53676,7 @@ pub mod specialist_pool_service {
     /// A builder for [SpecialistPoolService][crate::client::SpecialistPoolService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::specialist_pool_service::ClientBuilder;
     /// # use client::SpecialistPoolService;
@@ -53614,19 +53686,18 @@ pub mod specialist_pool_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SpecialistPoolService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SpecialistPoolService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53637,7 +53708,7 @@ pub mod specialist_pool_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SpecialistPoolService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -53650,7 +53721,7 @@ pub mod specialist_pool_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -53660,7 +53731,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::CreateSpecialistPool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -53692,7 +53763,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53707,7 +53778,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .create_specialist_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_specialist_pool`.
@@ -53726,7 +53797,7 @@ pub mod specialist_pool_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -53785,8 +53856,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSpecialistPool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSpecialistPool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53796,7 +53867,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::GetSpecialistPool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53827,7 +53898,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53837,7 +53908,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .get_specialist_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSpecialistPoolRequest::name].
@@ -53850,8 +53921,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSpecialistPool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSpecialistPool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53861,8 +53932,8 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::ListSpecialistPools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -53896,7 +53967,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53906,14 +53977,16 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .list_specialist_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSpecialistPoolsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSpecialistPoolsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -53921,17 +53994,17 @@ pub mod specialist_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSpecialistPoolsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -53975,8 +54048,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSpecialistPools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSpecialistPools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53986,7 +54059,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::DeleteSpecialistPool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -54018,7 +54091,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54033,7 +54106,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .delete_specialist_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_specialist_pool`.
@@ -54049,7 +54122,7 @@ pub mod specialist_pool_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -54092,8 +54165,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSpecialistPool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSpecialistPool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54103,7 +54176,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::UpdateSpecialistPool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -54135,7 +54208,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54150,7 +54223,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .update_specialist_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_specialist_pool`.
@@ -54169,7 +54242,7 @@ pub mod specialist_pool_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -54242,8 +54315,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSpecialistPool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSpecialistPool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54253,8 +54326,8 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -54288,7 +54361,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54298,15 +54371,15 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -54315,17 +54388,17 @@ pub mod specialist_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -54355,8 +54428,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54366,7 +54439,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54397,7 +54470,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54407,7 +54480,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -54418,8 +54491,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54429,7 +54502,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54460,7 +54533,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54470,7 +54543,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -54523,8 +54596,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54534,7 +54607,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54565,7 +54638,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54575,7 +54648,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -54606,8 +54679,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54617,7 +54690,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54650,7 +54723,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54660,7 +54733,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -54686,8 +54759,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54697,8 +54770,8 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -54734,7 +54807,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54744,15 +54817,15 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -54761,17 +54834,17 @@ pub mod specialist_pool_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -54807,8 +54880,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54818,7 +54891,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54849,7 +54922,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54859,7 +54932,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -54870,8 +54943,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54881,7 +54954,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54914,7 +54987,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54924,7 +54997,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -54935,8 +55008,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54946,7 +55019,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54979,7 +55052,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54989,7 +55062,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -55000,8 +55073,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55011,7 +55084,7 @@ pub mod specialist_pool_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::specialist_pool_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55042,7 +55115,7 @@ pub mod specialist_pool_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55052,7 +55125,7 @@ pub mod specialist_pool_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -55081,8 +55154,8 @@ pub mod specialist_pool_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55096,7 +55169,7 @@ pub mod tensorboard_service {
     /// A builder for [TensorboardService][crate::client::TensorboardService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::tensorboard_service::ClientBuilder;
     /// # use client::TensorboardService;
@@ -55106,19 +55179,18 @@ pub mod tensorboard_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TensorboardService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TensorboardService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -55129,7 +55201,7 @@ pub mod tensorboard_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TensorboardService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -55142,7 +55214,7 @@ pub mod tensorboard_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -55152,7 +55224,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::CreateTensorboard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -55184,7 +55256,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55199,7 +55271,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .create_tensorboard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_tensorboard`.
@@ -55218,7 +55290,7 @@ pub mod tensorboard_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -55277,8 +55349,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTensorboard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTensorboard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55288,7 +55360,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetTensorboard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55316,7 +55388,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55326,7 +55398,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_tensorboard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTensorboardRequest::name].
@@ -55339,8 +55411,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTensorboard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTensorboard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55350,7 +55422,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::UpdateTensorboard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -55382,7 +55454,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55397,7 +55469,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .update_tensorboard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_tensorboard`.
@@ -55416,7 +55488,7 @@ pub mod tensorboard_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -55489,8 +55561,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTensorboard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTensorboard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55500,8 +55572,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ListTensorboards;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -55535,7 +55607,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55545,14 +55617,16 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .list_tensorboards(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTensorboardsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTensorboardsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -55560,15 +55634,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTensorboardsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTensorboardsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -55624,8 +55700,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTensorboards {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTensorboards {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55635,7 +55711,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::DeleteTensorboard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -55667,7 +55743,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55682,7 +55758,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .delete_tensorboard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_tensorboard`.
@@ -55698,7 +55774,7 @@ pub mod tensorboard_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -55735,8 +55811,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTensorboard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTensorboard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55746,7 +55822,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ReadTensorboardUsage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55777,7 +55853,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55787,7 +55863,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .read_tensorboard_usage(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tensorboard][crate::model::ReadTensorboardUsageRequest::tensorboard].
@@ -55800,8 +55876,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadTensorboardUsage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadTensorboardUsage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55811,7 +55887,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ReadTensorboardSize;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55842,7 +55918,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55852,7 +55928,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .read_tensorboard_size(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tensorboard][crate::model::ReadTensorboardSizeRequest::tensorboard].
@@ -55865,8 +55941,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadTensorboardSize {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadTensorboardSize {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55876,7 +55952,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::CreateTensorboardExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55909,7 +55985,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55919,7 +55995,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .create_tensorboard_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTensorboardExperimentRequest::parent].
@@ -55958,8 +56034,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTensorboardExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTensorboardExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55969,7 +56045,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetTensorboardExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56002,7 +56078,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56012,7 +56088,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_tensorboard_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTensorboardExperimentRequest::name].
@@ -56025,8 +56101,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTensorboardExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTensorboardExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56036,7 +56112,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::UpdateTensorboardExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56069,7 +56145,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56079,7 +56155,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .update_tensorboard_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateTensorboardExperimentRequest::update_mask].
@@ -56128,8 +56204,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTensorboardExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTensorboardExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56139,8 +56215,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ListTensorboardExperiments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -56176,7 +56252,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56186,15 +56262,15 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .list_tensorboard_experiments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListTensorboardExperimentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -56203,17 +56279,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTensorboardExperimentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -56269,8 +56345,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTensorboardExperiments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTensorboardExperiments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56280,7 +56356,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::DeleteTensorboardExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -56314,7 +56390,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56329,7 +56405,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .delete_tensorboard_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_tensorboard_experiment`.
@@ -56345,7 +56421,7 @@ pub mod tensorboard_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -56382,8 +56458,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTensorboardExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTensorboardExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56393,7 +56469,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::CreateTensorboardRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56424,7 +56500,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56434,7 +56510,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .create_tensorboard_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTensorboardRunRequest::parent].
@@ -56477,8 +56553,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTensorboardRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTensorboardRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56488,7 +56564,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::BatchCreateTensorboardRuns;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56521,7 +56597,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56531,7 +56607,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .batch_create_tensorboard_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchCreateTensorboardRunsRequest::parent].
@@ -56557,8 +56633,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateTensorboardRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateTensorboardRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56568,7 +56644,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetTensorboardRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56599,7 +56675,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56609,7 +56685,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_tensorboard_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTensorboardRunRequest::name].
@@ -56622,8 +56698,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTensorboardRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTensorboardRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56633,7 +56709,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::UpdateTensorboardRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56664,7 +56740,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56674,7 +56750,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .update_tensorboard_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateTensorboardRunRequest::update_mask].
@@ -56723,8 +56799,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTensorboardRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTensorboardRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56734,8 +56810,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ListTensorboardRuns;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -56769,7 +56845,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56779,14 +56855,16 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .list_tensorboard_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTensorboardRunsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTensorboardRunsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -56794,17 +56872,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTensorboardRunsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -56860,8 +56938,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTensorboardRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTensorboardRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56871,7 +56949,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::DeleteTensorboardRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -56903,7 +56981,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56918,7 +56996,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .delete_tensorboard_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_tensorboard_run`.
@@ -56934,7 +57012,7 @@ pub mod tensorboard_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -56971,8 +57049,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTensorboardRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTensorboardRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56982,7 +57060,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::BatchCreateTensorboardTimeSeries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57015,7 +57093,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57025,7 +57103,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .batch_create_tensorboard_time_series(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchCreateTensorboardTimeSeriesRequest::parent].
@@ -57051,8 +57129,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateTensorboardTimeSeries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateTensorboardTimeSeries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57062,7 +57140,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::CreateTensorboardTimeSeries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57095,7 +57173,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57105,7 +57183,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .create_tensorboard_time_series(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTensorboardTimeSeriesRequest::parent].
@@ -57149,8 +57227,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTensorboardTimeSeries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTensorboardTimeSeries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57160,7 +57238,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetTensorboardTimeSeries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57193,7 +57271,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57203,7 +57281,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_tensorboard_time_series(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTensorboardTimeSeriesRequest::name].
@@ -57216,8 +57294,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTensorboardTimeSeries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTensorboardTimeSeries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57227,7 +57305,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::UpdateTensorboardTimeSeries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57260,7 +57338,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57270,7 +57348,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .update_tensorboard_time_series(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateTensorboardTimeSeriesRequest::update_mask].
@@ -57319,8 +57397,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTensorboardTimeSeries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTensorboardTimeSeries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57330,8 +57408,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ListTensorboardTimeSeries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -57367,7 +57445,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57377,15 +57455,15 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .list_tensorboard_time_series(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListTensorboardTimeSeriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -57394,17 +57472,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTensorboardTimeSeriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -57460,8 +57538,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTensorboardTimeSeries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTensorboardTimeSeries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57471,7 +57549,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::DeleteTensorboardTimeSeries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -57505,7 +57583,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57520,7 +57598,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .delete_tensorboard_time_series(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_tensorboard_time_series`.
@@ -57536,7 +57614,7 @@ pub mod tensorboard_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -57573,8 +57651,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTensorboardTimeSeries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTensorboardTimeSeries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57584,7 +57662,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::BatchReadTensorboardTimeSeriesData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57617,7 +57695,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57629,7 +57707,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .batch_read_tensorboard_time_series_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tensorboard][crate::model::BatchReadTensorboardTimeSeriesDataRequest::tensorboard].
@@ -57655,8 +57733,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchReadTensorboardTimeSeriesData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchReadTensorboardTimeSeriesData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57666,7 +57744,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ReadTensorboardTimeSeriesData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57699,7 +57777,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57709,7 +57787,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .read_tensorboard_time_series_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tensorboard_time_series][crate::model::ReadTensorboardTimeSeriesDataRequest::tensorboard_time_series].
@@ -57734,8 +57812,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadTensorboardTimeSeriesData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadTensorboardTimeSeriesData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57745,7 +57823,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::WriteTensorboardExperimentData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57778,7 +57856,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57788,7 +57866,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .write_tensorboard_experiment_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tensorboard_experiment][crate::model::WriteTensorboardExperimentDataRequest::tensorboard_experiment].
@@ -57814,8 +57892,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WriteTensorboardExperimentData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WriteTensorboardExperimentData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57825,7 +57903,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::WriteTensorboardRunData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57858,7 +57936,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57868,7 +57946,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .write_tensorboard_run_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tensorboard_run][crate::model::WriteTensorboardRunDataRequest::tensorboard_run].
@@ -57894,8 +57972,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WriteTensorboardRunData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WriteTensorboardRunData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57905,8 +57983,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ExportTensorboardTimeSeriesData;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -57942,7 +58020,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57952,15 +58030,15 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .export_tensorboard_time_series_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ExportTensorboardTimeSeriesDataResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -57969,17 +58047,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ExportTensorboardTimeSeriesDataResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -58017,8 +58095,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportTensorboardTimeSeriesData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportTensorboardTimeSeriesData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58028,8 +58106,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -58063,7 +58141,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58073,15 +58151,15 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -58090,17 +58168,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -58130,8 +58208,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58141,7 +58219,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58172,7 +58250,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58182,7 +58260,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -58193,8 +58271,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58204,7 +58282,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58235,7 +58313,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58245,7 +58323,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -58298,8 +58376,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58309,7 +58387,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58340,7 +58418,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58350,7 +58428,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -58381,8 +58459,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58392,7 +58470,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58425,7 +58503,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58435,7 +58513,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -58461,8 +58539,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58472,8 +58550,8 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -58509,7 +58587,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58519,15 +58597,15 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -58536,17 +58614,17 @@ pub mod tensorboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -58582,8 +58660,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58593,7 +58671,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58624,7 +58702,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58634,7 +58712,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -58645,8 +58723,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58656,7 +58734,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58689,7 +58767,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58699,7 +58777,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -58710,8 +58788,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58721,7 +58799,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58754,7 +58832,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58764,7 +58842,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -58775,8 +58853,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58786,7 +58864,7 @@ pub mod tensorboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::tensorboard_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58817,7 +58895,7 @@ pub mod tensorboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58827,7 +58905,7 @@ pub mod tensorboard_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -58856,8 +58934,8 @@ pub mod tensorboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58871,7 +58949,7 @@ pub mod vertex_rag_data_service {
     /// A builder for [VertexRagDataService][crate::client::VertexRagDataService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::vertex_rag_data_service::ClientBuilder;
     /// # use client::VertexRagDataService;
@@ -58881,19 +58959,18 @@ pub mod vertex_rag_data_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::VertexRagDataService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = VertexRagDataService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -58904,7 +58981,7 @@ pub mod vertex_rag_data_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::VertexRagDataService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -58917,7 +58994,7 @@ pub mod vertex_rag_data_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -58927,7 +59004,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::CreateRagCorpus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -58956,7 +59033,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58971,7 +59048,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .create_rag_corpus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_rag_corpus`.
@@ -58990,7 +59067,7 @@ pub mod vertex_rag_data_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -59049,8 +59126,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRagCorpus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRagCorpus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59060,7 +59137,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::UpdateRagCorpus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -59089,7 +59166,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59104,7 +59181,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .update_rag_corpus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_rag_corpus`.
@@ -59123,7 +59200,7 @@ pub mod vertex_rag_data_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -59174,8 +59251,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRagCorpus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRagCorpus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59185,7 +59262,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::GetRagCorpus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59213,7 +59290,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59223,7 +59300,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .get_rag_corpus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRagCorpusRequest::name].
@@ -59236,8 +59313,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRagCorpus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRagCorpus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59247,8 +59324,8 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::ListRagCorpora;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -59279,7 +59356,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59289,14 +59366,16 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .list_rag_corpora(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRagCorporaResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRagCorporaResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -59304,15 +59383,17 @@ pub mod vertex_rag_data_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRagCorporaResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRagCorporaResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -59338,8 +59419,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRagCorpora {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRagCorpora {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59349,7 +59430,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::DeleteRagCorpus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -59378,7 +59459,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59393,7 +59474,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .delete_rag_corpus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_rag_corpus`.
@@ -59409,7 +59490,7 @@ pub mod vertex_rag_data_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -59452,8 +59533,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRagCorpus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRagCorpus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59463,7 +59544,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::UploadRagFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59491,7 +59572,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59501,7 +59582,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .upload_rag_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::UploadRagFileRequest::parent].
@@ -59558,8 +59639,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UploadRagFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UploadRagFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59569,7 +59650,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::ImportRagFiles;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -59598,7 +59679,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59613,7 +59694,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .import_rag_files(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_rag_files`.
@@ -59632,7 +59713,7 @@ pub mod vertex_rag_data_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -59691,8 +59772,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportRagFiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportRagFiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59702,7 +59783,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::GetRagFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59730,7 +59811,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59740,7 +59821,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .get_rag_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRagFileRequest::name].
@@ -59753,8 +59834,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRagFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRagFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59764,8 +59845,8 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::ListRagFiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -59796,7 +59877,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59806,13 +59887,13 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .list_rag_files(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRagFilesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRagFilesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -59821,15 +59902,17 @@ pub mod vertex_rag_data_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRagFilesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRagFilesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -59855,8 +59938,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRagFiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRagFiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59866,7 +59949,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::DeleteRagFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -59895,7 +59978,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59910,7 +59993,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .delete_rag_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_rag_file`.
@@ -59926,7 +60009,7 @@ pub mod vertex_rag_data_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -59963,8 +60046,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRagFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRagFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59974,7 +60057,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::UpdateRagEngineConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -60006,7 +60089,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60021,7 +60104,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .update_rag_engine_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_rag_engine_config`.
@@ -60040,7 +60123,7 @@ pub mod vertex_rag_data_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -60091,8 +60174,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRagEngineConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRagEngineConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60102,7 +60185,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::GetRagEngineConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60133,7 +60216,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60143,7 +60226,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .get_rag_engine_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRagEngineConfigRequest::name].
@@ -60156,8 +60239,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRagEngineConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRagEngineConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60167,8 +60250,8 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -60202,7 +60285,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60212,15 +60295,15 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -60229,17 +60312,17 @@ pub mod vertex_rag_data_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -60269,8 +60352,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60280,7 +60363,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60311,7 +60394,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60321,7 +60404,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -60332,8 +60415,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60343,7 +60426,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60374,7 +60457,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60384,7 +60467,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -60437,8 +60520,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60448,7 +60531,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60479,7 +60562,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60489,7 +60572,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -60520,8 +60603,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60531,7 +60614,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60564,7 +60647,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60574,7 +60657,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -60600,8 +60683,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60611,8 +60694,8 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -60648,7 +60731,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60658,15 +60741,15 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -60675,17 +60758,17 @@ pub mod vertex_rag_data_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -60721,8 +60804,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60732,7 +60815,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60763,7 +60846,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60773,7 +60856,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -60784,8 +60867,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60795,7 +60878,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60828,7 +60911,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60838,7 +60921,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -60849,8 +60932,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60860,7 +60943,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60893,7 +60976,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60903,7 +60986,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -60914,8 +60997,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60925,7 +61008,7 @@ pub mod vertex_rag_data_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_data_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60956,7 +61039,7 @@ pub mod vertex_rag_data_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60966,7 +61049,7 @@ pub mod vertex_rag_data_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -60995,8 +61078,8 @@ pub mod vertex_rag_data_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61010,7 +61093,7 @@ pub mod vertex_rag_service {
     /// A builder for [VertexRagService][crate::client::VertexRagService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::vertex_rag_service::ClientBuilder;
     /// # use client::VertexRagService;
@@ -61020,19 +61103,18 @@ pub mod vertex_rag_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::VertexRagService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = VertexRagService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -61043,7 +61125,7 @@ pub mod vertex_rag_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::VertexRagService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -61056,7 +61138,7 @@ pub mod vertex_rag_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -61066,7 +61148,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::RetrieveContexts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61097,7 +61179,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61107,7 +61189,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .retrieve_contexts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::RetrieveContextsRequest::parent].
@@ -61173,8 +61255,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetrieveContexts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetrieveContexts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61184,7 +61266,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::AugmentPrompt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61212,7 +61294,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61222,7 +61304,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .augment_prompt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::AugmentPromptRequest::parent].
@@ -61293,8 +61375,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AugmentPrompt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AugmentPrompt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61304,7 +61386,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::CorroborateContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61335,7 +61417,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61345,7 +61427,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .corroborate_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CorroborateContentRequest::parent].
@@ -61405,8 +61487,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CorroborateContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CorroborateContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61416,8 +61498,8 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -61451,7 +61533,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61461,15 +61543,15 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -61478,17 +61560,17 @@ pub mod vertex_rag_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -61518,8 +61600,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61529,7 +61611,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61560,7 +61642,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61570,7 +61652,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -61581,8 +61663,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61592,7 +61674,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61623,7 +61705,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61633,7 +61715,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -61686,8 +61768,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61697,7 +61779,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61728,7 +61810,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61738,7 +61820,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -61769,8 +61851,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61780,7 +61862,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61813,7 +61895,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61823,7 +61905,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -61849,8 +61931,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61860,8 +61942,8 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -61897,7 +61979,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61907,15 +61989,15 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -61924,17 +62006,17 @@ pub mod vertex_rag_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -61970,8 +62052,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61981,7 +62063,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62012,7 +62094,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62022,7 +62104,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -62033,8 +62115,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62044,7 +62126,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62077,7 +62159,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62087,7 +62169,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -62098,8 +62180,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62109,7 +62191,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62142,7 +62224,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62152,7 +62234,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -62163,8 +62245,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62174,7 +62256,7 @@ pub mod vertex_rag_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vertex_rag_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62205,7 +62287,7 @@ pub mod vertex_rag_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62215,7 +62297,7 @@ pub mod vertex_rag_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -62244,8 +62326,8 @@ pub mod vertex_rag_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62259,7 +62341,7 @@ pub mod vizier_service {
     /// A builder for [VizierService][crate::client::VizierService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::*;
     /// # use builder::vizier_service::ClientBuilder;
     /// # use client::VizierService;
@@ -62269,19 +62351,18 @@ pub mod vizier_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::VizierService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = VizierService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -62292,7 +62373,7 @@ pub mod vizier_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::VizierService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -62305,7 +62386,7 @@ pub mod vizier_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -62315,7 +62396,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::CreateStudy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62343,7 +62424,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62353,7 +62434,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .create_study(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateStudyRequest::parent].
@@ -62388,8 +62469,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateStudy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateStudy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62399,7 +62480,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::GetStudy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62427,7 +62508,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62437,7 +62518,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .get_study(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetStudyRequest::name].
@@ -62450,8 +62531,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStudy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStudy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62461,8 +62542,8 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::ListStudies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -62493,7 +62574,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62503,13 +62584,13 @@ pub mod vizier_service {
             (*self.0.stub)
                 .list_studies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListStudiesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListStudiesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -62518,15 +62599,17 @@ pub mod vizier_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListStudiesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListStudiesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -62552,8 +62635,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListStudies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListStudies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62563,7 +62646,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::DeleteStudy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62591,7 +62674,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62601,7 +62684,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .delete_study(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteStudyRequest::name].
@@ -62614,8 +62697,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteStudy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteStudy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62625,7 +62708,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::LookupStudy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62653,7 +62736,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62663,7 +62746,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .lookup_study(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::LookupStudyRequest::parent].
@@ -62684,8 +62767,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupStudy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupStudy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62695,7 +62778,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::SuggestTrials;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -62724,7 +62807,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62739,7 +62822,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .suggest_trials(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `suggest_trials`.
@@ -62758,7 +62841,7 @@ pub mod vizier_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -62822,8 +62905,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuggestTrials {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuggestTrials {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62833,7 +62916,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::CreateTrial;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62861,7 +62944,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62871,7 +62954,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .create_trial(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTrialRequest::parent].
@@ -62906,8 +62989,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTrial {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTrial {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62917,7 +63000,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::GetTrial;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62945,7 +63028,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62955,7 +63038,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .get_trial(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTrialRequest::name].
@@ -62968,8 +63051,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTrial {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTrial {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62979,8 +63062,8 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::ListTrials;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -63011,7 +63094,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63021,13 +63104,13 @@ pub mod vizier_service {
             (*self.0.stub)
                 .list_trials(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTrialsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTrialsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -63036,15 +63119,17 @@ pub mod vizier_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTrialsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTrialsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -63070,8 +63155,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTrials {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTrials {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63081,7 +63166,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::AddTrialMeasurement;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63112,7 +63197,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63122,7 +63207,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .add_trial_measurement(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [trial_name][crate::model::AddTrialMeasurementRequest::trial_name].
@@ -63157,8 +63242,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddTrialMeasurement {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddTrialMeasurement {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63168,7 +63253,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::CompleteTrial;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63196,7 +63281,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63206,7 +63291,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .complete_trial(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CompleteTrialRequest::name].
@@ -63249,8 +63334,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CompleteTrial {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CompleteTrial {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63260,7 +63345,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::DeleteTrial;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63288,7 +63373,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63298,7 +63383,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .delete_trial(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTrialRequest::name].
@@ -63311,8 +63396,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTrial {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTrial {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63322,7 +63407,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::CheckTrialEarlyStoppingState;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -63356,7 +63441,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63371,7 +63456,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .check_trial_early_stopping_state(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `check_trial_early_stopping_state`.
@@ -63390,7 +63475,7 @@ pub mod vizier_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -63427,8 +63512,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CheckTrialEarlyStoppingState {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CheckTrialEarlyStoppingState {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63438,7 +63523,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::StopTrial;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63466,7 +63551,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63476,7 +63561,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .stop_trial(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::StopTrialRequest::name].
@@ -63489,8 +63574,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopTrial {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopTrial {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63500,7 +63585,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::ListOptimalTrials;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63531,7 +63616,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63541,7 +63626,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .list_optimal_trials(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListOptimalTrialsRequest::parent].
@@ -63554,8 +63639,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOptimalTrials {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOptimalTrials {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63565,8 +63650,8 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -63600,7 +63685,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63610,15 +63695,15 @@ pub mod vizier_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -63627,17 +63712,17 @@ pub mod vizier_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -63667,8 +63752,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63678,7 +63763,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63709,7 +63794,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63719,7 +63804,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -63730,8 +63815,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63741,7 +63826,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63772,7 +63857,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63782,7 +63867,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -63835,8 +63920,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63846,7 +63931,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63877,7 +63962,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63887,7 +63972,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -63918,8 +64003,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63929,7 +64014,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63962,7 +64047,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63972,7 +64057,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -63998,8 +64083,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64009,8 +64094,8 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -64046,7 +64131,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64056,15 +64141,15 @@ pub mod vizier_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -64073,17 +64158,17 @@ pub mod vizier_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -64119,8 +64204,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64130,7 +64215,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64161,7 +64246,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64171,7 +64256,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -64182,8 +64267,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64193,7 +64278,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64226,7 +64311,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64236,7 +64321,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -64247,8 +64332,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64258,7 +64343,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64291,7 +64376,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64301,7 +64386,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -64312,8 +64397,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64323,7 +64408,7 @@ pub mod vizier_service {
     /// # Example
     /// ```
     /// # use google_cloud_aiplatform_v1::builder::vizier_service::WaitOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_aiplatform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64354,7 +64439,7 @@ pub mod vizier_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64364,7 +64449,7 @@ pub mod vizier_service {
             (*self.0.stub)
                 .wait_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::WaitOperationRequest::name].
@@ -64393,8 +64478,8 @@ pub mod vizier_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WaitOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WaitOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/aiplatform/v1/src/client.rs b/src/generated/cloud/aiplatform/v1/src/client.rs
index 882fd4a3b0..f522b3e8e9 100644
--- a/src/generated/cloud/aiplatform/v1/src/client.rs
+++ b/src/generated/cloud/aiplatform/v1/src/client.rs
@@ -21,7 +21,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::DataFoundryService;
 /// let client = DataFoundryService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -70,15 +70,13 @@ impl DataFoundryService {
     /// Returns a builder for [DataFoundryService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::DataFoundryService;
     /// let client = DataFoundryService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_foundry_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_foundry_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_foundry_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -96,14 +94,14 @@ impl DataFoundryService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataFoundryService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataFoundryService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -113,13 +111,13 @@ impl DataFoundryService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataFoundryService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataFoundryService> {
         super::transport::DataFoundryService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataFoundryService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataFoundryService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataFoundryService::new)
@@ -208,7 +206,7 @@ impl DataFoundryService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::DatasetService;
 /// let client = DatasetService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -257,13 +255,13 @@ impl DatasetService {
     /// Returns a builder for [DatasetService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::DatasetService;
     /// let client = DatasetService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dataset_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::dataset_service::client::Factory)
+        crate::new_client_builder(super::builder::dataset_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -281,14 +279,14 @@ impl DatasetService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DatasetService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DatasetService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -297,13 +295,13 @@ impl DatasetService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DatasetService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DatasetService> {
         super::transport::DatasetService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DatasetService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DatasetService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DatasetService::new)
@@ -562,7 +560,7 @@ impl DatasetService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::DeploymentResourcePoolService;
 /// let client = DeploymentResourcePoolService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -611,15 +609,13 @@ impl DeploymentResourcePoolService {
     /// Returns a builder for [DeploymentResourcePoolService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::DeploymentResourcePoolService;
     /// let client = DeploymentResourcePoolService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::deployment_resource_pool_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::deployment_resource_pool_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::deployment_resource_pool_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -637,14 +633,14 @@ impl DeploymentResourcePoolService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::DeploymentResourcePoolService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -655,13 +651,13 @@ impl DeploymentResourcePoolService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DeploymentResourcePoolService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DeploymentResourcePoolService> {
         super::transport::DeploymentResourcePoolService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DeploymentResourcePoolService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DeploymentResourcePoolService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DeploymentResourcePoolService::new)
@@ -841,7 +837,7 @@ impl DeploymentResourcePoolService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::EndpointService;
 /// let client = EndpointService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -890,15 +886,13 @@ impl EndpointService {
     /// Returns a builder for [EndpointService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::EndpointService;
     /// let client = EndpointService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::endpoint_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::endpoint_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::endpoint_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -916,15 +910,14 @@ impl EndpointService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EndpointService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EndpointService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -933,13 +926,13 @@ impl EndpointService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EndpointService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EndpointService> {
         super::transport::EndpointService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EndpointService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EndpointService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EndpointService::new)
@@ -1132,7 +1125,7 @@ impl EndpointService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::EvaluationService;
 /// let client = EvaluationService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -1181,15 +1174,13 @@ impl EvaluationService {
     /// Returns a builder for [EvaluationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::EvaluationService;
     /// let client = EvaluationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::evaluation_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::evaluation_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::evaluation_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1207,14 +1198,14 @@ impl EvaluationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EvaluationService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EvaluationService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1224,13 +1215,13 @@ impl EvaluationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EvaluationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EvaluationService> {
         super::transport::EvaluationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EvaluationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EvaluationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EvaluationService::new)
@@ -1317,7 +1308,7 @@ impl EvaluationService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::FeatureOnlineStoreAdminService;
 /// let client = FeatureOnlineStoreAdminService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -1367,13 +1358,13 @@ impl FeatureOnlineStoreAdminService {
     /// Returns a builder for [FeatureOnlineStoreAdminService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::FeatureOnlineStoreAdminService;
     /// let client = FeatureOnlineStoreAdminService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::feature_online_store_admin_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::feature_online_store_admin_service::client::Factory,
         )
     }
@@ -1393,14 +1384,14 @@ impl FeatureOnlineStoreAdminService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::FeatureOnlineStoreAdminService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1411,13 +1402,13 @@ impl FeatureOnlineStoreAdminService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeatureOnlineStoreAdminService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeatureOnlineStoreAdminService> {
         super::transport::FeatureOnlineStoreAdminService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeatureOnlineStoreAdminService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeatureOnlineStoreAdminService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FeatureOnlineStoreAdminService::new)
@@ -1693,7 +1684,7 @@ impl FeatureOnlineStoreAdminService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::FeatureOnlineStoreService;
 /// let client = FeatureOnlineStoreService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -1742,15 +1733,13 @@ impl FeatureOnlineStoreService {
     /// Returns a builder for [FeatureOnlineStoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::FeatureOnlineStoreService;
     /// let client = FeatureOnlineStoreService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::feature_online_store_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::feature_online_store_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::feature_online_store_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1768,14 +1757,14 @@ impl FeatureOnlineStoreService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::FeatureOnlineStoreService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1786,13 +1775,13 @@ impl FeatureOnlineStoreService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeatureOnlineStoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeatureOnlineStoreService> {
         super::transport::FeatureOnlineStoreService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeatureOnlineStoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeatureOnlineStoreService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FeatureOnlineStoreService::new)
@@ -1906,7 +1895,7 @@ impl FeatureOnlineStoreService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::FeatureRegistryService;
 /// let client = FeatureRegistryService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -1956,15 +1945,13 @@ impl FeatureRegistryService {
     /// Returns a builder for [FeatureRegistryService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::FeatureRegistryService;
     /// let client = FeatureRegistryService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::feature_registry_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::feature_registry_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::feature_registry_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1982,14 +1969,14 @@ impl FeatureRegistryService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::FeatureRegistryService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::FeatureRegistryService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1999,13 +1986,13 @@ impl FeatureRegistryService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeatureRegistryService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeatureRegistryService> {
         super::transport::FeatureRegistryService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeatureRegistryService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeatureRegistryService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FeatureRegistryService::new)
@@ -2224,7 +2211,7 @@ impl FeatureRegistryService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::FeaturestoreOnlineServingService;
 /// let client = FeaturestoreOnlineServingService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -2273,13 +2260,13 @@ impl FeaturestoreOnlineServingService {
     /// Returns a builder for [FeaturestoreOnlineServingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::FeaturestoreOnlineServingService;
     /// let client = FeaturestoreOnlineServingService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::featurestore_online_serving_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::featurestore_online_serving_service::client::Factory,
         )
     }
@@ -2299,14 +2286,14 @@ impl FeaturestoreOnlineServingService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::FeaturestoreOnlineServingService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -2317,13 +2304,13 @@ impl FeaturestoreOnlineServingService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeaturestoreOnlineServingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeaturestoreOnlineServingService> {
         super::transport::FeaturestoreOnlineServingService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeaturestoreOnlineServingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeaturestoreOnlineServingService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FeaturestoreOnlineServingService::new)
@@ -2453,7 +2440,7 @@ impl FeaturestoreOnlineServingService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::FeaturestoreService;
 /// let client = FeaturestoreService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -2502,15 +2489,13 @@ impl FeaturestoreService {
     /// Returns a builder for [FeaturestoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::FeaturestoreService;
     /// let client = FeaturestoreService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::featurestore_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::featurestore_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::featurestore_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2528,14 +2513,14 @@ impl FeaturestoreService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::FeaturestoreService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::FeaturestoreService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2545,13 +2530,13 @@ impl FeaturestoreService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeaturestoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeaturestoreService> {
         super::transport::FeaturestoreService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FeaturestoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FeaturestoreService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FeaturestoreService::new)
@@ -2903,7 +2888,7 @@ impl FeaturestoreService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::GenAiCacheService;
 /// let client = GenAiCacheService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -2952,15 +2937,13 @@ impl GenAiCacheService {
     /// Returns a builder for [GenAiCacheService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::GenAiCacheService;
     /// let client = GenAiCacheService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::gen_ai_cache_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::gen_ai_cache_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::gen_ai_cache_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2978,14 +2961,14 @@ impl GenAiCacheService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GenAiCacheService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GenAiCacheService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2995,13 +2978,13 @@ impl GenAiCacheService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GenAiCacheService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GenAiCacheService> {
         super::transport::GenAiCacheService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GenAiCacheService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GenAiCacheService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GenAiCacheService::new)
@@ -3115,7 +3098,7 @@ impl GenAiCacheService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::GenAiTuningService;
 /// let client = GenAiTuningService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -3164,15 +3147,13 @@ impl GenAiTuningService {
     /// Returns a builder for [GenAiTuningService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::GenAiTuningService;
     /// let client = GenAiTuningService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::gen_ai_tuning_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::gen_ai_tuning_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::gen_ai_tuning_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3190,14 +3171,14 @@ impl GenAiTuningService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GenAiTuningService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GenAiTuningService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3207,13 +3188,13 @@ impl GenAiTuningService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GenAiTuningService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GenAiTuningService> {
         super::transport::GenAiTuningService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GenAiTuningService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GenAiTuningService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GenAiTuningService::new)
@@ -3349,7 +3330,7 @@ impl GenAiTuningService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::IndexEndpointService;
 /// let client = IndexEndpointService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -3398,15 +3379,13 @@ impl IndexEndpointService {
     /// Returns a builder for [IndexEndpointService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::IndexEndpointService;
     /// let client = IndexEndpointService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::index_endpoint_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::index_endpoint_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::index_endpoint_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3424,14 +3403,14 @@ impl IndexEndpointService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::IndexEndpointService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::IndexEndpointService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3441,13 +3420,13 @@ impl IndexEndpointService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IndexEndpointService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IndexEndpointService> {
         super::transport::IndexEndpointService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IndexEndpointService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IndexEndpointService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::IndexEndpointService::new)
@@ -3634,7 +3613,7 @@ impl IndexEndpointService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::IndexService;
 /// let client = IndexService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -3683,13 +3662,13 @@ impl IndexService {
     /// Returns a builder for [IndexService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::IndexService;
     /// let client = IndexService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::index_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::index_service::client::Factory)
+        crate::new_client_builder(super::builder::index_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3707,14 +3686,14 @@ impl IndexService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::IndexService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::IndexService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3723,13 +3702,13 @@ impl IndexService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IndexService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IndexService> {
         super::transport::IndexService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IndexService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IndexService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::IndexService::new)
@@ -3881,7 +3860,7 @@ impl IndexService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::JobService;
 /// let client = JobService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -3930,13 +3909,13 @@ impl JobService {
     /// Returns a builder for [JobService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::JobService;
     /// let client = JobService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::job_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::job_service::client::Factory)
+        crate::new_client_builder(super::builder::job_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3954,14 +3933,14 @@ impl JobService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::JobService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::JobService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3970,13 +3949,13 @@ impl JobService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::JobService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::JobService> {
         super::transport::JobService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::JobService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::JobService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::JobService::new)
@@ -4416,7 +4395,7 @@ impl JobService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::LlmUtilityService;
 /// let client = LlmUtilityService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -4465,15 +4444,13 @@ impl LlmUtilityService {
     /// Returns a builder for [LlmUtilityService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::LlmUtilityService;
     /// let client = LlmUtilityService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::llm_utility_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::llm_utility_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::llm_utility_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4491,14 +4468,14 @@ impl LlmUtilityService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::LlmUtilityService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::LlmUtilityService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -4508,13 +4485,13 @@ impl LlmUtilityService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LlmUtilityService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LlmUtilityService> {
         super::transport::LlmUtilityService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LlmUtilityService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LlmUtilityService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::LlmUtilityService::new)
@@ -4606,7 +4583,7 @@ impl LlmUtilityService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::MatchService;
 /// let client = MatchService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -4656,13 +4633,13 @@ impl MatchService {
     /// Returns a builder for [MatchService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::MatchService;
     /// let client = MatchService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::match_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::match_service::client::Factory)
+        crate::new_client_builder(super::builder::match_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4680,14 +4657,14 @@ impl MatchService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MatchService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MatchService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4696,13 +4673,13 @@ impl MatchService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MatchService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MatchService> {
         super::transport::MatchService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MatchService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MatchService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MatchService::new)
@@ -4795,7 +4772,7 @@ impl MatchService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::MetadataService;
 /// let client = MetadataService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -4844,15 +4821,13 @@ impl MetadataService {
     /// Returns a builder for [MetadataService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::MetadataService;
     /// let client = MetadataService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::metadata_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::metadata_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::metadata_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4870,15 +4845,14 @@ impl MetadataService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MetadataService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MetadataService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4887,13 +4861,13 @@ impl MetadataService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MetadataService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MetadataService> {
         super::transport::MetadataService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MetadataService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MetadataService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MetadataService::new)
@@ -5241,7 +5215,7 @@ impl MetadataService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::MigrationService;
 /// let client = MigrationService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -5291,15 +5265,13 @@ impl MigrationService {
     /// Returns a builder for [MigrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::MigrationService;
     /// let client = MigrationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::migration_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::migration_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::migration_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5317,14 +5289,14 @@ impl MigrationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MigrationService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MigrationService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -5334,13 +5306,13 @@ impl MigrationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MigrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MigrationService> {
         super::transport::MigrationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MigrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MigrationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MigrationService::new)
@@ -5449,7 +5421,7 @@ impl MigrationService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::ModelGardenService;
 /// let client = ModelGardenService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -5498,15 +5470,13 @@ impl ModelGardenService {
     /// Returns a builder for [ModelGardenService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::ModelGardenService;
     /// let client = ModelGardenService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::model_garden_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::model_garden_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::model_garden_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5524,14 +5494,14 @@ impl ModelGardenService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ModelGardenService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ModelGardenService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -5541,13 +5511,13 @@ impl ModelGardenService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelGardenService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelGardenService> {
         super::transport::ModelGardenService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelGardenService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelGardenService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ModelGardenService::new)
@@ -5649,7 +5619,7 @@ impl ModelGardenService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::ModelService;
 /// let client = ModelService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -5698,13 +5668,13 @@ impl ModelService {
     /// Returns a builder for [ModelService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::ModelService;
     /// let client = ModelService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::model_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::model_service::client::Factory)
+        crate::new_client_builder(super::builder::model_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5722,14 +5692,14 @@ impl ModelService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ModelService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ModelService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -5738,13 +5708,13 @@ impl ModelService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelService> {
         super::transport::ModelService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ModelService::new)
@@ -6025,7 +5995,7 @@ impl ModelService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::NotebookService;
 /// let client = NotebookService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -6074,15 +6044,13 @@ impl NotebookService {
     /// Returns a builder for [NotebookService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::NotebookService;
     /// let client = NotebookService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::notebook_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::notebook_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::notebook_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6100,15 +6068,14 @@ impl NotebookService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NotebookService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NotebookService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -6117,13 +6084,13 @@ impl NotebookService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NotebookService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NotebookService> {
         super::transport::NotebookService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NotebookService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NotebookService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NotebookService::new)
@@ -6400,7 +6367,7 @@ impl NotebookService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::PersistentResourceService;
 /// let client = PersistentResourceService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -6449,15 +6416,13 @@ impl PersistentResourceService {
     /// Returns a builder for [PersistentResourceService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::PersistentResourceService;
     /// let client = PersistentResourceService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::persistent_resource_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::persistent_resource_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::persistent_resource_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6475,14 +6440,14 @@ impl PersistentResourceService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::PersistentResourceService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -6493,13 +6458,13 @@ impl PersistentResourceService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PersistentResourceService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PersistentResourceService> {
         super::transport::PersistentResourceService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PersistentResourceService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PersistentResourceService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PersistentResourceService::new)
@@ -6675,7 +6640,7 @@ impl PersistentResourceService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::PipelineService;
 /// let client = PipelineService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -6726,15 +6691,13 @@ impl PipelineService {
     /// Returns a builder for [PipelineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::PipelineService;
     /// let client = PipelineService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::pipeline_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::pipeline_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::pipeline_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6752,15 +6715,14 @@ impl PipelineService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::PipelineService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::PipelineService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -6769,13 +6731,13 @@ impl PipelineService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PipelineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PipelineService> {
         super::transport::PipelineService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PipelineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PipelineService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PipelineService::new)
@@ -7013,7 +6975,7 @@ impl PipelineService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::PredictionService;
 /// let client = PredictionService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -7062,15 +7024,13 @@ impl PredictionService {
     /// Returns a builder for [PredictionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::PredictionService;
     /// let client = PredictionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::prediction_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::prediction_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::prediction_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7088,14 +7048,14 @@ impl PredictionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::PredictionService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::PredictionService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -7105,13 +7065,13 @@ impl PredictionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PredictionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PredictionService> {
         super::transport::PredictionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PredictionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PredictionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PredictionService::new)
@@ -7257,7 +7217,7 @@ impl PredictionService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::ReasoningEngineExecutionService;
 /// let client = ReasoningEngineExecutionService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -7306,13 +7266,13 @@ impl ReasoningEngineExecutionService {
     /// Returns a builder for [ReasoningEngineExecutionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::ReasoningEngineExecutionService;
     /// let client = ReasoningEngineExecutionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reasoning_engine_execution_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::reasoning_engine_execution_service::client::Factory,
         )
     }
@@ -7332,14 +7292,14 @@ impl ReasoningEngineExecutionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::ReasoningEngineExecutionService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -7350,13 +7310,13 @@ impl ReasoningEngineExecutionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReasoningEngineExecutionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReasoningEngineExecutionService> {
         super::transport::ReasoningEngineExecutionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReasoningEngineExecutionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReasoningEngineExecutionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReasoningEngineExecutionService::new)
@@ -7467,7 +7427,7 @@ impl ReasoningEngineExecutionService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::ReasoningEngineService;
 /// let client = ReasoningEngineService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -7516,15 +7476,13 @@ impl ReasoningEngineService {
     /// Returns a builder for [ReasoningEngineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::ReasoningEngineService;
     /// let client = ReasoningEngineService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reasoning_engine_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::reasoning_engine_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::reasoning_engine_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7542,14 +7500,14 @@ impl ReasoningEngineService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ReasoningEngineService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ReasoningEngineService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -7559,13 +7517,13 @@ impl ReasoningEngineService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReasoningEngineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReasoningEngineService> {
         super::transport::ReasoningEngineService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReasoningEngineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReasoningEngineService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReasoningEngineService::new)
@@ -7714,7 +7672,7 @@ impl ReasoningEngineService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::ScheduleService;
 /// let client = ScheduleService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -7764,15 +7722,13 @@ impl ScheduleService {
     /// Returns a builder for [ScheduleService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::ScheduleService;
     /// let client = ScheduleService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::schedule_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::schedule_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::schedule_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7790,15 +7746,14 @@ impl ScheduleService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ScheduleService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ScheduleService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -7807,13 +7762,13 @@ impl ScheduleService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ScheduleService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ScheduleService> {
         super::transport::ScheduleService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ScheduleService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ScheduleService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ScheduleService::new)
@@ -7962,7 +7917,7 @@ impl ScheduleService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::SpecialistPoolService;
 /// let client = SpecialistPoolService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -8016,15 +7971,13 @@ impl SpecialistPoolService {
     /// Returns a builder for [SpecialistPoolService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::SpecialistPoolService;
     /// let client = SpecialistPoolService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::specialist_pool_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::specialist_pool_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::specialist_pool_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8042,14 +7995,14 @@ impl SpecialistPoolService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SpecialistPoolService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SpecialistPoolService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -8059,13 +8012,13 @@ impl SpecialistPoolService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SpecialistPoolService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SpecialistPoolService> {
         super::transport::SpecialistPoolService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SpecialistPoolService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SpecialistPoolService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SpecialistPoolService::new)
@@ -8214,7 +8167,7 @@ impl SpecialistPoolService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::TensorboardService;
 /// let client = TensorboardService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -8263,15 +8216,13 @@ impl TensorboardService {
     /// Returns a builder for [TensorboardService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::TensorboardService;
     /// let client = TensorboardService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::tensorboard_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::tensorboard_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::tensorboard_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8289,14 +8240,14 @@ impl TensorboardService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TensorboardService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TensorboardService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -8306,13 +8257,13 @@ impl TensorboardService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TensorboardService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TensorboardService> {
         super::transport::TensorboardService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TensorboardService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TensorboardService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TensorboardService::new)
@@ -8662,7 +8613,7 @@ impl TensorboardService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::VertexRagDataService;
 /// let client = VertexRagDataService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -8711,15 +8662,13 @@ impl VertexRagDataService {
     /// Returns a builder for [VertexRagDataService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::VertexRagDataService;
     /// let client = VertexRagDataService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::vertex_rag_data_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::vertex_rag_data_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::vertex_rag_data_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8737,14 +8686,14 @@ impl VertexRagDataService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::VertexRagDataService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::VertexRagDataService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -8754,13 +8703,13 @@ impl VertexRagDataService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VertexRagDataService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VertexRagDataService> {
         super::transport::VertexRagDataService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VertexRagDataService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VertexRagDataService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::VertexRagDataService::new)
@@ -8968,7 +8917,7 @@ impl VertexRagDataService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::VertexRagService;
 /// let client = VertexRagService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -9017,15 +8966,13 @@ impl VertexRagService {
     /// Returns a builder for [VertexRagService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::VertexRagService;
     /// let client = VertexRagService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::vertex_rag_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::vertex_rag_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::vertex_rag_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9043,14 +8990,14 @@ impl VertexRagService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::VertexRagService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::VertexRagService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -9060,13 +9007,13 @@ impl VertexRagService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VertexRagService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VertexRagService> {
         super::transport::VertexRagService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VertexRagService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VertexRagService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::VertexRagService::new)
@@ -9166,7 +9113,7 @@ impl VertexRagService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_aiplatform_v1::client::VizierService;
 /// let client = VizierService::builder().build().await?;
 /// // use `client` to make requests to the Vertex AI API.
@@ -9219,13 +9166,13 @@ impl VizierService {
     /// Returns a builder for [VizierService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_aiplatform_v1::client::VizierService;
     /// let client = VizierService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::vizier_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::vizier_service::client::Factory)
+        crate::new_client_builder(super::builder::vizier_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9243,14 +9190,14 @@ impl VizierService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::VizierService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::VizierService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -9259,13 +9206,13 @@ impl VizierService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VizierService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VizierService> {
         super::transport::VizierService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VizierService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VizierService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::VizierService::new)
diff --git a/src/generated/cloud/aiplatform/v1/src/lib.rs b/src/generated/cloud/aiplatform/v1/src/lib.rs
index 527d284b45..14f73b56f8 100644
--- a/src/generated/cloud/aiplatform/v1/src/lib.rs
+++ b/src/generated/cloud/aiplatform/v1/src/lib.rs
@@ -88,8 +88,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -194,3 +194,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/aiplatform/v1/src/model.rs b/src/generated/cloud/aiplatform/v1/src/model.rs
index 132d406260..480e2f4b2e 100644
--- a/src/generated/cloud/aiplatform/v1/src/model.rs
+++ b/src/generated/cloud/aiplatform/v1/src/model.rs
@@ -20,9 +20,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -17026,7 +17026,7 @@ impl wkt::message::Message for ListDatasetsResponse {
 
 #[cfg(feature = "dataset-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDatasetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDatasetsResponse {
     type PageItem = crate::model::Dataset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17946,7 +17946,7 @@ impl wkt::message::Message for ListDatasetVersionsResponse {
 
 #[cfg(feature = "dataset-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDatasetVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDatasetVersionsResponse {
     type PageItem = crate::model::DatasetVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -18268,7 +18268,7 @@ impl wkt::message::Message for ListDataItemsResponse {
 
 #[cfg(feature = "dataset-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataItemsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataItemsResponse {
     type PageItem = crate::model::DataItem;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -18806,7 +18806,7 @@ impl wkt::message::Message for SearchDataItemsResponse {
 
 #[cfg(feature = "dataset-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchDataItemsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchDataItemsResponse {
     type PageItem = crate::model::DataItemView;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -19130,7 +19130,7 @@ impl wkt::message::Message for ListSavedQueriesResponse {
 
 #[cfg(feature = "dataset-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSavedQueriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSavedQueriesResponse {
     type PageItem = crate::model::SavedQuery;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -19469,7 +19469,7 @@ impl wkt::message::Message for ListAnnotationsResponse {
 
 #[cfg(feature = "dataset-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAnnotationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAnnotationsResponse {
     type PageItem = crate::model::Annotation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -20422,7 +20422,9 @@ impl wkt::message::Message for ListDeploymentResourcePoolsResponse {
 
 #[cfg(feature = "deployment-resource-pool-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeploymentResourcePoolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListDeploymentResourcePoolsResponse
+{
     type PageItem = crate::model::DeploymentResourcePool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -20833,7 +20835,7 @@ impl wkt::message::Message for QueryDeployedModelsResponse {
 
 #[cfg(feature = "deployment-resource-pool-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for QueryDeployedModelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for QueryDeployedModelsResponse {
     type PageItem = crate::model::DeployedModel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23504,7 +23506,7 @@ impl wkt::message::Message for ListEndpointsResponse {
 
 #[cfg(feature = "endpoint-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEndpointsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEndpointsResponse {
     type PageItem = crate::model::Endpoint;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -47836,7 +47838,7 @@ impl wkt::message::Message for ListFeatureOnlineStoresResponse {
 
 #[cfg(feature = "feature-online-store-admin-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeatureOnlineStoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeatureOnlineStoresResponse {
     type PageItem = crate::model::FeatureOnlineStore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -48391,7 +48393,7 @@ impl wkt::message::Message for ListFeatureViewsResponse {
 
 #[cfg(feature = "feature-online-store-admin-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeatureViewsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeatureViewsResponse {
     type PageItem = crate::model::FeatureView;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -49122,7 +49124,7 @@ impl wkt::message::Message for ListFeatureViewSyncsResponse {
 
 #[cfg(feature = "feature-online-store-admin-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeatureViewSyncsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeatureViewSyncsResponse {
     type PageItem = crate::model::FeatureViewSync;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -51889,7 +51891,7 @@ impl wkt::message::Message for ListFeatureGroupsResponse {
 
 #[cfg(feature = "feature-registry-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeatureGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeatureGroupsResponse {
     type PageItem = crate::model::FeatureGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -57932,7 +57934,7 @@ impl wkt::message::Message for ListFeaturestoresResponse {
 
 #[cfg(feature = "featurestore-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeaturestoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeaturestoresResponse {
     type PageItem = crate::model::Featurestore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -60338,7 +60340,7 @@ impl wkt::message::Message for ListEntityTypesResponse {
 
 #[cfg(feature = "featurestore-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntityTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntityTypesResponse {
     type PageItem = crate::model::EntityType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -61086,7 +61088,7 @@ impl wkt::message::Message for ListFeaturesResponse {
 
 #[cfg(any(feature = "feature-registry-service", feature = "featurestore-service",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeaturesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeaturesResponse {
     type PageItem = crate::model::Feature;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -61335,7 +61337,7 @@ impl wkt::message::Message for SearchFeaturesResponse {
 
 #[cfg(feature = "featurestore-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchFeaturesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchFeaturesResponse {
     type PageItem = crate::model::Feature;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -63327,7 +63329,7 @@ impl wkt::message::Message for ListCachedContentsResponse {
 
 #[cfg(feature = "gen-ai-cache-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCachedContentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCachedContentsResponse {
     type PageItem = crate::model::CachedContent;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -63621,7 +63623,7 @@ impl wkt::message::Message for ListTuningJobsResponse {
 
 #[cfg(feature = "gen-ai-tuning-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTuningJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTuningJobsResponse {
     type PageItem = crate::model::TuningJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -67530,7 +67532,7 @@ impl wkt::message::Message for ListIndexEndpointsResponse {
 
 #[cfg(feature = "index-endpoint-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIndexEndpointsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIndexEndpointsResponse {
     type PageItem = crate::model::IndexEndpoint;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -68697,7 +68699,7 @@ impl wkt::message::Message for ListIndexesResponse {
 
 #[cfg(feature = "index-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIndexesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIndexesResponse {
     type PageItem = crate::model::Index;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -71777,7 +71779,7 @@ impl wkt::message::Message for ListCustomJobsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCustomJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCustomJobsResponse {
     type PageItem = crate::model::CustomJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -72222,7 +72224,7 @@ impl wkt::message::Message for ListDataLabelingJobsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataLabelingJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataLabelingJobsResponse {
     type PageItem = crate::model::DataLabelingJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -72665,7 +72667,9 @@ impl wkt::message::Message for ListHyperparameterTuningJobsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListHyperparameterTuningJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListHyperparameterTuningJobsResponse
+{
     type PageItem = crate::model::HyperparameterTuningJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -73106,7 +73110,7 @@ impl wkt::message::Message for ListNasJobsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNasJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNasJobsResponse {
     type PageItem = crate::model::NasJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -73397,7 +73401,7 @@ impl wkt::message::Message for ListNasTrialDetailsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNasTrialDetailsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNasTrialDetailsResponse {
     type PageItem = crate::model::NasTrialDetail;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -73751,7 +73755,7 @@ impl wkt::message::Message for ListBatchPredictionJobsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBatchPredictionJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBatchPredictionJobsResponse {
     type PageItem = crate::model::BatchPredictionJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -74301,7 +74305,7 @@ impl wkt::message::Message for SearchModelDeploymentMonitoringStatsAnomaliesResp
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for SearchModelDeploymentMonitoringStatsAnomaliesResponse
 {
     type PageItem = crate::model::ModelMonitoringStatsAnomalies;
@@ -74567,7 +74571,9 @@ impl wkt::message::Message for ListModelDeploymentMonitoringJobsResponse {
 
 #[cfg(feature = "job-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelDeploymentMonitoringJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListModelDeploymentMonitoringJobsResponse
+{
     type PageItem = crate::model::ModelDeploymentMonitoringJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -77670,7 +77676,7 @@ impl wkt::message::Message for ListMetadataStoresResponse {
 
 #[cfg(feature = "metadata-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMetadataStoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMetadataStoresResponse {
     type PageItem = crate::model::MetadataStore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -78163,7 +78169,7 @@ impl wkt::message::Message for ListArtifactsResponse {
 
 #[cfg(feature = "metadata-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListArtifactsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListArtifactsResponse {
     type PageItem = crate::model::Artifact;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -78921,7 +78927,7 @@ impl wkt::message::Message for ListContextsResponse {
 
 #[cfg(feature = "metadata-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListContextsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListContextsResponse {
     type PageItem = crate::model::Context;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -80024,7 +80030,7 @@ impl wkt::message::Message for ListExecutionsResponse {
 
 #[cfg(feature = "metadata-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListExecutionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListExecutionsResponse {
     type PageItem = crate::model::Execution;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -80866,7 +80872,7 @@ impl wkt::message::Message for ListMetadataSchemasResponse {
 
 #[cfg(feature = "metadata-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMetadataSchemasResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMetadataSchemasResponse {
     type PageItem = crate::model::MetadataSchema;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -82124,7 +82130,7 @@ impl wkt::message::Message for SearchMigratableResourcesResponse {
 
 #[cfg(feature = "migration-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchMigratableResourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchMigratableResourcesResponse {
     type PageItem = crate::model::MigratableResource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -93600,7 +93606,7 @@ impl wkt::message::Message for ListModelsResponse {
 
 #[cfg(feature = "model-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListModelsResponse {
     type PageItem = crate::model::Model;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -93848,7 +93854,7 @@ impl wkt::message::Message for ListModelVersionsResponse {
 
 #[cfg(feature = "model-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListModelVersionsResponse {
     type PageItem = crate::model::Model;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -94085,7 +94091,9 @@ impl wkt::message::Message for ListModelVersionCheckpointsResponse {
 
 #[cfg(feature = "model-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelVersionCheckpointsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListModelVersionCheckpointsResponse
+{
     type PageItem = crate::model::ModelVersionCheckpoint;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -95826,7 +95834,7 @@ impl wkt::message::Message for ListModelEvaluationsResponse {
 
 #[cfg(feature = "model-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelEvaluationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListModelEvaluationsResponse {
     type PageItem = crate::model::ModelEvaluation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -96086,7 +96094,7 @@ impl wkt::message::Message for ListModelEvaluationSlicesResponse {
 
 #[cfg(feature = "model-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelEvaluationSlicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListModelEvaluationSlicesResponse {
     type PageItem = crate::model::ModelEvaluationSlice;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -101634,7 +101642,9 @@ impl wkt::message::Message for ListNotebookRuntimeTemplatesResponse {
 
 #[cfg(feature = "notebook-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNotebookRuntimeTemplatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListNotebookRuntimeTemplatesResponse
+{
     type PageItem = crate::model::NotebookRuntimeTemplate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -102294,7 +102304,7 @@ impl wkt::message::Message for ListNotebookRuntimesResponse {
 
 #[cfg(feature = "notebook-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNotebookRuntimesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNotebookRuntimesResponse {
     type PageItem = crate::model::NotebookRuntime;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -103219,7 +103229,7 @@ impl wkt::message::Message for ListNotebookExecutionJobsResponse {
 
 #[cfg(feature = "notebook-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNotebookExecutionJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNotebookExecutionJobsResponse {
     type PageItem = crate::model::NotebookExecutionJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -106569,7 +106579,7 @@ impl wkt::message::Message for ListPersistentResourcesResponse {
 
 #[cfg(feature = "persistent-resource-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPersistentResourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPersistentResourcesResponse {
     type PageItem = crate::model::PersistentResource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -109387,7 +109397,7 @@ impl wkt::message::Message for ListTrainingPipelinesResponse {
 
 #[cfg(feature = "pipeline-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTrainingPipelinesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTrainingPipelinesResponse {
     type PageItem = crate::model::TrainingPipeline;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -109885,7 +109895,7 @@ impl wkt::message::Message for ListPipelineJobsResponse {
 
 #[cfg(feature = "pipeline-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPipelineJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPipelineJobsResponse {
     type PageItem = crate::model::PipelineJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -118369,7 +118379,7 @@ impl wkt::message::Message for ListReasoningEnginesResponse {
 
 #[cfg(feature = "reasoning-engine-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReasoningEnginesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReasoningEnginesResponse {
     type PageItem = crate::model::ReasoningEngine;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -120297,7 +120307,7 @@ impl wkt::message::Message for ListSchedulesResponse {
 
 #[cfg(feature = "schedule-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSchedulesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSchedulesResponse {
     type PageItem = crate::model::Schedule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -121562,7 +121572,7 @@ impl wkt::message::Message for ListSpecialistPoolsResponse {
 
 #[cfg(feature = "specialist-pool-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSpecialistPoolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSpecialistPoolsResponse {
     type PageItem = crate::model::SpecialistPool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -127578,7 +127588,7 @@ impl wkt::message::Message for ListTensorboardsResponse {
 
 #[cfg(feature = "tensorboard-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTensorboardsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTensorboardsResponse {
     type PageItem = crate::model::Tensorboard;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -128384,7 +128394,9 @@ impl wkt::message::Message for ListTensorboardExperimentsResponse {
 
 #[cfg(feature = "tensorboard-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTensorboardExperimentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListTensorboardExperimentsResponse
+{
     type PageItem = crate::model::TensorboardExperiment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -129134,7 +129146,7 @@ impl wkt::message::Message for ListTensorboardRunsResponse {
 
 #[cfg(feature = "tensorboard-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTensorboardRunsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTensorboardRunsResponse {
     type PageItem = crate::model::TensorboardRun;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -129778,7 +129790,7 @@ impl wkt::message::Message for ListTensorboardTimeSeriesResponse {
 
 #[cfg(feature = "tensorboard-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTensorboardTimeSeriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTensorboardTimeSeriesResponse {
     type PageItem = crate::model::TensorboardTimeSeries;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -130576,7 +130588,9 @@ impl wkt::message::Message for ExportTensorboardTimeSeriesDataResponse {
 
 #[cfg(feature = "tensorboard-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ExportTensorboardTimeSeriesDataResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ExportTensorboardTimeSeriesDataResponse
+{
     type PageItem = crate::model::TimeSeriesDataPoint;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -145619,7 +145633,7 @@ impl wkt::message::Message for ListRagCorporaResponse {
 
 #[cfg(feature = "vertex-rag-data-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRagCorporaResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRagCorporaResponse {
     type PageItem = crate::model::RagCorpus;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -146416,7 +146430,7 @@ impl wkt::message::Message for ListRagFilesResponse {
 
 #[cfg(feature = "vertex-rag-data-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRagFilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRagFilesResponse {
     type PageItem = crate::model::RagFile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -148924,7 +148938,7 @@ impl wkt::message::Message for ListStudiesResponse {
 
 #[cfg(feature = "vizier-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListStudiesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListStudiesResponse {
     type PageItem = crate::model::Study;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -149651,7 +149665,7 @@ impl wkt::message::Message for ListTrialsResponse {
 
 #[cfg(feature = "vizier-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTrialsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTrialsResponse {
     type PageItem = crate::model::Trial;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/aiplatform/v1/src/stub.rs b/src/generated/cloud/aiplatform/v1/src/stub.rs
index b3f0c93d25..ca4141c828 100644
--- a/src/generated/cloud/aiplatform/v1/src/stub.rs
+++ b/src/generated/cloud/aiplatform/v1/src/stub.rs
@@ -44,11 +44,9 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn generate_synthetic_data(
         &self,
         _req: crate::model::GenerateSyntheticDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateSyntheticDataResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateSyntheticDataResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -57,10 +55,10 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -70,9 +68,9 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -81,9 +79,9 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -92,9 +90,9 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -103,10 +101,10 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -116,10 +114,10 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -129,9 +127,9 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -140,8 +138,8 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -149,8 +147,8 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -158,9 +156,9 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -184,9 +182,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn create_dataset(
         &self,
         _req: crate::model::CreateDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -195,10 +193,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_dataset(
         &self,
         _req: crate::model::GetDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -206,10 +203,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn update_dataset(
         &self,
         _req: crate::model::UpdateDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -217,9 +213,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_datasets(
         &self,
         _req: crate::model::ListDatasetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDatasetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDatasetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -228,9 +224,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn delete_dataset(
         &self,
         _req: crate::model::DeleteDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -239,9 +235,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn import_data(
         &self,
         _req: crate::model::ImportDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -250,9 +246,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn export_data(
         &self,
         _req: crate::model::ExportDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -261,9 +257,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn create_dataset_version(
         &self,
         _req: crate::model::CreateDatasetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -272,9 +268,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn update_dataset_version(
         &self,
         _req: crate::model::UpdateDatasetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DatasetVersion>>,
+        Output = crate::Result<crate::Response<crate::model::DatasetVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -283,9 +279,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn delete_dataset_version(
         &self,
         _req: crate::model::DeleteDatasetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -294,9 +290,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_dataset_version(
         &self,
         _req: crate::model::GetDatasetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DatasetVersion>>,
+        Output = crate::Result<crate::Response<crate::model::DatasetVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -305,9 +301,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_dataset_versions(
         &self,
         _req: crate::model::ListDatasetVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDatasetVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDatasetVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -316,9 +312,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn restore_dataset_version(
         &self,
         _req: crate::model::RestoreDatasetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -327,9 +323,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_data_items(
         &self,
         _req: crate::model::ListDataItemsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataItemsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataItemsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -338,9 +334,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn search_data_items(
         &self,
         _req: crate::model::SearchDataItemsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchDataItemsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchDataItemsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -349,9 +345,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_saved_queries(
         &self,
         _req: crate::model::ListSavedQueriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSavedQueriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSavedQueriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -360,9 +356,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn delete_saved_query(
         &self,
         _req: crate::model::DeleteSavedQueryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -371,9 +367,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_annotation_spec(
         &self,
         _req: crate::model::GetAnnotationSpecRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnnotationSpec>>,
+        Output = crate::Result<crate::Response<crate::model::AnnotationSpec>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -382,9 +378,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_annotations(
         &self,
         _req: crate::model::ListAnnotationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAnnotationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAnnotationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -393,10 +389,10 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -406,9 +402,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -417,9 +413,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -428,9 +424,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -439,10 +435,10 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -452,10 +448,10 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -465,9 +461,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -476,8 +472,8 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -485,8 +481,8 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -494,9 +490,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -507,9 +503,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -518,9 +514,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -542,9 +538,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn create_deployment_resource_pool(
         &self,
         _req: crate::model::CreateDeploymentResourcePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -553,9 +549,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn get_deployment_resource_pool(
         &self,
         _req: crate::model::GetDeploymentResourcePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DeploymentResourcePool>>,
+        Output = crate::Result<crate::Response<crate::model::DeploymentResourcePool>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -564,11 +560,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn list_deployment_resource_pools(
         &self,
         _req: crate::model::ListDeploymentResourcePoolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDeploymentResourcePoolsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDeploymentResourcePoolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -577,9 +571,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn update_deployment_resource_pool(
         &self,
         _req: crate::model::UpdateDeploymentResourcePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -588,9 +582,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn delete_deployment_resource_pool(
         &self,
         _req: crate::model::DeleteDeploymentResourcePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -599,9 +593,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn query_deployed_models(
         &self,
         _req: crate::model::QueryDeployedModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryDeployedModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::QueryDeployedModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -610,10 +604,10 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -623,9 +617,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -634,9 +628,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -645,9 +639,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -656,10 +650,10 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -669,10 +663,10 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -682,9 +676,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -693,8 +687,8 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -702,8 +696,8 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -711,9 +705,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -724,9 +718,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -735,9 +729,9 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -759,9 +753,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn create_endpoint(
         &self,
         _req: crate::model::CreateEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -770,10 +764,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn get_endpoint(
         &self,
         _req: crate::model::GetEndpointRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Endpoint>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Endpoint>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -781,9 +774,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn list_endpoints(
         &self,
         _req: crate::model::ListEndpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEndpointsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEndpointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -792,10 +785,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn update_endpoint(
         &self,
         _req: crate::model::UpdateEndpointRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Endpoint>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Endpoint>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -803,9 +795,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn update_endpoint_long_running(
         &self,
         _req: crate::model::UpdateEndpointLongRunningRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -814,9 +806,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn delete_endpoint(
         &self,
         _req: crate::model::DeleteEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -825,9 +817,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn deploy_model(
         &self,
         _req: crate::model::DeployModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -836,9 +828,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn undeploy_model(
         &self,
         _req: crate::model::UndeployModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -847,9 +839,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn mutate_deployed_model(
         &self,
         _req: crate::model::MutateDeployedModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -858,10 +850,10 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -871,9 +863,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -882,9 +874,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -893,9 +885,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -904,10 +896,10 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -917,10 +909,10 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -930,9 +922,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -941,8 +933,8 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -950,8 +942,8 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -959,9 +951,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -972,9 +964,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -983,9 +975,9 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1007,9 +999,9 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn evaluate_instances(
         &self,
         _req: crate::model::EvaluateInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EvaluateInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::EvaluateInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1018,10 +1010,10 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1031,9 +1023,9 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1042,9 +1034,9 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1053,9 +1045,9 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1064,10 +1056,10 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1077,10 +1069,10 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1090,9 +1082,9 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1101,8 +1093,8 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1110,8 +1102,8 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1119,9 +1111,9 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1145,9 +1137,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn create_feature_online_store(
         &self,
         _req: crate::model::CreateFeatureOnlineStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1156,9 +1148,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn get_feature_online_store(
         &self,
         _req: crate::model::GetFeatureOnlineStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeatureOnlineStore>>,
+        Output = crate::Result<crate::Response<crate::model::FeatureOnlineStore>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1167,11 +1159,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn list_feature_online_stores(
         &self,
         _req: crate::model::ListFeatureOnlineStoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListFeatureOnlineStoresResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListFeatureOnlineStoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1180,9 +1170,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn update_feature_online_store(
         &self,
         _req: crate::model::UpdateFeatureOnlineStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1191,9 +1181,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn delete_feature_online_store(
         &self,
         _req: crate::model::DeleteFeatureOnlineStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1202,9 +1192,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn create_feature_view(
         &self,
         _req: crate::model::CreateFeatureViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1213,10 +1203,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn get_feature_view(
         &self,
         _req: crate::model::GetFeatureViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeatureView>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::FeatureView>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1224,9 +1213,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn list_feature_views(
         &self,
         _req: crate::model::ListFeatureViewsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeatureViewsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeatureViewsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1235,9 +1224,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn update_feature_view(
         &self,
         _req: crate::model::UpdateFeatureViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1246,9 +1235,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn delete_feature_view(
         &self,
         _req: crate::model::DeleteFeatureViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1257,9 +1246,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn sync_feature_view(
         &self,
         _req: crate::model::SyncFeatureViewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SyncFeatureViewResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SyncFeatureViewResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1268,9 +1257,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn get_feature_view_sync(
         &self,
         _req: crate::model::GetFeatureViewSyncRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeatureViewSync>>,
+        Output = crate::Result<crate::Response<crate::model::FeatureViewSync>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1279,9 +1268,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn list_feature_view_syncs(
         &self,
         _req: crate::model::ListFeatureViewSyncsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeatureViewSyncsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeatureViewSyncsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1290,10 +1279,10 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1303,9 +1292,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1314,9 +1303,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1325,9 +1314,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1336,10 +1325,10 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1349,10 +1338,10 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1362,9 +1351,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1373,8 +1362,8 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1382,8 +1371,8 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1391,9 +1380,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1404,9 +1393,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1415,9 +1404,9 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1439,9 +1428,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn fetch_feature_values(
         &self,
         _req: crate::model::FetchFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchFeatureValuesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchFeatureValuesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1450,11 +1439,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn search_nearest_entities(
         &self,
         _req: crate::model::SearchNearestEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SearchNearestEntitiesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SearchNearestEntitiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1463,11 +1450,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn generate_fetch_access_token(
         &self,
         _req: crate::model::GenerateFetchAccessTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateFetchAccessTokenResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateFetchAccessTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1476,10 +1461,10 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1489,9 +1474,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1500,9 +1485,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1511,9 +1496,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1522,10 +1507,10 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1535,10 +1520,10 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1548,9 +1533,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1559,8 +1544,8 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1568,8 +1553,8 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1577,9 +1562,9 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1603,9 +1588,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn create_feature_group(
         &self,
         _req: crate::model::CreateFeatureGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1614,9 +1599,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn get_feature_group(
         &self,
         _req: crate::model::GetFeatureGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeatureGroup>>,
+        Output = crate::Result<crate::Response<crate::model::FeatureGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1625,9 +1610,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn list_feature_groups(
         &self,
         _req: crate::model::ListFeatureGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeatureGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeatureGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1636,9 +1621,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn update_feature_group(
         &self,
         _req: crate::model::UpdateFeatureGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1647,9 +1632,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn delete_feature_group(
         &self,
         _req: crate::model::DeleteFeatureGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1658,9 +1643,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn create_feature(
         &self,
         _req: crate::model::CreateFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1669,9 +1654,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn batch_create_features(
         &self,
         _req: crate::model::BatchCreateFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1680,10 +1665,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn get_feature(
         &self,
         _req: crate::model::GetFeatureRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feature>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feature>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1691,9 +1675,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn list_features(
         &self,
         _req: crate::model::ListFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeaturesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1702,9 +1686,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn update_feature(
         &self,
         _req: crate::model::UpdateFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1713,9 +1697,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn delete_feature(
         &self,
         _req: crate::model::DeleteFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1724,10 +1708,10 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1737,9 +1721,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1748,9 +1732,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1759,9 +1743,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1770,10 +1754,10 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1783,10 +1767,10 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1796,9 +1780,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1807,8 +1791,8 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1816,8 +1800,8 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1825,9 +1809,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1838,9 +1822,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1849,9 +1833,9 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1873,9 +1857,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn read_feature_values(
         &self,
         _req: crate::model::ReadFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReadFeatureValuesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReadFeatureValuesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1884,9 +1868,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn write_feature_values(
         &self,
         _req: crate::model::WriteFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WriteFeatureValuesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::WriteFeatureValuesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1895,10 +1879,10 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1908,9 +1892,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1919,9 +1903,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1930,9 +1914,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1941,10 +1925,10 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1954,10 +1938,10 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1967,9 +1951,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1978,8 +1962,8 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1987,8 +1971,8 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1996,9 +1980,9 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2022,9 +2006,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn create_featurestore(
         &self,
         _req: crate::model::CreateFeaturestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2033,9 +2017,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn get_featurestore(
         &self,
         _req: crate::model::GetFeaturestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Featurestore>>,
+        Output = crate::Result<crate::Response<crate::model::Featurestore>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2044,9 +2028,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn list_featurestores(
         &self,
         _req: crate::model::ListFeaturestoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeaturestoresResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeaturestoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2055,9 +2039,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn update_featurestore(
         &self,
         _req: crate::model::UpdateFeaturestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2066,9 +2050,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn delete_featurestore(
         &self,
         _req: crate::model::DeleteFeaturestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2077,9 +2061,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn create_entity_type(
         &self,
         _req: crate::model::CreateEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2088,10 +2072,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn get_entity_type(
         &self,
         _req: crate::model::GetEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2099,9 +2082,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn list_entity_types(
         &self,
         _req: crate::model::ListEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntityTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2110,10 +2093,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn update_entity_type(
         &self,
         _req: crate::model::UpdateEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2121,9 +2103,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn delete_entity_type(
         &self,
         _req: crate::model::DeleteEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2132,9 +2114,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn create_feature(
         &self,
         _req: crate::model::CreateFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2143,9 +2125,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn batch_create_features(
         &self,
         _req: crate::model::BatchCreateFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2154,10 +2136,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn get_feature(
         &self,
         _req: crate::model::GetFeatureRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feature>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feature>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2165,9 +2146,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn list_features(
         &self,
         _req: crate::model::ListFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeaturesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2176,10 +2157,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn update_feature(
         &self,
         _req: crate::model::UpdateFeatureRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feature>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feature>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2187,9 +2167,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn delete_feature(
         &self,
         _req: crate::model::DeleteFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2198,9 +2178,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn import_feature_values(
         &self,
         _req: crate::model::ImportFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2209,9 +2189,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn batch_read_feature_values(
         &self,
         _req: crate::model::BatchReadFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2220,9 +2200,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn export_feature_values(
         &self,
         _req: crate::model::ExportFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2231,9 +2211,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn delete_feature_values(
         &self,
         _req: crate::model::DeleteFeatureValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2242,9 +2222,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn search_features(
         &self,
         _req: crate::model::SearchFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchFeaturesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchFeaturesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2253,10 +2233,10 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2266,9 +2246,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2277,9 +2257,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2288,9 +2268,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2299,10 +2279,10 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2312,10 +2292,10 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2325,9 +2305,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2336,8 +2316,8 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2345,8 +2325,8 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2354,9 +2334,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2367,9 +2347,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2378,9 +2358,9 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2402,9 +2382,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn create_cached_content(
         &self,
         _req: crate::model::CreateCachedContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CachedContent>>,
+        Output = crate::Result<crate::Response<crate::model::CachedContent>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2413,9 +2393,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn get_cached_content(
         &self,
         _req: crate::model::GetCachedContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CachedContent>>,
+        Output = crate::Result<crate::Response<crate::model::CachedContent>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2424,9 +2404,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn update_cached_content(
         &self,
         _req: crate::model::UpdateCachedContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CachedContent>>,
+        Output = crate::Result<crate::Response<crate::model::CachedContent>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2435,8 +2415,8 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn delete_cached_content(
         &self,
         _req: crate::model::DeleteCachedContentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2444,9 +2424,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn list_cached_contents(
         &self,
         _req: crate::model::ListCachedContentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCachedContentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCachedContentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2455,10 +2435,10 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2468,9 +2448,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2479,9 +2459,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2490,9 +2470,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2501,10 +2481,10 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2514,10 +2494,10 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2527,9 +2507,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2538,8 +2518,8 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2547,8 +2527,8 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2556,9 +2536,9 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2582,10 +2562,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn create_tuning_job(
         &self,
         _req: crate::model::CreateTuningJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TuningJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TuningJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2593,10 +2572,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn get_tuning_job(
         &self,
         _req: crate::model::GetTuningJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TuningJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TuningJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2604,9 +2582,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn list_tuning_jobs(
         &self,
         _req: crate::model::ListTuningJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTuningJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTuningJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2615,8 +2593,8 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn cancel_tuning_job(
         &self,
         _req: crate::model::CancelTuningJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2624,9 +2602,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn rebase_tuned_model(
         &self,
         _req: crate::model::RebaseTunedModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2635,10 +2613,10 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2648,9 +2626,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2659,9 +2637,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2670,9 +2648,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2681,10 +2659,10 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2694,10 +2672,10 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2707,9 +2685,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2718,8 +2696,8 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2727,8 +2705,8 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2736,9 +2714,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2749,9 +2727,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2760,9 +2738,9 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2784,9 +2762,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn create_index_endpoint(
         &self,
         _req: crate::model::CreateIndexEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2795,9 +2773,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn get_index_endpoint(
         &self,
         _req: crate::model::GetIndexEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IndexEndpoint>>,
+        Output = crate::Result<crate::Response<crate::model::IndexEndpoint>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2806,9 +2784,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn list_index_endpoints(
         &self,
         _req: crate::model::ListIndexEndpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIndexEndpointsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIndexEndpointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2817,9 +2795,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn update_index_endpoint(
         &self,
         _req: crate::model::UpdateIndexEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IndexEndpoint>>,
+        Output = crate::Result<crate::Response<crate::model::IndexEndpoint>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2828,9 +2806,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn delete_index_endpoint(
         &self,
         _req: crate::model::DeleteIndexEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2839,9 +2817,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn deploy_index(
         &self,
         _req: crate::model::DeployIndexRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2850,9 +2828,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn undeploy_index(
         &self,
         _req: crate::model::UndeployIndexRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2861,9 +2839,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn mutate_deployed_index(
         &self,
         _req: crate::model::MutateDeployedIndexRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2872,10 +2850,10 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2885,9 +2863,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2896,9 +2874,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2907,9 +2885,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2918,10 +2896,10 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2931,10 +2909,10 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2944,9 +2922,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2955,8 +2933,8 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2964,8 +2942,8 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2973,9 +2951,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2986,9 +2964,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2997,9 +2975,9 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3021,9 +2999,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn create_index(
         &self,
         _req: crate::model::CreateIndexRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3032,10 +3010,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn get_index(
         &self,
         _req: crate::model::GetIndexRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Index>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Index>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3043,9 +3020,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn list_indexes(
         &self,
         _req: crate::model::ListIndexesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIndexesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIndexesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3054,9 +3031,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn update_index(
         &self,
         _req: crate::model::UpdateIndexRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3065,9 +3042,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn delete_index(
         &self,
         _req: crate::model::DeleteIndexRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3076,9 +3053,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn upsert_datapoints(
         &self,
         _req: crate::model::UpsertDatapointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UpsertDatapointsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::UpsertDatapointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3087,9 +3064,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn remove_datapoints(
         &self,
         _req: crate::model::RemoveDatapointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RemoveDatapointsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RemoveDatapointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3098,10 +3075,10 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3111,9 +3088,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3122,9 +3099,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3133,9 +3110,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3144,10 +3121,10 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3157,10 +3134,10 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3170,9 +3147,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3181,8 +3158,8 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3190,8 +3167,8 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3199,9 +3176,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3212,9 +3189,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3223,9 +3200,9 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3247,10 +3224,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn create_custom_job(
         &self,
         _req: crate::model::CreateCustomJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CustomJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CustomJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3258,10 +3234,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_custom_job(
         &self,
         _req: crate::model::GetCustomJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CustomJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CustomJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3269,9 +3244,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_custom_jobs(
         &self,
         _req: crate::model::ListCustomJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCustomJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCustomJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3280,9 +3255,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_custom_job(
         &self,
         _req: crate::model::DeleteCustomJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3291,8 +3266,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_custom_job(
         &self,
         _req: crate::model::CancelCustomJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3300,9 +3275,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn create_data_labeling_job(
         &self,
         _req: crate::model::CreateDataLabelingJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataLabelingJob>>,
+        Output = crate::Result<crate::Response<crate::model::DataLabelingJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3311,9 +3286,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_data_labeling_job(
         &self,
         _req: crate::model::GetDataLabelingJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataLabelingJob>>,
+        Output = crate::Result<crate::Response<crate::model::DataLabelingJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3322,9 +3297,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_data_labeling_jobs(
         &self,
         _req: crate::model::ListDataLabelingJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataLabelingJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataLabelingJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3333,9 +3308,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_data_labeling_job(
         &self,
         _req: crate::model::DeleteDataLabelingJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3344,8 +3319,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_data_labeling_job(
         &self,
         _req: crate::model::CancelDataLabelingJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3353,9 +3328,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn create_hyperparameter_tuning_job(
         &self,
         _req: crate::model::CreateHyperparameterTuningJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HyperparameterTuningJob>>,
+        Output = crate::Result<crate::Response<crate::model::HyperparameterTuningJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3364,9 +3339,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_hyperparameter_tuning_job(
         &self,
         _req: crate::model::GetHyperparameterTuningJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HyperparameterTuningJob>>,
+        Output = crate::Result<crate::Response<crate::model::HyperparameterTuningJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3375,11 +3350,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_hyperparameter_tuning_jobs(
         &self,
         _req: crate::model::ListHyperparameterTuningJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListHyperparameterTuningJobsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListHyperparameterTuningJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3388,9 +3361,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_hyperparameter_tuning_job(
         &self,
         _req: crate::model::DeleteHyperparameterTuningJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3399,8 +3372,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_hyperparameter_tuning_job(
         &self,
         _req: crate::model::CancelHyperparameterTuningJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3408,10 +3381,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn create_nas_job(
         &self,
         _req: crate::model::CreateNasJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NasJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NasJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3419,10 +3391,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_nas_job(
         &self,
         _req: crate::model::GetNasJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NasJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NasJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3430,9 +3401,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_nas_jobs(
         &self,
         _req: crate::model::ListNasJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNasJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNasJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3441,9 +3412,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_nas_job(
         &self,
         _req: crate::model::DeleteNasJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3452,8 +3423,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_nas_job(
         &self,
         _req: crate::model::CancelNasJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3461,9 +3432,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_nas_trial_detail(
         &self,
         _req: crate::model::GetNasTrialDetailRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NasTrialDetail>>,
+        Output = crate::Result<crate::Response<crate::model::NasTrialDetail>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3472,9 +3443,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_nas_trial_details(
         &self,
         _req: crate::model::ListNasTrialDetailsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNasTrialDetailsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNasTrialDetailsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3483,9 +3454,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn create_batch_prediction_job(
         &self,
         _req: crate::model::CreateBatchPredictionJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BatchPredictionJob>>,
+        Output = crate::Result<crate::Response<crate::model::BatchPredictionJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3494,9 +3465,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_batch_prediction_job(
         &self,
         _req: crate::model::GetBatchPredictionJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BatchPredictionJob>>,
+        Output = crate::Result<crate::Response<crate::model::BatchPredictionJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3505,11 +3476,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_batch_prediction_jobs(
         &self,
         _req: crate::model::ListBatchPredictionJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListBatchPredictionJobsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListBatchPredictionJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3518,9 +3487,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_batch_prediction_job(
         &self,
         _req: crate::model::DeleteBatchPredictionJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3529,8 +3498,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_batch_prediction_job(
         &self,
         _req: crate::model::CancelBatchPredictionJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3538,9 +3507,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn create_model_deployment_monitoring_job(
         &self,
         _req: crate::model::CreateModelDeploymentMonitoringJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>>,
+        Output = crate::Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3549,12 +3518,10 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn search_model_deployment_monitoring_stats_anomalies(
         &self,
         _req: crate::model::SearchModelDeploymentMonitoringStatsAnomaliesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-            >,
+            crate::Response<crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3564,9 +3531,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_model_deployment_monitoring_job(
         &self,
         _req: crate::model::GetModelDeploymentMonitoringJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>>,
+        Output = crate::Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3575,10 +3542,10 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_model_deployment_monitoring_jobs(
         &self,
         _req: crate::model::ListModelDeploymentMonitoringJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>,
+            crate::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3588,9 +3555,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn update_model_deployment_monitoring_job(
         &self,
         _req: crate::model::UpdateModelDeploymentMonitoringJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3599,9 +3566,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_model_deployment_monitoring_job(
         &self,
         _req: crate::model::DeleteModelDeploymentMonitoringJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3610,8 +3577,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn pause_model_deployment_monitoring_job(
         &self,
         _req: crate::model::PauseModelDeploymentMonitoringJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3619,8 +3586,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn resume_model_deployment_monitoring_job(
         &self,
         _req: crate::model::ResumeModelDeploymentMonitoringJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3628,10 +3595,10 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3641,9 +3608,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3652,9 +3619,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3663,9 +3630,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3674,10 +3641,10 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3687,10 +3654,10 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3700,9 +3667,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3711,8 +3678,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3720,8 +3687,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3729,9 +3696,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3742,9 +3709,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3753,9 +3720,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3777,9 +3744,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn count_tokens(
         &self,
         _req: crate::model::CountTokensRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CountTokensResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CountTokensResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3788,9 +3755,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn compute_tokens(
         &self,
         _req: crate::model::ComputeTokensRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ComputeTokensResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ComputeTokensResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3799,10 +3766,10 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3812,9 +3779,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3823,9 +3790,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3834,9 +3801,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3845,10 +3812,10 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3858,10 +3825,10 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3871,9 +3838,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3882,8 +3849,8 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3891,8 +3858,8 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3900,9 +3867,9 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3926,9 +3893,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn find_neighbors(
         &self,
         _req: crate::model::FindNeighborsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FindNeighborsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FindNeighborsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3937,9 +3904,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn read_index_datapoints(
         &self,
         _req: crate::model::ReadIndexDatapointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReadIndexDatapointsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReadIndexDatapointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3948,10 +3915,10 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3961,9 +3928,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3972,9 +3939,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3983,9 +3950,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3994,10 +3961,10 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4007,10 +3974,10 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4020,9 +3987,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4031,8 +3998,8 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4040,8 +4007,8 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4049,9 +4016,9 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4075,9 +4042,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_metadata_store(
         &self,
         _req: crate::model::CreateMetadataStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4086,9 +4053,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_metadata_store(
         &self,
         _req: crate::model::GetMetadataStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MetadataStore>>,
+        Output = crate::Result<crate::Response<crate::model::MetadataStore>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4097,9 +4064,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_metadata_stores(
         &self,
         _req: crate::model::ListMetadataStoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMetadataStoresResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMetadataStoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4108,9 +4075,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_metadata_store(
         &self,
         _req: crate::model::DeleteMetadataStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4119,10 +4086,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_artifact(
         &self,
         _req: crate::model::CreateArtifactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Artifact>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Artifact>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4130,10 +4096,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_artifact(
         &self,
         _req: crate::model::GetArtifactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Artifact>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Artifact>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4141,9 +4106,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_artifacts(
         &self,
         _req: crate::model::ListArtifactsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListArtifactsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListArtifactsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4152,10 +4117,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn update_artifact(
         &self,
         _req: crate::model::UpdateArtifactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Artifact>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Artifact>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4163,9 +4127,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_artifact(
         &self,
         _req: crate::model::DeleteArtifactRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4174,9 +4138,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn purge_artifacts(
         &self,
         _req: crate::model::PurgeArtifactsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4185,10 +4149,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_context(
         &self,
         _req: crate::model::CreateContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4196,10 +4159,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_context(
         &self,
         _req: crate::model::GetContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4207,9 +4169,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_contexts(
         &self,
         _req: crate::model::ListContextsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListContextsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListContextsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4218,10 +4180,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn update_context(
         &self,
         _req: crate::model::UpdateContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4229,9 +4190,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_context(
         &self,
         _req: crate::model::DeleteContextRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4240,9 +4201,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn purge_contexts(
         &self,
         _req: crate::model::PurgeContextsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4251,10 +4212,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn add_context_artifacts_and_executions(
         &self,
         _req: crate::model::AddContextArtifactsAndExecutionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::AddContextArtifactsAndExecutionsResponse>,
+            crate::Response<crate::model::AddContextArtifactsAndExecutionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4264,9 +4225,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn add_context_children(
         &self,
         _req: crate::model::AddContextChildrenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AddContextChildrenResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AddContextChildrenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4275,11 +4236,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn remove_context_children(
         &self,
         _req: crate::model::RemoveContextChildrenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RemoveContextChildrenResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RemoveContextChildrenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4288,9 +4247,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn query_context_lineage_subgraph(
         &self,
         _req: crate::model::QueryContextLineageSubgraphRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LineageSubgraph>>,
+        Output = crate::Result<crate::Response<crate::model::LineageSubgraph>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4299,10 +4258,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_execution(
         &self,
         _req: crate::model::CreateExecutionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Execution>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Execution>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4310,10 +4268,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_execution(
         &self,
         _req: crate::model::GetExecutionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Execution>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Execution>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4321,9 +4278,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_executions(
         &self,
         _req: crate::model::ListExecutionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListExecutionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListExecutionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4332,10 +4289,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn update_execution(
         &self,
         _req: crate::model::UpdateExecutionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Execution>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Execution>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4343,9 +4299,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_execution(
         &self,
         _req: crate::model::DeleteExecutionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4354,9 +4310,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn purge_executions(
         &self,
         _req: crate::model::PurgeExecutionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4365,9 +4321,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn add_execution_events(
         &self,
         _req: crate::model::AddExecutionEventsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AddExecutionEventsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AddExecutionEventsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4376,9 +4332,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn query_execution_inputs_and_outputs(
         &self,
         _req: crate::model::QueryExecutionInputsAndOutputsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LineageSubgraph>>,
+        Output = crate::Result<crate::Response<crate::model::LineageSubgraph>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4387,9 +4343,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_metadata_schema(
         &self,
         _req: crate::model::CreateMetadataSchemaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MetadataSchema>>,
+        Output = crate::Result<crate::Response<crate::model::MetadataSchema>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4398,9 +4354,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_metadata_schema(
         &self,
         _req: crate::model::GetMetadataSchemaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MetadataSchema>>,
+        Output = crate::Result<crate::Response<crate::model::MetadataSchema>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4409,9 +4365,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_metadata_schemas(
         &self,
         _req: crate::model::ListMetadataSchemasRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMetadataSchemasResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMetadataSchemasResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4420,9 +4376,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn query_artifact_lineage_subgraph(
         &self,
         _req: crate::model::QueryArtifactLineageSubgraphRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LineageSubgraph>>,
+        Output = crate::Result<crate::Response<crate::model::LineageSubgraph>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4431,10 +4387,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4444,9 +4400,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4455,9 +4411,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4466,9 +4422,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4477,10 +4433,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4490,10 +4446,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4503,9 +4459,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4514,8 +4470,8 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4523,8 +4479,8 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4532,9 +4488,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4545,9 +4501,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4556,9 +4512,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4580,11 +4536,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn search_migratable_resources(
         &self,
         _req: crate::model::SearchMigratableResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SearchMigratableResourcesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SearchMigratableResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4593,9 +4547,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn batch_migrate_resources(
         &self,
         _req: crate::model::BatchMigrateResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4604,10 +4558,10 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4617,9 +4571,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4628,9 +4582,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4639,9 +4593,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4650,10 +4604,10 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4663,10 +4617,10 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4676,9 +4630,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4687,8 +4641,8 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4696,8 +4650,8 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4705,9 +4659,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4718,9 +4672,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4729,9 +4683,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4753,9 +4707,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn get_publisher_model(
         &self,
         _req: crate::model::GetPublisherModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublisherModel>>,
+        Output = crate::Result<crate::Response<crate::model::PublisherModel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4764,9 +4718,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn deploy(
         &self,
         _req: crate::model::DeployRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4775,10 +4729,10 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4788,9 +4742,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4799,9 +4753,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4810,9 +4764,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4821,10 +4775,10 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4834,10 +4788,10 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4847,9 +4801,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4858,8 +4812,8 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4867,8 +4821,8 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4876,9 +4830,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4889,9 +4843,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4900,9 +4854,9 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4924,9 +4878,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn upload_model(
         &self,
         _req: crate::model::UploadModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4935,10 +4889,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_model(
         &self,
         _req: crate::model::GetModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Model>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Model>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4946,9 +4899,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_models(
         &self,
         _req: crate::model::ListModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4957,9 +4910,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_model_versions(
         &self,
         _req: crate::model::ListModelVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListModelVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListModelVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4968,11 +4921,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_model_version_checkpoints(
         &self,
         _req: crate::model::ListModelVersionCheckpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListModelVersionCheckpointsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListModelVersionCheckpointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4981,10 +4932,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn update_model(
         &self,
         _req: crate::model::UpdateModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Model>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Model>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4992,9 +4942,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn update_explanation_dataset(
         &self,
         _req: crate::model::UpdateExplanationDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5003,9 +4953,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn delete_model(
         &self,
         _req: crate::model::DeleteModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5014,9 +4964,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn delete_model_version(
         &self,
         _req: crate::model::DeleteModelVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5025,10 +4975,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn merge_version_aliases(
         &self,
         _req: crate::model::MergeVersionAliasesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Model>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Model>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5036,9 +4985,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn export_model(
         &self,
         _req: crate::model::ExportModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5047,9 +4996,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn copy_model(
         &self,
         _req: crate::model::CopyModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5058,9 +5007,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn import_model_evaluation(
         &self,
         _req: crate::model::ImportModelEvaluationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ModelEvaluation>>,
+        Output = crate::Result<crate::Response<crate::model::ModelEvaluation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5069,10 +5018,10 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn batch_import_model_evaluation_slices(
         &self,
         _req: crate::model::BatchImportModelEvaluationSlicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::BatchImportModelEvaluationSlicesResponse>,
+            crate::Response<crate::model::BatchImportModelEvaluationSlicesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5082,10 +5031,10 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn batch_import_evaluated_annotations(
         &self,
         _req: crate::model::BatchImportEvaluatedAnnotationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>,
+            crate::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5095,9 +5044,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_model_evaluation(
         &self,
         _req: crate::model::GetModelEvaluationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ModelEvaluation>>,
+        Output = crate::Result<crate::Response<crate::model::ModelEvaluation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5106,9 +5055,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_model_evaluations(
         &self,
         _req: crate::model::ListModelEvaluationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListModelEvaluationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListModelEvaluationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5117,9 +5066,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_model_evaluation_slice(
         &self,
         _req: crate::model::GetModelEvaluationSliceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ModelEvaluationSlice>>,
+        Output = crate::Result<crate::Response<crate::model::ModelEvaluationSlice>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5128,11 +5077,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_model_evaluation_slices(
         &self,
         _req: crate::model::ListModelEvaluationSlicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListModelEvaluationSlicesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListModelEvaluationSlicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5141,10 +5088,10 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5154,9 +5101,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5165,9 +5112,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5176,9 +5123,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5187,10 +5134,10 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5200,10 +5147,10 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5213,9 +5160,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5224,8 +5171,8 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5233,8 +5180,8 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5242,9 +5189,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5255,9 +5202,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5266,9 +5213,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5290,9 +5237,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn create_notebook_runtime_template(
         &self,
         _req: crate::model::CreateNotebookRuntimeTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5301,9 +5248,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn get_notebook_runtime_template(
         &self,
         _req: crate::model::GetNotebookRuntimeTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::NotebookRuntimeTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5312,11 +5259,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn list_notebook_runtime_templates(
         &self,
         _req: crate::model::ListNotebookRuntimeTemplatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListNotebookRuntimeTemplatesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListNotebookRuntimeTemplatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5325,9 +5270,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn delete_notebook_runtime_template(
         &self,
         _req: crate::model::DeleteNotebookRuntimeTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5336,9 +5281,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn update_notebook_runtime_template(
         &self,
         _req: crate::model::UpdateNotebookRuntimeTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::NotebookRuntimeTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5347,9 +5292,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn assign_notebook_runtime(
         &self,
         _req: crate::model::AssignNotebookRuntimeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5358,9 +5303,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn get_notebook_runtime(
         &self,
         _req: crate::model::GetNotebookRuntimeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NotebookRuntime>>,
+        Output = crate::Result<crate::Response<crate::model::NotebookRuntime>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5369,9 +5314,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn list_notebook_runtimes(
         &self,
         _req: crate::model::ListNotebookRuntimesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNotebookRuntimesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNotebookRuntimesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5380,9 +5325,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn delete_notebook_runtime(
         &self,
         _req: crate::model::DeleteNotebookRuntimeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5391,9 +5336,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn upgrade_notebook_runtime(
         &self,
         _req: crate::model::UpgradeNotebookRuntimeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5402,9 +5347,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn start_notebook_runtime(
         &self,
         _req: crate::model::StartNotebookRuntimeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5413,9 +5358,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn stop_notebook_runtime(
         &self,
         _req: crate::model::StopNotebookRuntimeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5424,9 +5369,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn create_notebook_execution_job(
         &self,
         _req: crate::model::CreateNotebookExecutionJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5435,9 +5380,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn get_notebook_execution_job(
         &self,
         _req: crate::model::GetNotebookExecutionJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NotebookExecutionJob>>,
+        Output = crate::Result<crate::Response<crate::model::NotebookExecutionJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5446,11 +5391,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn list_notebook_execution_jobs(
         &self,
         _req: crate::model::ListNotebookExecutionJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListNotebookExecutionJobsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListNotebookExecutionJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5459,9 +5402,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn delete_notebook_execution_job(
         &self,
         _req: crate::model::DeleteNotebookExecutionJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5470,10 +5413,10 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5483,9 +5426,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5494,9 +5437,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5505,9 +5448,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5516,10 +5459,10 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5529,10 +5472,10 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5542,9 +5485,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5553,8 +5496,8 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5562,8 +5505,8 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5571,9 +5514,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5584,9 +5527,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5595,9 +5538,9 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5619,9 +5562,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn create_persistent_resource(
         &self,
         _req: crate::model::CreatePersistentResourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5630,9 +5573,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn get_persistent_resource(
         &self,
         _req: crate::model::GetPersistentResourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PersistentResource>>,
+        Output = crate::Result<crate::Response<crate::model::PersistentResource>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5641,11 +5584,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn list_persistent_resources(
         &self,
         _req: crate::model::ListPersistentResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListPersistentResourcesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListPersistentResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5654,9 +5595,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn delete_persistent_resource(
         &self,
         _req: crate::model::DeletePersistentResourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5665,9 +5606,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn update_persistent_resource(
         &self,
         _req: crate::model::UpdatePersistentResourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5676,9 +5617,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn reboot_persistent_resource(
         &self,
         _req: crate::model::RebootPersistentResourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5687,10 +5628,10 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5700,9 +5641,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5711,9 +5652,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5722,9 +5663,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5733,10 +5674,10 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5746,10 +5687,10 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5759,9 +5700,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5770,8 +5711,8 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5779,8 +5720,8 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5788,9 +5729,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5801,9 +5742,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5812,9 +5753,9 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5836,9 +5777,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn create_training_pipeline(
         &self,
         _req: crate::model::CreateTrainingPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TrainingPipeline>>,
+        Output = crate::Result<crate::Response<crate::model::TrainingPipeline>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5847,9 +5788,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn get_training_pipeline(
         &self,
         _req: crate::model::GetTrainingPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TrainingPipeline>>,
+        Output = crate::Result<crate::Response<crate::model::TrainingPipeline>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5858,11 +5799,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn list_training_pipelines(
         &self,
         _req: crate::model::ListTrainingPipelinesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListTrainingPipelinesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListTrainingPipelinesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5871,9 +5810,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn delete_training_pipeline(
         &self,
         _req: crate::model::DeleteTrainingPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5882,8 +5821,8 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn cancel_training_pipeline(
         &self,
         _req: crate::model::CancelTrainingPipelineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5891,10 +5830,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn create_pipeline_job(
         &self,
         _req: crate::model::CreatePipelineJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PipelineJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::PipelineJob>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5902,10 +5840,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn get_pipeline_job(
         &self,
         _req: crate::model::GetPipelineJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PipelineJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::PipelineJob>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5913,9 +5850,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn list_pipeline_jobs(
         &self,
         _req: crate::model::ListPipelineJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPipelineJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPipelineJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5924,9 +5861,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn delete_pipeline_job(
         &self,
         _req: crate::model::DeletePipelineJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5935,9 +5872,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn batch_delete_pipeline_jobs(
         &self,
         _req: crate::model::BatchDeletePipelineJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5946,8 +5883,8 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn cancel_pipeline_job(
         &self,
         _req: crate::model::CancelPipelineJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5955,9 +5892,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn batch_cancel_pipeline_jobs(
         &self,
         _req: crate::model::BatchCancelPipelineJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5966,10 +5903,10 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5979,9 +5916,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5990,9 +5927,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6001,9 +5938,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6012,10 +5949,10 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6025,10 +5962,10 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6038,9 +5975,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6049,8 +5986,8 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6058,8 +5995,8 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6067,9 +6004,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6080,9 +6017,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6091,9 +6028,9 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6115,9 +6052,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn predict(
         &self,
         _req: crate::model::PredictRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PredictResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PredictResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6126,9 +6063,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn raw_predict(
         &self,
         _req: crate::model::RawPredictRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6137,9 +6074,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn direct_predict(
         &self,
         _req: crate::model::DirectPredictRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DirectPredictResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DirectPredictResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6148,9 +6085,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn direct_raw_predict(
         &self,
         _req: crate::model::DirectRawPredictRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DirectRawPredictResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DirectRawPredictResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6159,9 +6096,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn explain(
         &self,
         _req: crate::model::ExplainRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExplainResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ExplainResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6170,9 +6107,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn generate_content(
         &self,
         _req: crate::model::GenerateContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateContentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateContentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6181,9 +6118,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn embed_content(
         &self,
         _req: crate::model::EmbedContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EmbedContentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::EmbedContentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6192,10 +6129,10 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6205,9 +6142,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6216,9 +6153,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6227,9 +6164,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6238,10 +6175,10 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6251,10 +6188,10 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6264,9 +6201,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6275,8 +6212,8 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6284,8 +6221,8 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6293,9 +6230,9 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6319,9 +6256,9 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn query_reasoning_engine(
         &self,
         _req: crate::model::QueryReasoningEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryReasoningEngineResponse>>,
+        Output = crate::Result<crate::Response<crate::model::QueryReasoningEngineResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6330,10 +6267,10 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6343,9 +6280,9 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6354,9 +6291,9 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6365,9 +6302,9 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6376,10 +6313,10 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6389,10 +6326,10 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6402,9 +6339,9 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6413,8 +6350,8 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6422,8 +6359,8 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6431,9 +6368,9 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6457,9 +6394,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn create_reasoning_engine(
         &self,
         _req: crate::model::CreateReasoningEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6468,9 +6405,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn get_reasoning_engine(
         &self,
         _req: crate::model::GetReasoningEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReasoningEngine>>,
+        Output = crate::Result<crate::Response<crate::model::ReasoningEngine>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6479,9 +6416,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn list_reasoning_engines(
         &self,
         _req: crate::model::ListReasoningEnginesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReasoningEnginesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReasoningEnginesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6490,9 +6427,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn update_reasoning_engine(
         &self,
         _req: crate::model::UpdateReasoningEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6501,9 +6438,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn delete_reasoning_engine(
         &self,
         _req: crate::model::DeleteReasoningEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6512,10 +6449,10 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6525,9 +6462,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6536,9 +6473,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6547,9 +6484,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6558,10 +6495,10 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6571,10 +6508,10 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6584,9 +6521,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6595,8 +6532,8 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6604,8 +6541,8 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6613,9 +6550,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6626,9 +6563,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6637,9 +6574,9 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6661,10 +6598,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn create_schedule(
         &self,
         _req: crate::model::CreateScheduleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Schedule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Schedule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6672,9 +6608,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn delete_schedule(
         &self,
         _req: crate::model::DeleteScheduleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6683,10 +6619,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn get_schedule(
         &self,
         _req: crate::model::GetScheduleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Schedule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Schedule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6694,9 +6629,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn list_schedules(
         &self,
         _req: crate::model::ListSchedulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSchedulesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSchedulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6705,8 +6640,8 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn pause_schedule(
         &self,
         _req: crate::model::PauseScheduleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6714,8 +6649,8 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn resume_schedule(
         &self,
         _req: crate::model::ResumeScheduleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6723,10 +6658,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn update_schedule(
         &self,
         _req: crate::model::UpdateScheduleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Schedule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Schedule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6734,10 +6668,10 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6747,9 +6681,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6758,9 +6692,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6769,9 +6703,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6780,10 +6714,10 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6793,10 +6727,10 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6806,9 +6740,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6817,8 +6751,8 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6826,8 +6760,8 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6835,9 +6769,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6848,9 +6782,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6859,9 +6793,9 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6883,9 +6817,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn create_specialist_pool(
         &self,
         _req: crate::model::CreateSpecialistPoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6894,9 +6828,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn get_specialist_pool(
         &self,
         _req: crate::model::GetSpecialistPoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SpecialistPool>>,
+        Output = crate::Result<crate::Response<crate::model::SpecialistPool>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6905,9 +6839,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn list_specialist_pools(
         &self,
         _req: crate::model::ListSpecialistPoolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSpecialistPoolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSpecialistPoolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6916,9 +6850,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn delete_specialist_pool(
         &self,
         _req: crate::model::DeleteSpecialistPoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6927,9 +6861,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn update_specialist_pool(
         &self,
         _req: crate::model::UpdateSpecialistPoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6938,10 +6872,10 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6951,9 +6885,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6962,9 +6896,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6973,9 +6907,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6984,10 +6918,10 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6997,10 +6931,10 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7010,9 +6944,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7021,8 +6955,8 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7030,8 +6964,8 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7039,9 +6973,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7052,9 +6986,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7063,9 +6997,9 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7087,9 +7021,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn create_tensorboard(
         &self,
         _req: crate::model::CreateTensorboardRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7098,10 +7032,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_tensorboard(
         &self,
         _req: crate::model::GetTensorboardRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tensorboard>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tensorboard>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7109,9 +7042,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn update_tensorboard(
         &self,
         _req: crate::model::UpdateTensorboardRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7120,9 +7053,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn list_tensorboards(
         &self,
         _req: crate::model::ListTensorboardsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTensorboardsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTensorboardsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7131,9 +7064,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn delete_tensorboard(
         &self,
         _req: crate::model::DeleteTensorboardRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7142,9 +7075,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn read_tensorboard_usage(
         &self,
         _req: crate::model::ReadTensorboardUsageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReadTensorboardUsageResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReadTensorboardUsageResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7153,9 +7086,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn read_tensorboard_size(
         &self,
         _req: crate::model::ReadTensorboardSizeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReadTensorboardSizeResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReadTensorboardSizeResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7164,9 +7097,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn create_tensorboard_experiment(
         &self,
         _req: crate::model::CreateTensorboardExperimentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardExperiment>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardExperiment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7175,9 +7108,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_tensorboard_experiment(
         &self,
         _req: crate::model::GetTensorboardExperimentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardExperiment>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardExperiment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7186,9 +7119,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn update_tensorboard_experiment(
         &self,
         _req: crate::model::UpdateTensorboardExperimentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardExperiment>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardExperiment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7197,11 +7130,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn list_tensorboard_experiments(
         &self,
         _req: crate::model::ListTensorboardExperimentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListTensorboardExperimentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListTensorboardExperimentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7210,9 +7141,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn delete_tensorboard_experiment(
         &self,
         _req: crate::model::DeleteTensorboardExperimentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7221,9 +7152,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn create_tensorboard_run(
         &self,
         _req: crate::model::CreateTensorboardRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardRun>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardRun>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7232,11 +7163,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn batch_create_tensorboard_runs(
         &self,
         _req: crate::model::BatchCreateTensorboardRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::BatchCreateTensorboardRunsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::BatchCreateTensorboardRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7245,9 +7174,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_tensorboard_run(
         &self,
         _req: crate::model::GetTensorboardRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardRun>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardRun>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7256,9 +7185,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn update_tensorboard_run(
         &self,
         _req: crate::model::UpdateTensorboardRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardRun>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardRun>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7267,9 +7196,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn list_tensorboard_runs(
         &self,
         _req: crate::model::ListTensorboardRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTensorboardRunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTensorboardRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7278,9 +7207,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn delete_tensorboard_run(
         &self,
         _req: crate::model::DeleteTensorboardRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7289,10 +7218,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn batch_create_tensorboard_time_series(
         &self,
         _req: crate::model::BatchCreateTensorboardTimeSeriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>,
+            crate::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7302,9 +7231,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn create_tensorboard_time_series(
         &self,
         _req: crate::model::CreateTensorboardTimeSeriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardTimeSeries>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7313,9 +7242,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_tensorboard_time_series(
         &self,
         _req: crate::model::GetTensorboardTimeSeriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardTimeSeries>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7324,9 +7253,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn update_tensorboard_time_series(
         &self,
         _req: crate::model::UpdateTensorboardTimeSeriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>>,
+        Output = crate::Result<crate::Response<crate::model::TensorboardTimeSeries>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7335,11 +7264,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn list_tensorboard_time_series(
         &self,
         _req: crate::model::ListTensorboardTimeSeriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListTensorboardTimeSeriesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListTensorboardTimeSeriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7348,9 +7275,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn delete_tensorboard_time_series(
         &self,
         _req: crate::model::DeleteTensorboardTimeSeriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7359,10 +7286,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn batch_read_tensorboard_time_series_data(
         &self,
         _req: crate::model::BatchReadTensorboardTimeSeriesDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>,
+            crate::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7372,10 +7299,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn read_tensorboard_time_series_data(
         &self,
         _req: crate::model::ReadTensorboardTimeSeriesDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>,
+            crate::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7385,10 +7312,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn write_tensorboard_experiment_data(
         &self,
         _req: crate::model::WriteTensorboardExperimentDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::WriteTensorboardExperimentDataResponse>,
+            crate::Response<crate::model::WriteTensorboardExperimentDataResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7398,11 +7325,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn write_tensorboard_run_data(
         &self,
         _req: crate::model::WriteTensorboardRunDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::WriteTensorboardRunDataResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::WriteTensorboardRunDataResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7411,10 +7336,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn export_tensorboard_time_series_data(
         &self,
         _req: crate::model::ExportTensorboardTimeSeriesDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>,
+            crate::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7424,10 +7349,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7437,9 +7362,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7448,9 +7373,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7459,9 +7384,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7470,10 +7395,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7483,10 +7408,10 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7496,9 +7421,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7507,8 +7432,8 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7516,8 +7441,8 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7525,9 +7450,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7538,9 +7463,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7549,9 +7474,9 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7573,9 +7498,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn create_rag_corpus(
         &self,
         _req: crate::model::CreateRagCorpusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7584,9 +7509,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn update_rag_corpus(
         &self,
         _req: crate::model::UpdateRagCorpusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7595,10 +7520,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn get_rag_corpus(
         &self,
         _req: crate::model::GetRagCorpusRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RagCorpus>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RagCorpus>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7606,9 +7530,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn list_rag_corpora(
         &self,
         _req: crate::model::ListRagCorporaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRagCorporaResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRagCorporaResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7617,9 +7541,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn delete_rag_corpus(
         &self,
         _req: crate::model::DeleteRagCorpusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7628,9 +7552,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn upload_rag_file(
         &self,
         _req: crate::model::UploadRagFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UploadRagFileResponse>>,
+        Output = crate::Result<crate::Response<crate::model::UploadRagFileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7639,9 +7563,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn import_rag_files(
         &self,
         _req: crate::model::ImportRagFilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7650,10 +7574,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn get_rag_file(
         &self,
         _req: crate::model::GetRagFileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RagFile>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RagFile>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7661,9 +7584,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn list_rag_files(
         &self,
         _req: crate::model::ListRagFilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRagFilesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRagFilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7672,9 +7595,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn delete_rag_file(
         &self,
         _req: crate::model::DeleteRagFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7683,9 +7606,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn update_rag_engine_config(
         &self,
         _req: crate::model::UpdateRagEngineConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7694,9 +7617,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn get_rag_engine_config(
         &self,
         _req: crate::model::GetRagEngineConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RagEngineConfig>>,
+        Output = crate::Result<crate::Response<crate::model::RagEngineConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7705,10 +7628,10 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7718,9 +7641,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7729,9 +7652,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7740,9 +7663,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7751,10 +7674,10 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7764,10 +7687,10 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7777,9 +7700,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7788,8 +7711,8 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7797,8 +7720,8 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7806,9 +7729,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7819,9 +7742,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7830,9 +7753,9 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7854,9 +7777,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn retrieve_contexts(
         &self,
         _req: crate::model::RetrieveContextsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RetrieveContextsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RetrieveContextsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7865,9 +7788,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn augment_prompt(
         &self,
         _req: crate::model::AugmentPromptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AugmentPromptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AugmentPromptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7876,9 +7799,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn corroborate_content(
         &self,
         _req: crate::model::CorroborateContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CorroborateContentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CorroborateContentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7887,10 +7810,10 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7900,9 +7823,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7911,9 +7834,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7922,9 +7845,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7933,10 +7856,10 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7946,10 +7869,10 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7959,9 +7882,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7970,8 +7893,8 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7979,8 +7902,8 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7988,9 +7911,9 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8014,10 +7937,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn create_study(
         &self,
         _req: crate::model::CreateStudyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Study>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Study>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8025,10 +7947,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn get_study(
         &self,
         _req: crate::model::GetStudyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Study>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Study>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8036,9 +7957,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn list_studies(
         &self,
         _req: crate::model::ListStudiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListStudiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListStudiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8047,8 +7968,8 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn delete_study(
         &self,
         _req: crate::model::DeleteStudyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8056,10 +7977,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn lookup_study(
         &self,
         _req: crate::model::LookupStudyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Study>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Study>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8067,9 +7987,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn suggest_trials(
         &self,
         _req: crate::model::SuggestTrialsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8078,10 +7998,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn create_trial(
         &self,
         _req: crate::model::CreateTrialRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Trial>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Trial>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8089,10 +8008,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn get_trial(
         &self,
         _req: crate::model::GetTrialRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Trial>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Trial>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8100,9 +8018,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn list_trials(
         &self,
         _req: crate::model::ListTrialsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTrialsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTrialsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8111,10 +8029,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn add_trial_measurement(
         &self,
         _req: crate::model::AddTrialMeasurementRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Trial>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Trial>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8122,10 +8039,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn complete_trial(
         &self,
         _req: crate::model::CompleteTrialRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Trial>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Trial>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8133,8 +8049,8 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn delete_trial(
         &self,
         _req: crate::model::DeleteTrialRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8142,9 +8058,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn check_trial_early_stopping_state(
         &self,
         _req: crate::model::CheckTrialEarlyStoppingStateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8153,10 +8069,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn stop_trial(
         &self,
         _req: crate::model::StopTrialRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Trial>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Trial>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8164,9 +8079,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn list_optimal_trials(
         &self,
         _req: crate::model::ListOptimalTrialsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListOptimalTrialsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListOptimalTrialsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8175,10 +8090,10 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -8188,9 +8103,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8199,9 +8114,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8210,9 +8125,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8221,10 +8136,10 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -8234,10 +8149,10 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -8247,9 +8162,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8258,8 +8173,8 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8267,8 +8182,8 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8276,9 +8191,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     fn wait_operation(
         &self,
         _req: google_cloud_longrunning::model::WaitOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8289,9 +8204,9 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8300,8 +8215,8 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/aiplatform/v1/src/stub/dynamic.rs b/src/generated/cloud/aiplatform/v1/src/stub/dynamic.rs
index 7c8e12ee1c..160aa0ef68 100644
--- a/src/generated/cloud/aiplatform/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/aiplatform/v1/src/stub/dynamic.rs
@@ -21,72 +21,68 @@ pub trait DataFoundryService: std::fmt::Debug + Send + Sync {
     async fn generate_synthetic_data(
         &self,
         req: crate::model::GenerateSyntheticDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateSyntheticDataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateSyntheticDataResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::DataFoundryService] also implement [DataFoundryService].
@@ -97,8 +93,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn generate_synthetic_data(
         &self,
         req: crate::model::GenerateSyntheticDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateSyntheticDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateSyntheticDataResponse>> {
         T::generate_synthetic_data(self, req, options).await
     }
 
@@ -106,9 +102,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -116,8 +111,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -125,8 +120,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -134,8 +129,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -143,10 +138,9 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -154,10 +148,9 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -165,8 +158,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -174,8 +167,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -183,8 +176,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -192,8 +185,8 @@ impl<T: super::DataFoundryService> DataFoundryService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -205,190 +198,186 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatasetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatasetsResponse>>;
 
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_dataset_version(
         &self,
         req: crate::model::CreateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_dataset_version(
         &self,
         req: crate::model::UpdateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DatasetVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DatasetVersion>>;
 
     async fn delete_dataset_version(
         &self,
         req: crate::model::DeleteDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_dataset_version(
         &self,
         req: crate::model::GetDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DatasetVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DatasetVersion>>;
 
     async fn list_dataset_versions(
         &self,
         req: crate::model::ListDatasetVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatasetVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatasetVersionsResponse>>;
 
     async fn restore_dataset_version(
         &self,
         req: crate::model::RestoreDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_data_items(
         &self,
         req: crate::model::ListDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataItemsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataItemsResponse>>;
 
     async fn search_data_items(
         &self,
         req: crate::model::SearchDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchDataItemsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchDataItemsResponse>>;
 
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSavedQueriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSavedQueriesResponse>>;
 
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_annotation_spec(
         &self,
         req: crate::model::GetAnnotationSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnnotationSpec>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnnotationSpec>>;
 
     async fn list_annotations(
         &self,
         req: crate::model::ListAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnnotationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnnotationsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DatasetService] also implement [DatasetService].
@@ -399,8 +388,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_dataset(self, req, options).await
     }
 
@@ -408,8 +397,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::get_dataset(self, req, options).await
     }
 
@@ -417,8 +406,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::update_dataset(self, req, options).await
     }
 
@@ -426,8 +415,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatasetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatasetsResponse>> {
         T::list_datasets(self, req, options).await
     }
 
@@ -435,8 +424,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_dataset(self, req, options).await
     }
 
@@ -444,8 +433,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_data(self, req, options).await
     }
 
@@ -453,8 +442,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_data(self, req, options).await
     }
 
@@ -462,8 +451,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn create_dataset_version(
         &self,
         req: crate::model::CreateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_dataset_version(self, req, options).await
     }
 
@@ -471,8 +460,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn update_dataset_version(
         &self,
         req: crate::model::UpdateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DatasetVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DatasetVersion>> {
         T::update_dataset_version(self, req, options).await
     }
 
@@ -480,8 +469,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn delete_dataset_version(
         &self,
         req: crate::model::DeleteDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_dataset_version(self, req, options).await
     }
 
@@ -489,8 +478,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_dataset_version(
         &self,
         req: crate::model::GetDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DatasetVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DatasetVersion>> {
         T::get_dataset_version(self, req, options).await
     }
 
@@ -498,8 +487,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_dataset_versions(
         &self,
         req: crate::model::ListDatasetVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatasetVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatasetVersionsResponse>> {
         T::list_dataset_versions(self, req, options).await
     }
 
@@ -507,8 +496,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn restore_dataset_version(
         &self,
         req: crate::model::RestoreDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_dataset_version(self, req, options).await
     }
 
@@ -516,8 +505,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_data_items(
         &self,
         req: crate::model::ListDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataItemsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataItemsResponse>> {
         T::list_data_items(self, req, options).await
     }
 
@@ -525,8 +514,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn search_data_items(
         &self,
         req: crate::model::SearchDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchDataItemsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchDataItemsResponse>> {
         T::search_data_items(self, req, options).await
     }
 
@@ -534,8 +523,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSavedQueriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSavedQueriesResponse>> {
         T::list_saved_queries(self, req, options).await
     }
 
@@ -543,8 +532,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_saved_query(self, req, options).await
     }
 
@@ -552,8 +541,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_annotation_spec(
         &self,
         req: crate::model::GetAnnotationSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnnotationSpec>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnnotationSpec>> {
         T::get_annotation_spec(self, req, options).await
     }
 
@@ -561,8 +550,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_annotations(
         &self,
         req: crate::model::ListAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnnotationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnnotationsResponse>> {
         T::list_annotations(self, req, options).await
     }
 
@@ -570,9 +559,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -580,8 +568,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -589,8 +577,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -598,8 +586,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -607,10 +595,9 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -618,10 +605,9 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -629,8 +615,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -638,8 +624,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -647,8 +633,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -656,22 +642,22 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -683,112 +669,108 @@ pub trait DeploymentResourcePoolService: std::fmt::Debug + Send + Sync {
     async fn create_deployment_resource_pool(
         &self,
         req: crate::model::CreateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_deployment_resource_pool(
         &self,
         req: crate::model::GetDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeploymentResourcePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeploymentResourcePool>>;
 
     async fn list_deployment_resource_pools(
         &self,
         req: crate::model::ListDeploymentResourcePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentResourcePoolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentResourcePoolsResponse>>;
 
     async fn update_deployment_resource_pool(
         &self,
         req: crate::model::UpdateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_deployment_resource_pool(
         &self,
         req: crate::model::DeleteDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn query_deployed_models(
         &self,
         req: crate::model::QueryDeployedModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryDeployedModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryDeployedModelsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DeploymentResourcePoolService] also implement [DeploymentResourcePoolService].
@@ -799,8 +781,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn create_deployment_resource_pool(
         &self,
         req: crate::model::CreateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_deployment_resource_pool(self, req, options).await
     }
 
@@ -808,8 +790,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn get_deployment_resource_pool(
         &self,
         req: crate::model::GetDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeploymentResourcePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeploymentResourcePool>> {
         T::get_deployment_resource_pool(self, req, options).await
     }
 
@@ -817,9 +799,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn list_deployment_resource_pools(
         &self,
         req: crate::model::ListDeploymentResourcePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentResourcePoolsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentResourcePoolsResponse>> {
         T::list_deployment_resource_pools(self, req, options).await
     }
 
@@ -827,8 +808,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn update_deployment_resource_pool(
         &self,
         req: crate::model::UpdateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_deployment_resource_pool(self, req, options).await
     }
 
@@ -836,8 +817,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn delete_deployment_resource_pool(
         &self,
         req: crate::model::DeleteDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_deployment_resource_pool(self, req, options).await
     }
 
@@ -845,8 +826,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn query_deployed_models(
         &self,
         req: crate::model::QueryDeployedModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryDeployedModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryDeployedModelsResponse>> {
         T::query_deployed_models(self, req, options).await
     }
 
@@ -854,9 +835,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -864,8 +844,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -873,8 +853,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -882,8 +862,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -891,10 +871,9 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -902,10 +881,9 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -913,8 +891,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -922,8 +900,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -931,8 +909,8 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -940,22 +918,22 @@ impl<T: super::DeploymentResourcePoolService> DeploymentResourcePoolService for
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -967,130 +945,126 @@ pub trait EndpointService: std::fmt::Debug + Send + Sync {
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Endpoint>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Endpoint>>;
 
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEndpointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEndpointsResponse>>;
 
     async fn update_endpoint(
         &self,
         req: crate::model::UpdateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Endpoint>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Endpoint>>;
 
     async fn update_endpoint_long_running(
         &self,
         req: crate::model::UpdateEndpointLongRunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn deploy_model(
         &self,
         req: crate::model::DeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undeploy_model(
         &self,
         req: crate::model::UndeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn mutate_deployed_model(
         &self,
         req: crate::model::MutateDeployedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EndpointService] also implement [EndpointService].
@@ -1101,8 +1075,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_endpoint(self, req, options).await
     }
 
@@ -1110,8 +1084,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Endpoint>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Endpoint>> {
         T::get_endpoint(self, req, options).await
     }
 
@@ -1119,8 +1093,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEndpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEndpointsResponse>> {
         T::list_endpoints(self, req, options).await
     }
 
@@ -1128,8 +1102,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn update_endpoint(
         &self,
         req: crate::model::UpdateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Endpoint>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Endpoint>> {
         T::update_endpoint(self, req, options).await
     }
 
@@ -1137,8 +1111,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn update_endpoint_long_running(
         &self,
         req: crate::model::UpdateEndpointLongRunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_endpoint_long_running(self, req, options).await
     }
 
@@ -1146,8 +1120,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_endpoint(self, req, options).await
     }
 
@@ -1155,8 +1129,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn deploy_model(
         &self,
         req: crate::model::DeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy_model(self, req, options).await
     }
 
@@ -1164,8 +1138,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn undeploy_model(
         &self,
         req: crate::model::UndeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undeploy_model(self, req, options).await
     }
 
@@ -1173,8 +1147,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn mutate_deployed_model(
         &self,
         req: crate::model::MutateDeployedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::mutate_deployed_model(self, req, options).await
     }
 
@@ -1182,9 +1156,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1192,8 +1165,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1201,8 +1174,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1210,8 +1183,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1219,10 +1192,9 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1230,10 +1202,9 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1241,8 +1212,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1250,8 +1221,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1259,8 +1230,8 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -1268,22 +1239,22 @@ impl<T: super::EndpointService> EndpointService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1295,72 +1266,68 @@ pub trait EvaluationService: std::fmt::Debug + Send + Sync {
     async fn evaluate_instances(
         &self,
         req: crate::model::EvaluateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EvaluateInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EvaluateInstancesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::EvaluationService] also implement [EvaluationService].
@@ -1371,8 +1338,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn evaluate_instances(
         &self,
         req: crate::model::EvaluateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EvaluateInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EvaluateInstancesResponse>> {
         T::evaluate_instances(self, req, options).await
     }
 
@@ -1380,9 +1347,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1390,8 +1356,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1399,8 +1365,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1408,8 +1374,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1417,10 +1383,9 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1428,10 +1393,9 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1439,8 +1403,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1448,8 +1412,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1457,8 +1421,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -1466,8 +1430,8 @@ impl<T: super::EvaluationService> EvaluationService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -1479,154 +1443,150 @@ pub trait FeatureOnlineStoreAdminService: std::fmt::Debug + Send + Sync {
     async fn create_feature_online_store(
         &self,
         req: crate::model::CreateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_feature_online_store(
         &self,
         req: crate::model::GetFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureOnlineStore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureOnlineStore>>;
 
     async fn list_feature_online_stores(
         &self,
         req: crate::model::ListFeatureOnlineStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureOnlineStoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureOnlineStoresResponse>>;
 
     async fn update_feature_online_store(
         &self,
         req: crate::model::UpdateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_feature_online_store(
         &self,
         req: crate::model::DeleteFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_feature_view(
         &self,
         req: crate::model::CreateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_feature_view(
         &self,
         req: crate::model::GetFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureView>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureView>>;
 
     async fn list_feature_views(
         &self,
         req: crate::model::ListFeatureViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureViewsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureViewsResponse>>;
 
     async fn update_feature_view(
         &self,
         req: crate::model::UpdateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_feature_view(
         &self,
         req: crate::model::DeleteFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn sync_feature_view(
         &self,
         req: crate::model::SyncFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SyncFeatureViewResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SyncFeatureViewResponse>>;
 
     async fn get_feature_view_sync(
         &self,
         req: crate::model::GetFeatureViewSyncRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureViewSync>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureViewSync>>;
 
     async fn list_feature_view_syncs(
         &self,
         req: crate::model::ListFeatureViewSyncsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureViewSyncsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureViewSyncsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::FeatureOnlineStoreAdminService] also implement [FeatureOnlineStoreAdminService].
@@ -1637,8 +1597,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn create_feature_online_store(
         &self,
         req: crate::model::CreateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_feature_online_store(self, req, options).await
     }
 
@@ -1646,8 +1606,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn get_feature_online_store(
         &self,
         req: crate::model::GetFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureOnlineStore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureOnlineStore>> {
         T::get_feature_online_store(self, req, options).await
     }
 
@@ -1655,8 +1615,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn list_feature_online_stores(
         &self,
         req: crate::model::ListFeatureOnlineStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureOnlineStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureOnlineStoresResponse>> {
         T::list_feature_online_stores(self, req, options).await
     }
 
@@ -1664,8 +1624,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn update_feature_online_store(
         &self,
         req: crate::model::UpdateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_feature_online_store(self, req, options).await
     }
 
@@ -1673,8 +1633,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn delete_feature_online_store(
         &self,
         req: crate::model::DeleteFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature_online_store(self, req, options).await
     }
 
@@ -1682,8 +1642,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn create_feature_view(
         &self,
         req: crate::model::CreateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_feature_view(self, req, options).await
     }
 
@@ -1691,8 +1651,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn get_feature_view(
         &self,
         req: crate::model::GetFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureView>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureView>> {
         T::get_feature_view(self, req, options).await
     }
 
@@ -1700,8 +1660,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn list_feature_views(
         &self,
         req: crate::model::ListFeatureViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureViewsResponse>> {
         T::list_feature_views(self, req, options).await
     }
 
@@ -1709,8 +1669,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn update_feature_view(
         &self,
         req: crate::model::UpdateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_feature_view(self, req, options).await
     }
 
@@ -1718,8 +1678,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn delete_feature_view(
         &self,
         req: crate::model::DeleteFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature_view(self, req, options).await
     }
 
@@ -1727,8 +1687,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn sync_feature_view(
         &self,
         req: crate::model::SyncFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SyncFeatureViewResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SyncFeatureViewResponse>> {
         T::sync_feature_view(self, req, options).await
     }
 
@@ -1736,8 +1696,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn get_feature_view_sync(
         &self,
         req: crate::model::GetFeatureViewSyncRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureViewSync>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureViewSync>> {
         T::get_feature_view_sync(self, req, options).await
     }
 
@@ -1745,8 +1705,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn list_feature_view_syncs(
         &self,
         req: crate::model::ListFeatureViewSyncsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureViewSyncsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureViewSyncsResponse>> {
         T::list_feature_view_syncs(self, req, options).await
     }
 
@@ -1754,9 +1714,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1764,8 +1723,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1773,8 +1732,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1782,8 +1741,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1791,10 +1750,9 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1802,10 +1760,9 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1813,8 +1770,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1822,8 +1779,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1831,8 +1788,8 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -1840,22 +1797,22 @@ impl<T: super::FeatureOnlineStoreAdminService> FeatureOnlineStoreAdminService fo
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1867,84 +1824,80 @@ pub trait FeatureOnlineStoreService: std::fmt::Debug + Send + Sync {
     async fn fetch_feature_values(
         &self,
         req: crate::model::FetchFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchFeatureValuesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchFeatureValuesResponse>>;
 
     async fn search_nearest_entities(
         &self,
         req: crate::model::SearchNearestEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchNearestEntitiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchNearestEntitiesResponse>>;
 
     async fn generate_fetch_access_token(
         &self,
         req: crate::model::GenerateFetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateFetchAccessTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateFetchAccessTokenResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::FeatureOnlineStoreService] also implement [FeatureOnlineStoreService].
@@ -1955,8 +1908,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn fetch_feature_values(
         &self,
         req: crate::model::FetchFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchFeatureValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchFeatureValuesResponse>> {
         T::fetch_feature_values(self, req, options).await
     }
 
@@ -1964,8 +1917,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn search_nearest_entities(
         &self,
         req: crate::model::SearchNearestEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchNearestEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchNearestEntitiesResponse>> {
         T::search_nearest_entities(self, req, options).await
     }
 
@@ -1973,9 +1926,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn generate_fetch_access_token(
         &self,
         req: crate::model::GenerateFetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateFetchAccessTokenResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateFetchAccessTokenResponse>> {
         T::generate_fetch_access_token(self, req, options).await
     }
 
@@ -1983,9 +1935,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1993,8 +1944,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2002,8 +1953,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -2011,8 +1962,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -2020,10 +1971,9 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2031,10 +1981,9 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2042,8 +1991,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2051,8 +2000,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2060,8 +2009,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -2069,8 +2018,8 @@ impl<T: super::FeatureOnlineStoreService> FeatureOnlineStoreService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -2082,142 +2031,138 @@ pub trait FeatureRegistryService: std::fmt::Debug + Send + Sync {
     async fn create_feature_group(
         &self,
         req: crate::model::CreateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_feature_group(
         &self,
         req: crate::model::GetFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureGroup>>;
 
     async fn list_feature_groups(
         &self,
         req: crate::model::ListFeatureGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureGroupsResponse>>;
 
     async fn update_feature_group(
         &self,
         req: crate::model::UpdateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_feature_group(
         &self,
         req: crate::model::DeleteFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>>;
 
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturesResponse>>;
 
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::FeatureRegistryService] also implement [FeatureRegistryService].
@@ -2228,8 +2173,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn create_feature_group(
         &self,
         req: crate::model::CreateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_feature_group(self, req, options).await
     }
 
@@ -2237,8 +2182,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn get_feature_group(
         &self,
         req: crate::model::GetFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeatureGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeatureGroup>> {
         T::get_feature_group(self, req, options).await
     }
 
@@ -2246,8 +2191,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn list_feature_groups(
         &self,
         req: crate::model::ListFeatureGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeatureGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeatureGroupsResponse>> {
         T::list_feature_groups(self, req, options).await
     }
 
@@ -2255,8 +2200,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn update_feature_group(
         &self,
         req: crate::model::UpdateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_feature_group(self, req, options).await
     }
 
@@ -2264,8 +2209,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn delete_feature_group(
         &self,
         req: crate::model::DeleteFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature_group(self, req, options).await
     }
 
@@ -2273,8 +2218,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_feature(self, req, options).await
     }
 
@@ -2282,8 +2227,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_create_features(self, req, options).await
     }
 
@@ -2291,8 +2236,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>> {
         T::get_feature(self, req, options).await
     }
 
@@ -2300,8 +2245,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturesResponse>> {
         T::list_features(self, req, options).await
     }
 
@@ -2309,8 +2254,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_feature(self, req, options).await
     }
 
@@ -2318,8 +2263,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature(self, req, options).await
     }
 
@@ -2327,9 +2272,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2337,8 +2281,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2346,8 +2290,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -2355,8 +2299,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -2364,10 +2308,9 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2375,10 +2318,9 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2386,8 +2328,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2395,8 +2337,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2404,8 +2346,8 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -2413,22 +2355,22 @@ impl<T: super::FeatureRegistryService> FeatureRegistryService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2440,78 +2382,74 @@ pub trait FeaturestoreOnlineServingService: std::fmt::Debug + Send + Sync {
     async fn read_feature_values(
         &self,
         req: crate::model::ReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadFeatureValuesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadFeatureValuesResponse>>;
 
     async fn write_feature_values(
         &self,
         req: crate::model::WriteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteFeatureValuesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteFeatureValuesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::FeaturestoreOnlineServingService] also implement [FeaturestoreOnlineServingService].
@@ -2522,8 +2460,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn read_feature_values(
         &self,
         req: crate::model::ReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadFeatureValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadFeatureValuesResponse>> {
         T::read_feature_values(self, req, options).await
     }
 
@@ -2531,8 +2469,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn write_feature_values(
         &self,
         req: crate::model::WriteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteFeatureValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteFeatureValuesResponse>> {
         T::write_feature_values(self, req, options).await
     }
 
@@ -2540,9 +2478,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2550,8 +2487,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2559,8 +2496,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -2568,8 +2505,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -2577,10 +2514,9 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2588,10 +2524,9 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2599,8 +2534,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2608,8 +2543,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2617,8 +2552,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -2626,8 +2561,8 @@ impl<T: super::FeaturestoreOnlineServingService> FeaturestoreOnlineServingServic
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -2639,202 +2574,198 @@ pub trait FeaturestoreService: std::fmt::Debug + Send + Sync {
     async fn create_featurestore(
         &self,
         req: crate::model::CreateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_featurestore(
         &self,
         req: crate::model::GetFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Featurestore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Featurestore>>;
 
     async fn list_featurestores(
         &self,
         req: crate::model::ListFeaturestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturestoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturestoresResponse>>;
 
     async fn update_featurestore(
         &self,
         req: crate::model::UpdateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_featurestore(
         &self,
         req: crate::model::DeleteFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntityTypesResponse>>;
 
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>>;
 
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturesResponse>>;
 
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>>;
 
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_feature_values(
         &self,
         req: crate::model::ImportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_read_feature_values(
         &self,
         req: crate::model::BatchReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_feature_values(
         &self,
         req: crate::model::ExportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_feature_values(
         &self,
         req: crate::model::DeleteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn search_features(
         &self,
         req: crate::model::SearchFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchFeaturesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchFeaturesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::FeaturestoreService] also implement [FeaturestoreService].
@@ -2845,8 +2776,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn create_featurestore(
         &self,
         req: crate::model::CreateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_featurestore(self, req, options).await
     }
 
@@ -2854,8 +2785,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn get_featurestore(
         &self,
         req: crate::model::GetFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Featurestore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Featurestore>> {
         T::get_featurestore(self, req, options).await
     }
 
@@ -2863,8 +2794,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn list_featurestores(
         &self,
         req: crate::model::ListFeaturestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturestoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturestoresResponse>> {
         T::list_featurestores(self, req, options).await
     }
 
@@ -2872,8 +2803,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn update_featurestore(
         &self,
         req: crate::model::UpdateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_featurestore(self, req, options).await
     }
 
@@ -2881,8 +2812,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn delete_featurestore(
         &self,
         req: crate::model::DeleteFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_featurestore(self, req, options).await
     }
 
@@ -2890,8 +2821,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_entity_type(self, req, options).await
     }
 
@@ -2899,8 +2830,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::get_entity_type(self, req, options).await
     }
 
@@ -2908,8 +2839,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         T::list_entity_types(self, req, options).await
     }
 
@@ -2917,8 +2848,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::update_entity_type(self, req, options).await
     }
 
@@ -2926,8 +2857,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_entity_type(self, req, options).await
     }
 
@@ -2935,8 +2866,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_feature(self, req, options).await
     }
 
@@ -2944,8 +2875,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_create_features(self, req, options).await
     }
 
@@ -2953,8 +2884,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>> {
         T::get_feature(self, req, options).await
     }
 
@@ -2962,8 +2893,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturesResponse>> {
         T::list_features(self, req, options).await
     }
 
@@ -2971,8 +2902,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>> {
         T::update_feature(self, req, options).await
     }
 
@@ -2980,8 +2911,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature(self, req, options).await
     }
 
@@ -2989,8 +2920,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn import_feature_values(
         &self,
         req: crate::model::ImportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_feature_values(self, req, options).await
     }
 
@@ -2998,8 +2929,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn batch_read_feature_values(
         &self,
         req: crate::model::BatchReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_read_feature_values(self, req, options).await
     }
 
@@ -3007,8 +2938,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn export_feature_values(
         &self,
         req: crate::model::ExportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_feature_values(self, req, options).await
     }
 
@@ -3016,8 +2947,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn delete_feature_values(
         &self,
         req: crate::model::DeleteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature_values(self, req, options).await
     }
 
@@ -3025,8 +2956,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn search_features(
         &self,
         req: crate::model::SearchFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchFeaturesResponse>> {
         T::search_features(self, req, options).await
     }
 
@@ -3034,9 +2965,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3044,8 +2974,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3053,8 +2983,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -3062,8 +2992,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -3071,10 +3001,9 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3082,10 +3011,9 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3093,8 +3021,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3102,8 +3030,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -3111,8 +3039,8 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -3120,22 +3048,22 @@ impl<T: super::FeaturestoreService> FeaturestoreService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3147,96 +3075,92 @@ pub trait GenAiCacheService: std::fmt::Debug + Send + Sync {
     async fn create_cached_content(
         &self,
         req: crate::model::CreateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CachedContent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CachedContent>>;
 
     async fn get_cached_content(
         &self,
         req: crate::model::GetCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CachedContent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CachedContent>>;
 
     async fn update_cached_content(
         &self,
         req: crate::model::UpdateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CachedContent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CachedContent>>;
 
     async fn delete_cached_content(
         &self,
         req: crate::model::DeleteCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_cached_contents(
         &self,
         req: crate::model::ListCachedContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCachedContentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCachedContentsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::GenAiCacheService] also implement [GenAiCacheService].
@@ -3247,8 +3171,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn create_cached_content(
         &self,
         req: crate::model::CreateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CachedContent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CachedContent>> {
         T::create_cached_content(self, req, options).await
     }
 
@@ -3256,8 +3180,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn get_cached_content(
         &self,
         req: crate::model::GetCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CachedContent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CachedContent>> {
         T::get_cached_content(self, req, options).await
     }
 
@@ -3265,8 +3189,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn update_cached_content(
         &self,
         req: crate::model::UpdateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CachedContent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CachedContent>> {
         T::update_cached_content(self, req, options).await
     }
 
@@ -3274,8 +3198,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn delete_cached_content(
         &self,
         req: crate::model::DeleteCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_cached_content(self, req, options).await
     }
 
@@ -3283,8 +3207,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn list_cached_contents(
         &self,
         req: crate::model::ListCachedContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCachedContentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCachedContentsResponse>> {
         T::list_cached_contents(self, req, options).await
     }
 
@@ -3292,9 +3216,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3302,8 +3225,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3311,8 +3234,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -3320,8 +3243,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -3329,10 +3252,9 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3340,10 +3262,9 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3351,8 +3272,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3360,8 +3281,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -3369,8 +3290,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -3378,8 +3299,8 @@ impl<T: super::GenAiCacheService> GenAiCacheService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -3391,106 +3312,102 @@ pub trait GenAiTuningService: std::fmt::Debug + Send + Sync {
     async fn create_tuning_job(
         &self,
         req: crate::model::CreateTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TuningJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TuningJob>>;
 
     async fn get_tuning_job(
         &self,
         req: crate::model::GetTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TuningJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TuningJob>>;
 
     async fn list_tuning_jobs(
         &self,
         req: crate::model::ListTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTuningJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTuningJobsResponse>>;
 
     async fn cancel_tuning_job(
         &self,
         req: crate::model::CancelTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn rebase_tuned_model(
         &self,
         req: crate::model::RebaseTunedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GenAiTuningService] also implement [GenAiTuningService].
@@ -3501,8 +3418,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn create_tuning_job(
         &self,
         req: crate::model::CreateTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TuningJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TuningJob>> {
         T::create_tuning_job(self, req, options).await
     }
 
@@ -3510,8 +3427,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn get_tuning_job(
         &self,
         req: crate::model::GetTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TuningJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TuningJob>> {
         T::get_tuning_job(self, req, options).await
     }
 
@@ -3519,8 +3436,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn list_tuning_jobs(
         &self,
         req: crate::model::ListTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTuningJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTuningJobsResponse>> {
         T::list_tuning_jobs(self, req, options).await
     }
 
@@ -3528,8 +3445,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn cancel_tuning_job(
         &self,
         req: crate::model::CancelTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_tuning_job(self, req, options).await
     }
 
@@ -3537,8 +3454,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn rebase_tuned_model(
         &self,
         req: crate::model::RebaseTunedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::rebase_tuned_model(self, req, options).await
     }
 
@@ -3546,9 +3463,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3556,8 +3472,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3565,8 +3481,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -3574,8 +3490,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -3583,10 +3499,9 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3594,10 +3509,9 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3605,8 +3519,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3614,8 +3528,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -3623,8 +3537,8 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -3632,22 +3546,22 @@ impl<T: super::GenAiTuningService> GenAiTuningService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3659,124 +3573,120 @@ pub trait IndexEndpointService: std::fmt::Debug + Send + Sync {
     async fn create_index_endpoint(
         &self,
         req: crate::model::CreateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_index_endpoint(
         &self,
         req: crate::model::GetIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IndexEndpoint>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IndexEndpoint>>;
 
     async fn list_index_endpoints(
         &self,
         req: crate::model::ListIndexEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIndexEndpointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIndexEndpointsResponse>>;
 
     async fn update_index_endpoint(
         &self,
         req: crate::model::UpdateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IndexEndpoint>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IndexEndpoint>>;
 
     async fn delete_index_endpoint(
         &self,
         req: crate::model::DeleteIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn deploy_index(
         &self,
         req: crate::model::DeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undeploy_index(
         &self,
         req: crate::model::UndeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn mutate_deployed_index(
         &self,
         req: crate::model::MutateDeployedIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::IndexEndpointService] also implement [IndexEndpointService].
@@ -3787,8 +3697,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn create_index_endpoint(
         &self,
         req: crate::model::CreateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_index_endpoint(self, req, options).await
     }
 
@@ -3796,8 +3706,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn get_index_endpoint(
         &self,
         req: crate::model::GetIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IndexEndpoint>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IndexEndpoint>> {
         T::get_index_endpoint(self, req, options).await
     }
 
@@ -3805,8 +3715,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn list_index_endpoints(
         &self,
         req: crate::model::ListIndexEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIndexEndpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIndexEndpointsResponse>> {
         T::list_index_endpoints(self, req, options).await
     }
 
@@ -3814,8 +3724,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn update_index_endpoint(
         &self,
         req: crate::model::UpdateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IndexEndpoint>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IndexEndpoint>> {
         T::update_index_endpoint(self, req, options).await
     }
 
@@ -3823,8 +3733,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn delete_index_endpoint(
         &self,
         req: crate::model::DeleteIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_index_endpoint(self, req, options).await
     }
 
@@ -3832,8 +3742,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn deploy_index(
         &self,
         req: crate::model::DeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy_index(self, req, options).await
     }
 
@@ -3841,8 +3751,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn undeploy_index(
         &self,
         req: crate::model::UndeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undeploy_index(self, req, options).await
     }
 
@@ -3850,8 +3760,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn mutate_deployed_index(
         &self,
         req: crate::model::MutateDeployedIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::mutate_deployed_index(self, req, options).await
     }
 
@@ -3859,9 +3769,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3869,8 +3778,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3878,8 +3787,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -3887,8 +3796,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -3896,10 +3805,9 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3907,10 +3815,9 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3918,8 +3825,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3927,8 +3834,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -3936,8 +3843,8 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -3945,22 +3852,22 @@ impl<T: super::IndexEndpointService> IndexEndpointService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3972,118 +3879,114 @@ pub trait IndexService: std::fmt::Debug + Send + Sync {
     async fn create_index(
         &self,
         req: crate::model::CreateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_index(
         &self,
         req: crate::model::GetIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Index>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Index>>;
 
     async fn list_indexes(
         &self,
         req: crate::model::ListIndexesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIndexesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIndexesResponse>>;
 
     async fn update_index(
         &self,
         req: crate::model::UpdateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_index(
         &self,
         req: crate::model::DeleteIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn upsert_datapoints(
         &self,
         req: crate::model::UpsertDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UpsertDatapointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UpsertDatapointsResponse>>;
 
     async fn remove_datapoints(
         &self,
         req: crate::model::RemoveDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveDatapointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveDatapointsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::IndexService] also implement [IndexService].
@@ -4094,8 +3997,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn create_index(
         &self,
         req: crate::model::CreateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_index(self, req, options).await
     }
 
@@ -4103,8 +4006,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn get_index(
         &self,
         req: crate::model::GetIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Index>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Index>> {
         T::get_index(self, req, options).await
     }
 
@@ -4112,8 +4015,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn list_indexes(
         &self,
         req: crate::model::ListIndexesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIndexesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIndexesResponse>> {
         T::list_indexes(self, req, options).await
     }
 
@@ -4121,8 +4024,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn update_index(
         &self,
         req: crate::model::UpdateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_index(self, req, options).await
     }
 
@@ -4130,8 +4033,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn delete_index(
         &self,
         req: crate::model::DeleteIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_index(self, req, options).await
     }
 
@@ -4139,8 +4042,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn upsert_datapoints(
         &self,
         req: crate::model::UpsertDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UpsertDatapointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UpsertDatapointsResponse>> {
         T::upsert_datapoints(self, req, options).await
     }
 
@@ -4148,8 +4051,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn remove_datapoints(
         &self,
         req: crate::model::RemoveDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveDatapointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveDatapointsResponse>> {
         T::remove_datapoints(self, req, options).await
     }
 
@@ -4157,9 +4060,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -4167,8 +4069,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -4176,8 +4078,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -4185,8 +4087,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -4194,10 +4096,9 @@ impl<T: super::IndexService> IndexService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -4205,10 +4106,9 @@ impl<T: super::IndexService> IndexService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -4216,8 +4116,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -4225,8 +4125,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -4234,8 +4134,8 @@ impl<T: super::IndexService> IndexService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -4243,22 +4143,22 @@ impl<T: super::IndexService> IndexService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -4270,292 +4170,284 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     async fn create_custom_job(
         &self,
         req: crate::model::CreateCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CustomJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CustomJob>>;
 
     async fn get_custom_job(
         &self,
         req: crate::model::GetCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CustomJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CustomJob>>;
 
     async fn list_custom_jobs(
         &self,
         req: crate::model::ListCustomJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomJobsResponse>>;
 
     async fn delete_custom_job(
         &self,
         req: crate::model::DeleteCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_custom_job(
         &self,
         req: crate::model::CancelCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_data_labeling_job(
         &self,
         req: crate::model::CreateDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataLabelingJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataLabelingJob>>;
 
     async fn get_data_labeling_job(
         &self,
         req: crate::model::GetDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataLabelingJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataLabelingJob>>;
 
     async fn list_data_labeling_jobs(
         &self,
         req: crate::model::ListDataLabelingJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataLabelingJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataLabelingJobsResponse>>;
 
     async fn delete_data_labeling_job(
         &self,
         req: crate::model::DeleteDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_data_labeling_job(
         &self,
         req: crate::model::CancelDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_hyperparameter_tuning_job(
         &self,
         req: crate::model::CreateHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HyperparameterTuningJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HyperparameterTuningJob>>;
 
     async fn get_hyperparameter_tuning_job(
         &self,
         req: crate::model::GetHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HyperparameterTuningJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HyperparameterTuningJob>>;
 
     async fn list_hyperparameter_tuning_jobs(
         &self,
         req: crate::model::ListHyperparameterTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHyperparameterTuningJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHyperparameterTuningJobsResponse>>;
 
     async fn delete_hyperparameter_tuning_job(
         &self,
         req: crate::model::DeleteHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_hyperparameter_tuning_job(
         &self,
         req: crate::model::CancelHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_nas_job(
         &self,
         req: crate::model::CreateNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NasJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NasJob>>;
 
     async fn get_nas_job(
         &self,
         req: crate::model::GetNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NasJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NasJob>>;
 
     async fn list_nas_jobs(
         &self,
         req: crate::model::ListNasJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNasJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNasJobsResponse>>;
 
     async fn delete_nas_job(
         &self,
         req: crate::model::DeleteNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_nas_job(
         &self,
         req: crate::model::CancelNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_nas_trial_detail(
         &self,
         req: crate::model::GetNasTrialDetailRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NasTrialDetail>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NasTrialDetail>>;
 
     async fn list_nas_trial_details(
         &self,
         req: crate::model::ListNasTrialDetailsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNasTrialDetailsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNasTrialDetailsResponse>>;
 
     async fn create_batch_prediction_job(
         &self,
         req: crate::model::CreateBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchPredictionJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchPredictionJob>>;
 
     async fn get_batch_prediction_job(
         &self,
         req: crate::model::GetBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchPredictionJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchPredictionJob>>;
 
     async fn list_batch_prediction_jobs(
         &self,
         req: crate::model::ListBatchPredictionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBatchPredictionJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBatchPredictionJobsResponse>>;
 
     async fn delete_batch_prediction_job(
         &self,
         req: crate::model::DeleteBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_batch_prediction_job(
         &self,
         req: crate::model::CancelBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_model_deployment_monitoring_job(
         &self,
         req: crate::model::CreateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>>;
 
     async fn search_model_deployment_monitoring_stats_anomalies(
         &self,
         req: crate::model::SearchModelDeploymentMonitoringStatsAnomaliesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-        >,
+        crate::Response<crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse>,
     >;
 
     async fn get_model_deployment_monitoring_job(
         &self,
         req: crate::model::GetModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>>;
 
     async fn list_model_deployment_monitoring_jobs(
         &self,
         req: crate::model::ListModelDeploymentMonitoringJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>>;
 
     async fn update_model_deployment_monitoring_job(
         &self,
         req: crate::model::UpdateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_model_deployment_monitoring_job(
         &self,
         req: crate::model::DeleteModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn pause_model_deployment_monitoring_job(
         &self,
         req: crate::model::PauseModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn resume_model_deployment_monitoring_job(
         &self,
         req: crate::model::ResumeModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::JobService] also implement [JobService].
@@ -4566,8 +4458,8 @@ impl<T: super::JobService> JobService for T {
     async fn create_custom_job(
         &self,
         req: crate::model::CreateCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CustomJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CustomJob>> {
         T::create_custom_job(self, req, options).await
     }
 
@@ -4575,8 +4467,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_custom_job(
         &self,
         req: crate::model::GetCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CustomJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CustomJob>> {
         T::get_custom_job(self, req, options).await
     }
 
@@ -4584,8 +4476,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_custom_jobs(
         &self,
         req: crate::model::ListCustomJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomJobsResponse>> {
         T::list_custom_jobs(self, req, options).await
     }
 
@@ -4593,8 +4485,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_custom_job(
         &self,
         req: crate::model::DeleteCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_custom_job(self, req, options).await
     }
 
@@ -4602,8 +4494,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_custom_job(
         &self,
         req: crate::model::CancelCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_custom_job(self, req, options).await
     }
 
@@ -4611,8 +4503,8 @@ impl<T: super::JobService> JobService for T {
     async fn create_data_labeling_job(
         &self,
         req: crate::model::CreateDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataLabelingJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataLabelingJob>> {
         T::create_data_labeling_job(self, req, options).await
     }
 
@@ -4620,8 +4512,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_data_labeling_job(
         &self,
         req: crate::model::GetDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataLabelingJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataLabelingJob>> {
         T::get_data_labeling_job(self, req, options).await
     }
 
@@ -4629,8 +4521,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_data_labeling_jobs(
         &self,
         req: crate::model::ListDataLabelingJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataLabelingJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataLabelingJobsResponse>> {
         T::list_data_labeling_jobs(self, req, options).await
     }
 
@@ -4638,8 +4530,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_data_labeling_job(
         &self,
         req: crate::model::DeleteDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_data_labeling_job(self, req, options).await
     }
 
@@ -4647,8 +4539,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_data_labeling_job(
         &self,
         req: crate::model::CancelDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_data_labeling_job(self, req, options).await
     }
 
@@ -4656,8 +4548,8 @@ impl<T: super::JobService> JobService for T {
     async fn create_hyperparameter_tuning_job(
         &self,
         req: crate::model::CreateHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HyperparameterTuningJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HyperparameterTuningJob>> {
         T::create_hyperparameter_tuning_job(self, req, options).await
     }
 
@@ -4665,8 +4557,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_hyperparameter_tuning_job(
         &self,
         req: crate::model::GetHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HyperparameterTuningJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HyperparameterTuningJob>> {
         T::get_hyperparameter_tuning_job(self, req, options).await
     }
 
@@ -4674,9 +4566,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_hyperparameter_tuning_jobs(
         &self,
         req: crate::model::ListHyperparameterTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHyperparameterTuningJobsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHyperparameterTuningJobsResponse>> {
         T::list_hyperparameter_tuning_jobs(self, req, options).await
     }
 
@@ -4684,8 +4575,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_hyperparameter_tuning_job(
         &self,
         req: crate::model::DeleteHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_hyperparameter_tuning_job(self, req, options).await
     }
 
@@ -4693,8 +4584,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_hyperparameter_tuning_job(
         &self,
         req: crate::model::CancelHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_hyperparameter_tuning_job(self, req, options).await
     }
 
@@ -4702,8 +4593,8 @@ impl<T: super::JobService> JobService for T {
     async fn create_nas_job(
         &self,
         req: crate::model::CreateNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NasJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NasJob>> {
         T::create_nas_job(self, req, options).await
     }
 
@@ -4711,8 +4602,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_nas_job(
         &self,
         req: crate::model::GetNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NasJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NasJob>> {
         T::get_nas_job(self, req, options).await
     }
 
@@ -4720,8 +4611,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_nas_jobs(
         &self,
         req: crate::model::ListNasJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNasJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNasJobsResponse>> {
         T::list_nas_jobs(self, req, options).await
     }
 
@@ -4729,8 +4620,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_nas_job(
         &self,
         req: crate::model::DeleteNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_nas_job(self, req, options).await
     }
 
@@ -4738,8 +4629,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_nas_job(
         &self,
         req: crate::model::CancelNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_nas_job(self, req, options).await
     }
 
@@ -4747,8 +4638,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_nas_trial_detail(
         &self,
         req: crate::model::GetNasTrialDetailRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NasTrialDetail>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NasTrialDetail>> {
         T::get_nas_trial_detail(self, req, options).await
     }
 
@@ -4756,8 +4647,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_nas_trial_details(
         &self,
         req: crate::model::ListNasTrialDetailsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNasTrialDetailsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNasTrialDetailsResponse>> {
         T::list_nas_trial_details(self, req, options).await
     }
 
@@ -4765,8 +4656,8 @@ impl<T: super::JobService> JobService for T {
     async fn create_batch_prediction_job(
         &self,
         req: crate::model::CreateBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchPredictionJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchPredictionJob>> {
         T::create_batch_prediction_job(self, req, options).await
     }
 
@@ -4774,8 +4665,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_batch_prediction_job(
         &self,
         req: crate::model::GetBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchPredictionJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchPredictionJob>> {
         T::get_batch_prediction_job(self, req, options).await
     }
 
@@ -4783,8 +4674,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_batch_prediction_jobs(
         &self,
         req: crate::model::ListBatchPredictionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBatchPredictionJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBatchPredictionJobsResponse>> {
         T::list_batch_prediction_jobs(self, req, options).await
     }
 
@@ -4792,8 +4683,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_batch_prediction_job(
         &self,
         req: crate::model::DeleteBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_batch_prediction_job(self, req, options).await
     }
 
@@ -4801,8 +4692,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_batch_prediction_job(
         &self,
         req: crate::model::CancelBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_batch_prediction_job(self, req, options).await
     }
 
@@ -4810,8 +4701,8 @@ impl<T: super::JobService> JobService for T {
     async fn create_model_deployment_monitoring_job(
         &self,
         req: crate::model::CreateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>> {
         T::create_model_deployment_monitoring_job(self, req, options).await
     }
 
@@ -4819,11 +4710,9 @@ impl<T: super::JobService> JobService for T {
     async fn search_model_deployment_monitoring_stats_anomalies(
         &self,
         req: crate::model::SearchModelDeploymentMonitoringStatsAnomaliesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-        >,
+        crate::Response<crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse>,
     > {
         T::search_model_deployment_monitoring_stats_anomalies(self, req, options).await
     }
@@ -4832,8 +4721,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_model_deployment_monitoring_job(
         &self,
         req: crate::model::GetModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>> {
         T::get_model_deployment_monitoring_job(self, req, options).await
     }
 
@@ -4841,10 +4730,9 @@ impl<T: super::JobService> JobService for T {
     async fn list_model_deployment_monitoring_jobs(
         &self,
         req: crate::model::ListModelDeploymentMonitoringJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>>
+    {
         T::list_model_deployment_monitoring_jobs(self, req, options).await
     }
 
@@ -4852,8 +4740,8 @@ impl<T: super::JobService> JobService for T {
     async fn update_model_deployment_monitoring_job(
         &self,
         req: crate::model::UpdateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_model_deployment_monitoring_job(self, req, options).await
     }
 
@@ -4861,8 +4749,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_model_deployment_monitoring_job(
         &self,
         req: crate::model::DeleteModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_model_deployment_monitoring_job(self, req, options).await
     }
 
@@ -4870,8 +4758,8 @@ impl<T: super::JobService> JobService for T {
     async fn pause_model_deployment_monitoring_job(
         &self,
         req: crate::model::PauseModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::pause_model_deployment_monitoring_job(self, req, options).await
     }
 
@@ -4879,8 +4767,8 @@ impl<T: super::JobService> JobService for T {
     async fn resume_model_deployment_monitoring_job(
         &self,
         req: crate::model::ResumeModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::resume_model_deployment_monitoring_job(self, req, options).await
     }
 
@@ -4888,9 +4776,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -4898,8 +4785,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -4907,8 +4794,8 @@ impl<T: super::JobService> JobService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -4916,8 +4803,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -4925,10 +4812,9 @@ impl<T: super::JobService> JobService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -4936,10 +4822,9 @@ impl<T: super::JobService> JobService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -4947,8 +4832,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -4956,8 +4841,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -4965,8 +4850,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -4974,22 +4859,22 @@ impl<T: super::JobService> JobService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -5001,78 +4886,74 @@ pub trait LlmUtilityService: std::fmt::Debug + Send + Sync {
     async fn count_tokens(
         &self,
         req: crate::model::CountTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CountTokensResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CountTokensResponse>>;
 
     async fn compute_tokens(
         &self,
         req: crate::model::ComputeTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ComputeTokensResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ComputeTokensResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::LlmUtilityService] also implement [LlmUtilityService].
@@ -5083,8 +4964,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn count_tokens(
         &self,
         req: crate::model::CountTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CountTokensResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CountTokensResponse>> {
         T::count_tokens(self, req, options).await
     }
 
@@ -5092,8 +4973,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn compute_tokens(
         &self,
         req: crate::model::ComputeTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ComputeTokensResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ComputeTokensResponse>> {
         T::compute_tokens(self, req, options).await
     }
 
@@ -5101,9 +4982,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -5111,8 +4991,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -5120,8 +5000,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -5129,8 +5009,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -5138,10 +5018,9 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -5149,10 +5028,9 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -5160,8 +5038,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -5169,8 +5047,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -5178,8 +5056,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -5187,8 +5065,8 @@ impl<T: super::LlmUtilityService> LlmUtilityService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -5200,78 +5078,74 @@ pub trait MatchService: std::fmt::Debug + Send + Sync {
     async fn find_neighbors(
         &self,
         req: crate::model::FindNeighborsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FindNeighborsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FindNeighborsResponse>>;
 
     async fn read_index_datapoints(
         &self,
         req: crate::model::ReadIndexDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadIndexDatapointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadIndexDatapointsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::MatchService] also implement [MatchService].
@@ -5282,8 +5156,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn find_neighbors(
         &self,
         req: crate::model::FindNeighborsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FindNeighborsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FindNeighborsResponse>> {
         T::find_neighbors(self, req, options).await
     }
 
@@ -5291,8 +5165,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn read_index_datapoints(
         &self,
         req: crate::model::ReadIndexDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadIndexDatapointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadIndexDatapointsResponse>> {
         T::read_index_datapoints(self, req, options).await
     }
 
@@ -5300,9 +5174,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -5310,8 +5183,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -5319,8 +5192,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -5328,8 +5201,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -5337,10 +5210,9 @@ impl<T: super::MatchService> MatchService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -5348,10 +5220,9 @@ impl<T: super::MatchService> MatchService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -5359,8 +5230,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -5368,8 +5239,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -5377,8 +5248,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -5386,8 +5257,8 @@ impl<T: super::MatchService> MatchService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -5399,270 +5270,264 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     async fn create_metadata_store(
         &self,
         req: crate::model::CreateMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_metadata_store(
         &self,
         req: crate::model::GetMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataStore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataStore>>;
 
     async fn list_metadata_stores(
         &self,
         req: crate::model::ListMetadataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataStoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataStoresResponse>>;
 
     async fn delete_metadata_store(
         &self,
         req: crate::model::DeleteMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_artifact(
         &self,
         req: crate::model::CreateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Artifact>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Artifact>>;
 
     async fn get_artifact(
         &self,
         req: crate::model::GetArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Artifact>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Artifact>>;
 
     async fn list_artifacts(
         &self,
         req: crate::model::ListArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListArtifactsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListArtifactsResponse>>;
 
     async fn update_artifact(
         &self,
         req: crate::model::UpdateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Artifact>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Artifact>>;
 
     async fn delete_artifact(
         &self,
         req: crate::model::DeleteArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_artifacts(
         &self,
         req: crate::model::PurgeArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContextsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContextsResponse>>;
 
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_contexts(
         &self,
         req: crate::model::PurgeContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn add_context_artifacts_and_executions(
         &self,
         req: crate::model::AddContextArtifactsAndExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::AddContextArtifactsAndExecutionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddContextArtifactsAndExecutionsResponse>>;
 
     async fn add_context_children(
         &self,
         req: crate::model::AddContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddContextChildrenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddContextChildrenResponse>>;
 
     async fn remove_context_children(
         &self,
         req: crate::model::RemoveContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveContextChildrenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveContextChildrenResponse>>;
 
     async fn query_context_lineage_subgraph(
         &self,
         req: crate::model::QueryContextLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageSubgraph>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageSubgraph>>;
 
     async fn create_execution(
         &self,
         req: crate::model::CreateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Execution>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Execution>>;
 
     async fn get_execution(
         &self,
         req: crate::model::GetExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Execution>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Execution>>;
 
     async fn list_executions(
         &self,
         req: crate::model::ListExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExecutionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExecutionsResponse>>;
 
     async fn update_execution(
         &self,
         req: crate::model::UpdateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Execution>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Execution>>;
 
     async fn delete_execution(
         &self,
         req: crate::model::DeleteExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_executions(
         &self,
         req: crate::model::PurgeExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn add_execution_events(
         &self,
         req: crate::model::AddExecutionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddExecutionEventsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddExecutionEventsResponse>>;
 
     async fn query_execution_inputs_and_outputs(
         &self,
         req: crate::model::QueryExecutionInputsAndOutputsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageSubgraph>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageSubgraph>>;
 
     async fn create_metadata_schema(
         &self,
         req: crate::model::CreateMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataSchema>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataSchema>>;
 
     async fn get_metadata_schema(
         &self,
         req: crate::model::GetMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataSchema>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataSchema>>;
 
     async fn list_metadata_schemas(
         &self,
         req: crate::model::ListMetadataSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataSchemasResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataSchemasResponse>>;
 
     async fn query_artifact_lineage_subgraph(
         &self,
         req: crate::model::QueryArtifactLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageSubgraph>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageSubgraph>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::MetadataService] also implement [MetadataService].
@@ -5673,8 +5538,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_metadata_store(
         &self,
         req: crate::model::CreateMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_metadata_store(self, req, options).await
     }
 
@@ -5682,8 +5547,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_metadata_store(
         &self,
         req: crate::model::GetMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataStore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataStore>> {
         T::get_metadata_store(self, req, options).await
     }
 
@@ -5691,8 +5556,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_metadata_stores(
         &self,
         req: crate::model::ListMetadataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataStoresResponse>> {
         T::list_metadata_stores(self, req, options).await
     }
 
@@ -5700,8 +5565,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_metadata_store(
         &self,
         req: crate::model::DeleteMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_metadata_store(self, req, options).await
     }
 
@@ -5709,8 +5574,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_artifact(
         &self,
         req: crate::model::CreateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Artifact>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Artifact>> {
         T::create_artifact(self, req, options).await
     }
 
@@ -5718,8 +5583,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_artifact(
         &self,
         req: crate::model::GetArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Artifact>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Artifact>> {
         T::get_artifact(self, req, options).await
     }
 
@@ -5727,8 +5592,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_artifacts(
         &self,
         req: crate::model::ListArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListArtifactsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListArtifactsResponse>> {
         T::list_artifacts(self, req, options).await
     }
 
@@ -5736,8 +5601,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn update_artifact(
         &self,
         req: crate::model::UpdateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Artifact>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Artifact>> {
         T::update_artifact(self, req, options).await
     }
 
@@ -5745,8 +5610,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_artifact(
         &self,
         req: crate::model::DeleteArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_artifact(self, req, options).await
     }
 
@@ -5754,8 +5619,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn purge_artifacts(
         &self,
         req: crate::model::PurgeArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_artifacts(self, req, options).await
     }
 
@@ -5763,8 +5628,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::create_context(self, req, options).await
     }
 
@@ -5772,8 +5637,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::get_context(self, req, options).await
     }
 
@@ -5781,8 +5646,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContextsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContextsResponse>> {
         T::list_contexts(self, req, options).await
     }
 
@@ -5790,8 +5655,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::update_context(self, req, options).await
     }
 
@@ -5799,8 +5664,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_context(self, req, options).await
     }
 
@@ -5808,8 +5673,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn purge_contexts(
         &self,
         req: crate::model::PurgeContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_contexts(self, req, options).await
     }
 
@@ -5817,10 +5682,9 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn add_context_artifacts_and_executions(
         &self,
         req: crate::model::AddContextArtifactsAndExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::AddContextArtifactsAndExecutionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddContextArtifactsAndExecutionsResponse>>
+    {
         T::add_context_artifacts_and_executions(self, req, options).await
     }
 
@@ -5828,8 +5692,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn add_context_children(
         &self,
         req: crate::model::AddContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddContextChildrenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddContextChildrenResponse>> {
         T::add_context_children(self, req, options).await
     }
 
@@ -5837,8 +5701,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn remove_context_children(
         &self,
         req: crate::model::RemoveContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveContextChildrenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveContextChildrenResponse>> {
         T::remove_context_children(self, req, options).await
     }
 
@@ -5846,8 +5710,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn query_context_lineage_subgraph(
         &self,
         req: crate::model::QueryContextLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageSubgraph>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageSubgraph>> {
         T::query_context_lineage_subgraph(self, req, options).await
     }
 
@@ -5855,8 +5719,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_execution(
         &self,
         req: crate::model::CreateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Execution>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Execution>> {
         T::create_execution(self, req, options).await
     }
 
@@ -5864,8 +5728,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_execution(
         &self,
         req: crate::model::GetExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Execution>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Execution>> {
         T::get_execution(self, req, options).await
     }
 
@@ -5873,8 +5737,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_executions(
         &self,
         req: crate::model::ListExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExecutionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExecutionsResponse>> {
         T::list_executions(self, req, options).await
     }
 
@@ -5882,8 +5746,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn update_execution(
         &self,
         req: crate::model::UpdateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Execution>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Execution>> {
         T::update_execution(self, req, options).await
     }
 
@@ -5891,8 +5755,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_execution(
         &self,
         req: crate::model::DeleteExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_execution(self, req, options).await
     }
 
@@ -5900,8 +5764,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn purge_executions(
         &self,
         req: crate::model::PurgeExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_executions(self, req, options).await
     }
 
@@ -5909,8 +5773,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn add_execution_events(
         &self,
         req: crate::model::AddExecutionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddExecutionEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddExecutionEventsResponse>> {
         T::add_execution_events(self, req, options).await
     }
 
@@ -5918,8 +5782,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn query_execution_inputs_and_outputs(
         &self,
         req: crate::model::QueryExecutionInputsAndOutputsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageSubgraph>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageSubgraph>> {
         T::query_execution_inputs_and_outputs(self, req, options).await
     }
 
@@ -5927,8 +5791,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_metadata_schema(
         &self,
         req: crate::model::CreateMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataSchema>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataSchema>> {
         T::create_metadata_schema(self, req, options).await
     }
 
@@ -5936,8 +5800,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_metadata_schema(
         &self,
         req: crate::model::GetMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataSchema>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataSchema>> {
         T::get_metadata_schema(self, req, options).await
     }
 
@@ -5945,8 +5809,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_metadata_schemas(
         &self,
         req: crate::model::ListMetadataSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataSchemasResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataSchemasResponse>> {
         T::list_metadata_schemas(self, req, options).await
     }
 
@@ -5954,8 +5818,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn query_artifact_lineage_subgraph(
         &self,
         req: crate::model::QueryArtifactLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageSubgraph>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageSubgraph>> {
         T::query_artifact_lineage_subgraph(self, req, options).await
     }
 
@@ -5963,9 +5827,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -5973,8 +5836,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -5982,8 +5845,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -5991,8 +5854,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6000,10 +5863,9 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6011,10 +5873,9 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -6022,8 +5883,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -6031,8 +5892,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -6040,8 +5901,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -6049,22 +5910,22 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6076,88 +5937,84 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     async fn search_migratable_resources(
         &self,
         req: crate::model::SearchMigratableResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchMigratableResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchMigratableResourcesResponse>>;
 
     async fn batch_migrate_resources(
         &self,
         req: crate::model::BatchMigrateResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::MigrationService] also implement [MigrationService].
@@ -6168,9 +6025,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn search_migratable_resources(
         &self,
         req: crate::model::SearchMigratableResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchMigratableResourcesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchMigratableResourcesResponse>> {
         T::search_migratable_resources(self, req, options).await
     }
 
@@ -6178,8 +6034,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn batch_migrate_resources(
         &self,
         req: crate::model::BatchMigrateResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_migrate_resources(self, req, options).await
     }
 
@@ -6187,9 +6043,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -6197,8 +6052,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -6206,8 +6061,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -6215,8 +6070,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6224,10 +6079,9 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6235,10 +6089,9 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -6246,8 +6099,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -6255,8 +6108,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -6264,8 +6117,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -6273,22 +6126,22 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6300,88 +6153,84 @@ pub trait ModelGardenService: std::fmt::Debug + Send + Sync {
     async fn get_publisher_model(
         &self,
         req: crate::model::GetPublisherModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublisherModel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublisherModel>>;
 
     async fn deploy(
         &self,
         req: crate::model::DeployRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ModelGardenService] also implement [ModelGardenService].
@@ -6392,8 +6241,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn get_publisher_model(
         &self,
         req: crate::model::GetPublisherModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublisherModel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublisherModel>> {
         T::get_publisher_model(self, req, options).await
     }
 
@@ -6401,8 +6250,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn deploy(
         &self,
         req: crate::model::DeployRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy(self, req, options).await
     }
 
@@ -6410,9 +6259,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -6420,8 +6268,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -6429,8 +6277,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -6438,8 +6286,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6447,10 +6295,9 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6458,10 +6305,9 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -6469,8 +6315,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -6478,8 +6324,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -6487,8 +6333,8 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -6496,22 +6342,22 @@ impl<T: super::ModelGardenService> ModelGardenService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6523,192 +6369,186 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     async fn upload_model(
         &self,
         req: crate::model::UploadModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>>;
 
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelsResponse>>;
 
     async fn list_model_versions(
         &self,
         req: crate::model::ListModelVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelVersionsResponse>>;
 
     async fn list_model_version_checkpoints(
         &self,
         req: crate::model::ListModelVersionCheckpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelVersionCheckpointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelVersionCheckpointsResponse>>;
 
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>>;
 
     async fn update_explanation_dataset(
         &self,
         req: crate::model::UpdateExplanationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_model_version(
         &self,
         req: crate::model::DeleteModelVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn merge_version_aliases(
         &self,
         req: crate::model::MergeVersionAliasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>>;
 
     async fn export_model(
         &self,
         req: crate::model::ExportModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn copy_model(
         &self,
         req: crate::model::CopyModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_model_evaluation(
         &self,
         req: crate::model::ImportModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelEvaluation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelEvaluation>>;
 
     async fn batch_import_model_evaluation_slices(
         &self,
         req: crate::model::BatchImportModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::BatchImportModelEvaluationSlicesResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchImportModelEvaluationSlicesResponse>>;
 
     async fn batch_import_evaluated_annotations(
         &self,
         req: crate::model::BatchImportEvaluatedAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>>;
 
     async fn get_model_evaluation(
         &self,
         req: crate::model::GetModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelEvaluation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelEvaluation>>;
 
     async fn list_model_evaluations(
         &self,
         req: crate::model::ListModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelEvaluationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelEvaluationsResponse>>;
 
     async fn get_model_evaluation_slice(
         &self,
         req: crate::model::GetModelEvaluationSliceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelEvaluationSlice>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelEvaluationSlice>>;
 
     async fn list_model_evaluation_slices(
         &self,
         req: crate::model::ListModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelEvaluationSlicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelEvaluationSlicesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ModelService] also implement [ModelService].
@@ -6719,8 +6559,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn upload_model(
         &self,
         req: crate::model::UploadModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::upload_model(self, req, options).await
     }
 
@@ -6728,8 +6568,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>> {
         T::get_model(self, req, options).await
     }
 
@@ -6737,8 +6577,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelsResponse>> {
         T::list_models(self, req, options).await
     }
 
@@ -6746,8 +6586,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_model_versions(
         &self,
         req: crate::model::ListModelVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelVersionsResponse>> {
         T::list_model_versions(self, req, options).await
     }
 
@@ -6755,9 +6595,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_model_version_checkpoints(
         &self,
         req: crate::model::ListModelVersionCheckpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelVersionCheckpointsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelVersionCheckpointsResponse>> {
         T::list_model_version_checkpoints(self, req, options).await
     }
 
@@ -6765,8 +6604,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>> {
         T::update_model(self, req, options).await
     }
 
@@ -6774,8 +6613,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn update_explanation_dataset(
         &self,
         req: crate::model::UpdateExplanationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_explanation_dataset(self, req, options).await
     }
 
@@ -6783,8 +6622,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_model(self, req, options).await
     }
 
@@ -6792,8 +6631,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn delete_model_version(
         &self,
         req: crate::model::DeleteModelVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_model_version(self, req, options).await
     }
 
@@ -6801,8 +6640,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn merge_version_aliases(
         &self,
         req: crate::model::MergeVersionAliasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>> {
         T::merge_version_aliases(self, req, options).await
     }
 
@@ -6810,8 +6649,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn export_model(
         &self,
         req: crate::model::ExportModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_model(self, req, options).await
     }
 
@@ -6819,8 +6658,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn copy_model(
         &self,
         req: crate::model::CopyModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::copy_model(self, req, options).await
     }
 
@@ -6828,8 +6667,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn import_model_evaluation(
         &self,
         req: crate::model::ImportModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelEvaluation>> {
         T::import_model_evaluation(self, req, options).await
     }
 
@@ -6837,10 +6676,9 @@ impl<T: super::ModelService> ModelService for T {
     async fn batch_import_model_evaluation_slices(
         &self,
         req: crate::model::BatchImportModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::BatchImportModelEvaluationSlicesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchImportModelEvaluationSlicesResponse>>
+    {
         T::batch_import_model_evaluation_slices(self, req, options).await
     }
 
@@ -6848,9 +6686,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn batch_import_evaluated_annotations(
         &self,
         req: crate::model::BatchImportEvaluatedAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>> {
         T::batch_import_evaluated_annotations(self, req, options).await
     }
 
@@ -6858,8 +6695,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_model_evaluation(
         &self,
         req: crate::model::GetModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelEvaluation>> {
         T::get_model_evaluation(self, req, options).await
     }
 
@@ -6867,8 +6704,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_model_evaluations(
         &self,
         req: crate::model::ListModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelEvaluationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelEvaluationsResponse>> {
         T::list_model_evaluations(self, req, options).await
     }
 
@@ -6876,8 +6713,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_model_evaluation_slice(
         &self,
         req: crate::model::GetModelEvaluationSliceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModelEvaluationSlice>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModelEvaluationSlice>> {
         T::get_model_evaluation_slice(self, req, options).await
     }
 
@@ -6885,9 +6722,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_model_evaluation_slices(
         &self,
         req: crate::model::ListModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelEvaluationSlicesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelEvaluationSlicesResponse>> {
         T::list_model_evaluation_slices(self, req, options).await
     }
 
@@ -6895,9 +6731,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -6905,8 +6740,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -6914,8 +6749,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -6923,8 +6758,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6932,10 +6767,9 @@ impl<T: super::ModelService> ModelService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6943,10 +6777,9 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -6954,8 +6787,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -6963,8 +6796,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -6972,8 +6805,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -6981,22 +6814,22 @@ impl<T: super::ModelService> ModelService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7008,172 +6841,168 @@ pub trait NotebookService: std::fmt::Debug + Send + Sync {
     async fn create_notebook_runtime_template(
         &self,
         req: crate::model::CreateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_notebook_runtime_template(
         &self,
         req: crate::model::GetNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookRuntimeTemplate>>;
 
     async fn list_notebook_runtime_templates(
         &self,
         req: crate::model::ListNotebookRuntimeTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotebookRuntimeTemplatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotebookRuntimeTemplatesResponse>>;
 
     async fn delete_notebook_runtime_template(
         &self,
         req: crate::model::DeleteNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_notebook_runtime_template(
         &self,
         req: crate::model::UpdateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookRuntimeTemplate>>;
 
     async fn assign_notebook_runtime(
         &self,
         req: crate::model::AssignNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_notebook_runtime(
         &self,
         req: crate::model::GetNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookRuntime>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookRuntime>>;
 
     async fn list_notebook_runtimes(
         &self,
         req: crate::model::ListNotebookRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotebookRuntimesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotebookRuntimesResponse>>;
 
     async fn delete_notebook_runtime(
         &self,
         req: crate::model::DeleteNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn upgrade_notebook_runtime(
         &self,
         req: crate::model::UpgradeNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn start_notebook_runtime(
         &self,
         req: crate::model::StartNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn stop_notebook_runtime(
         &self,
         req: crate::model::StopNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_notebook_execution_job(
         &self,
         req: crate::model::CreateNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_notebook_execution_job(
         &self,
         req: crate::model::GetNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookExecutionJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookExecutionJob>>;
 
     async fn list_notebook_execution_jobs(
         &self,
         req: crate::model::ListNotebookExecutionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotebookExecutionJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotebookExecutionJobsResponse>>;
 
     async fn delete_notebook_execution_job(
         &self,
         req: crate::model::DeleteNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NotebookService] also implement [NotebookService].
@@ -7184,8 +7013,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn create_notebook_runtime_template(
         &self,
         req: crate::model::CreateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_notebook_runtime_template(self, req, options).await
     }
 
@@ -7193,8 +7022,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn get_notebook_runtime_template(
         &self,
         req: crate::model::GetNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookRuntimeTemplate>> {
         T::get_notebook_runtime_template(self, req, options).await
     }
 
@@ -7202,9 +7031,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn list_notebook_runtime_templates(
         &self,
         req: crate::model::ListNotebookRuntimeTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotebookRuntimeTemplatesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotebookRuntimeTemplatesResponse>> {
         T::list_notebook_runtime_templates(self, req, options).await
     }
 
@@ -7212,8 +7040,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn delete_notebook_runtime_template(
         &self,
         req: crate::model::DeleteNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_notebook_runtime_template(self, req, options).await
     }
 
@@ -7221,8 +7049,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn update_notebook_runtime_template(
         &self,
         req: crate::model::UpdateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookRuntimeTemplate>> {
         T::update_notebook_runtime_template(self, req, options).await
     }
 
@@ -7230,8 +7058,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn assign_notebook_runtime(
         &self,
         req: crate::model::AssignNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::assign_notebook_runtime(self, req, options).await
     }
 
@@ -7239,8 +7067,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn get_notebook_runtime(
         &self,
         req: crate::model::GetNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookRuntime>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookRuntime>> {
         T::get_notebook_runtime(self, req, options).await
     }
 
@@ -7248,8 +7076,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn list_notebook_runtimes(
         &self,
         req: crate::model::ListNotebookRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotebookRuntimesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotebookRuntimesResponse>> {
         T::list_notebook_runtimes(self, req, options).await
     }
 
@@ -7257,8 +7085,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn delete_notebook_runtime(
         &self,
         req: crate::model::DeleteNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_notebook_runtime(self, req, options).await
     }
 
@@ -7266,8 +7094,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn upgrade_notebook_runtime(
         &self,
         req: crate::model::UpgradeNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::upgrade_notebook_runtime(self, req, options).await
     }
 
@@ -7275,8 +7103,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn start_notebook_runtime(
         &self,
         req: crate::model::StartNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::start_notebook_runtime(self, req, options).await
     }
 
@@ -7284,8 +7112,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn stop_notebook_runtime(
         &self,
         req: crate::model::StopNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::stop_notebook_runtime(self, req, options).await
     }
 
@@ -7293,8 +7121,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn create_notebook_execution_job(
         &self,
         req: crate::model::CreateNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_notebook_execution_job(self, req, options).await
     }
 
@@ -7302,8 +7130,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn get_notebook_execution_job(
         &self,
         req: crate::model::GetNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotebookExecutionJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotebookExecutionJob>> {
         T::get_notebook_execution_job(self, req, options).await
     }
 
@@ -7311,9 +7139,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn list_notebook_execution_jobs(
         &self,
         req: crate::model::ListNotebookExecutionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNotebookExecutionJobsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNotebookExecutionJobsResponse>> {
         T::list_notebook_execution_jobs(self, req, options).await
     }
 
@@ -7321,8 +7148,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn delete_notebook_execution_job(
         &self,
         req: crate::model::DeleteNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_notebook_execution_job(self, req, options).await
     }
 
@@ -7330,9 +7157,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -7340,8 +7166,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -7349,8 +7175,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -7358,8 +7184,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -7367,10 +7193,9 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -7378,10 +7203,9 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -7389,8 +7213,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -7398,8 +7222,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -7407,8 +7231,8 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -7416,22 +7240,22 @@ impl<T: super::NotebookService> NotebookService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7443,112 +7267,108 @@ pub trait PersistentResourceService: std::fmt::Debug + Send + Sync {
     async fn create_persistent_resource(
         &self,
         req: crate::model::CreatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_persistent_resource(
         &self,
         req: crate::model::GetPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PersistentResource>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PersistentResource>>;
 
     async fn list_persistent_resources(
         &self,
         req: crate::model::ListPersistentResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPersistentResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPersistentResourcesResponse>>;
 
     async fn delete_persistent_resource(
         &self,
         req: crate::model::DeletePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_persistent_resource(
         &self,
         req: crate::model::UpdatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reboot_persistent_resource(
         &self,
         req: crate::model::RebootPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PersistentResourceService] also implement [PersistentResourceService].
@@ -7559,8 +7379,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn create_persistent_resource(
         &self,
         req: crate::model::CreatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_persistent_resource(self, req, options).await
     }
 
@@ -7568,8 +7388,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn get_persistent_resource(
         &self,
         req: crate::model::GetPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PersistentResource>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PersistentResource>> {
         T::get_persistent_resource(self, req, options).await
     }
 
@@ -7577,8 +7397,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn list_persistent_resources(
         &self,
         req: crate::model::ListPersistentResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPersistentResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPersistentResourcesResponse>> {
         T::list_persistent_resources(self, req, options).await
     }
 
@@ -7586,8 +7406,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn delete_persistent_resource(
         &self,
         req: crate::model::DeletePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_persistent_resource(self, req, options).await
     }
 
@@ -7595,8 +7415,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn update_persistent_resource(
         &self,
         req: crate::model::UpdatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_persistent_resource(self, req, options).await
     }
 
@@ -7604,8 +7424,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn reboot_persistent_resource(
         &self,
         req: crate::model::RebootPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reboot_persistent_resource(self, req, options).await
     }
 
@@ -7613,9 +7433,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -7623,8 +7442,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -7632,8 +7451,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -7641,8 +7460,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -7650,10 +7469,9 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -7661,10 +7479,9 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -7672,8 +7489,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -7681,8 +7498,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -7690,8 +7507,8 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -7699,22 +7516,22 @@ impl<T: super::PersistentResourceService> PersistentResourceService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7726,148 +7543,144 @@ pub trait PipelineService: std::fmt::Debug + Send + Sync {
     async fn create_training_pipeline(
         &self,
         req: crate::model::CreateTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TrainingPipeline>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TrainingPipeline>>;
 
     async fn get_training_pipeline(
         &self,
         req: crate::model::GetTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TrainingPipeline>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TrainingPipeline>>;
 
     async fn list_training_pipelines(
         &self,
         req: crate::model::ListTrainingPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTrainingPipelinesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTrainingPipelinesResponse>>;
 
     async fn delete_training_pipeline(
         &self,
         req: crate::model::DeleteTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_training_pipeline(
         &self,
         req: crate::model::CancelTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_pipeline_job(
         &self,
         req: crate::model::CreatePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PipelineJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PipelineJob>>;
 
     async fn get_pipeline_job(
         &self,
         req: crate::model::GetPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PipelineJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PipelineJob>>;
 
     async fn list_pipeline_jobs(
         &self,
         req: crate::model::ListPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPipelineJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPipelineJobsResponse>>;
 
     async fn delete_pipeline_job(
         &self,
         req: crate::model::DeletePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_delete_pipeline_jobs(
         &self,
         req: crate::model::BatchDeletePipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_pipeline_job(
         &self,
         req: crate::model::CancelPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn batch_cancel_pipeline_jobs(
         &self,
         req: crate::model::BatchCancelPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PipelineService] also implement [PipelineService].
@@ -7878,8 +7691,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn create_training_pipeline(
         &self,
         req: crate::model::CreateTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TrainingPipeline>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TrainingPipeline>> {
         T::create_training_pipeline(self, req, options).await
     }
 
@@ -7887,8 +7700,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn get_training_pipeline(
         &self,
         req: crate::model::GetTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TrainingPipeline>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TrainingPipeline>> {
         T::get_training_pipeline(self, req, options).await
     }
 
@@ -7896,8 +7709,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn list_training_pipelines(
         &self,
         req: crate::model::ListTrainingPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTrainingPipelinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTrainingPipelinesResponse>> {
         T::list_training_pipelines(self, req, options).await
     }
 
@@ -7905,8 +7718,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn delete_training_pipeline(
         &self,
         req: crate::model::DeleteTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_training_pipeline(self, req, options).await
     }
 
@@ -7914,8 +7727,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn cancel_training_pipeline(
         &self,
         req: crate::model::CancelTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_training_pipeline(self, req, options).await
     }
 
@@ -7923,8 +7736,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn create_pipeline_job(
         &self,
         req: crate::model::CreatePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PipelineJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PipelineJob>> {
         T::create_pipeline_job(self, req, options).await
     }
 
@@ -7932,8 +7745,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn get_pipeline_job(
         &self,
         req: crate::model::GetPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PipelineJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PipelineJob>> {
         T::get_pipeline_job(self, req, options).await
     }
 
@@ -7941,8 +7754,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn list_pipeline_jobs(
         &self,
         req: crate::model::ListPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPipelineJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPipelineJobsResponse>> {
         T::list_pipeline_jobs(self, req, options).await
     }
 
@@ -7950,8 +7763,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn delete_pipeline_job(
         &self,
         req: crate::model::DeletePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_pipeline_job(self, req, options).await
     }
 
@@ -7959,8 +7772,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn batch_delete_pipeline_jobs(
         &self,
         req: crate::model::BatchDeletePipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_delete_pipeline_jobs(self, req, options).await
     }
 
@@ -7968,8 +7781,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn cancel_pipeline_job(
         &self,
         req: crate::model::CancelPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_pipeline_job(self, req, options).await
     }
 
@@ -7977,8 +7790,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn batch_cancel_pipeline_jobs(
         &self,
         req: crate::model::BatchCancelPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_cancel_pipeline_jobs(self, req, options).await
     }
 
@@ -7986,9 +7799,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -7996,8 +7808,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -8005,8 +7817,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -8014,8 +7826,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -8023,10 +7835,9 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -8034,10 +7845,9 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -8045,8 +7855,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -8054,8 +7864,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -8063,8 +7873,8 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -8072,22 +7882,22 @@ impl<T: super::PipelineService> PipelineService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -8099,108 +7909,104 @@ pub trait PredictionService: std::fmt::Debug + Send + Sync {
     async fn predict(
         &self,
         req: crate::model::PredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PredictResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PredictResponse>>;
 
     async fn raw_predict(
         &self,
         req: crate::model::RawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn direct_predict(
         &self,
         req: crate::model::DirectPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DirectPredictResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DirectPredictResponse>>;
 
     async fn direct_raw_predict(
         &self,
         req: crate::model::DirectRawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DirectRawPredictResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DirectRawPredictResponse>>;
 
     async fn explain(
         &self,
         req: crate::model::ExplainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExplainResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExplainResponse>>;
 
     async fn generate_content(
         &self,
         req: crate::model::GenerateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateContentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateContentResponse>>;
 
     async fn embed_content(
         &self,
         req: crate::model::EmbedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EmbedContentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EmbedContentResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::PredictionService] also implement [PredictionService].
@@ -8211,8 +8017,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn predict(
         &self,
         req: crate::model::PredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PredictResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PredictResponse>> {
         T::predict(self, req, options).await
     }
 
@@ -8220,8 +8026,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn raw_predict(
         &self,
         req: crate::model::RawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::raw_predict(self, req, options).await
     }
 
@@ -8229,8 +8035,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn direct_predict(
         &self,
         req: crate::model::DirectPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DirectPredictResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DirectPredictResponse>> {
         T::direct_predict(self, req, options).await
     }
 
@@ -8238,8 +8044,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn direct_raw_predict(
         &self,
         req: crate::model::DirectRawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DirectRawPredictResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DirectRawPredictResponse>> {
         T::direct_raw_predict(self, req, options).await
     }
 
@@ -8247,8 +8053,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn explain(
         &self,
         req: crate::model::ExplainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExplainResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExplainResponse>> {
         T::explain(self, req, options).await
     }
 
@@ -8256,8 +8062,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn generate_content(
         &self,
         req: crate::model::GenerateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateContentResponse>> {
         T::generate_content(self, req, options).await
     }
 
@@ -8265,8 +8071,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn embed_content(
         &self,
         req: crate::model::EmbedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EmbedContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EmbedContentResponse>> {
         T::embed_content(self, req, options).await
     }
 
@@ -8274,9 +8080,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -8284,8 +8089,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -8293,8 +8098,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -8302,8 +8107,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -8311,10 +8116,9 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -8322,10 +8126,9 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -8333,8 +8136,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -8342,8 +8145,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -8351,8 +8154,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -8360,8 +8163,8 @@ impl<T: super::PredictionService> PredictionService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -8373,72 +8176,68 @@ pub trait ReasoningEngineExecutionService: std::fmt::Debug + Send + Sync {
     async fn query_reasoning_engine(
         &self,
         req: crate::model::QueryReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryReasoningEngineResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryReasoningEngineResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::ReasoningEngineExecutionService] also implement [ReasoningEngineExecutionService].
@@ -8449,8 +8248,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn query_reasoning_engine(
         &self,
         req: crate::model::QueryReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryReasoningEngineResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryReasoningEngineResponse>> {
         T::query_reasoning_engine(self, req, options).await
     }
 
@@ -8458,9 +8257,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -8468,8 +8266,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -8477,8 +8275,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -8486,8 +8284,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -8495,10 +8293,9 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -8506,10 +8303,9 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -8517,8 +8313,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -8526,8 +8322,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -8535,8 +8331,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -8544,8 +8340,8 @@ impl<T: super::ReasoningEngineExecutionService> ReasoningEngineExecutionService
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -8557,106 +8353,102 @@ pub trait ReasoningEngineService: std::fmt::Debug + Send + Sync {
     async fn create_reasoning_engine(
         &self,
         req: crate::model::CreateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_reasoning_engine(
         &self,
         req: crate::model::GetReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReasoningEngine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReasoningEngine>>;
 
     async fn list_reasoning_engines(
         &self,
         req: crate::model::ListReasoningEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReasoningEnginesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReasoningEnginesResponse>>;
 
     async fn update_reasoning_engine(
         &self,
         req: crate::model::UpdateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_reasoning_engine(
         &self,
         req: crate::model::DeleteReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ReasoningEngineService] also implement [ReasoningEngineService].
@@ -8667,8 +8459,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn create_reasoning_engine(
         &self,
         req: crate::model::CreateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_reasoning_engine(self, req, options).await
     }
 
@@ -8676,8 +8468,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn get_reasoning_engine(
         &self,
         req: crate::model::GetReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReasoningEngine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReasoningEngine>> {
         T::get_reasoning_engine(self, req, options).await
     }
 
@@ -8685,8 +8477,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn list_reasoning_engines(
         &self,
         req: crate::model::ListReasoningEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReasoningEnginesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReasoningEnginesResponse>> {
         T::list_reasoning_engines(self, req, options).await
     }
 
@@ -8694,8 +8486,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn update_reasoning_engine(
         &self,
         req: crate::model::UpdateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_reasoning_engine(self, req, options).await
     }
 
@@ -8703,8 +8495,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn delete_reasoning_engine(
         &self,
         req: crate::model::DeleteReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_reasoning_engine(self, req, options).await
     }
 
@@ -8712,9 +8504,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -8722,8 +8513,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -8731,8 +8522,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -8740,8 +8531,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -8749,10 +8540,9 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -8760,10 +8550,9 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -8771,8 +8560,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -8780,8 +8569,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -8789,8 +8578,8 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -8798,22 +8587,22 @@ impl<T: super::ReasoningEngineService> ReasoningEngineService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -8825,118 +8614,114 @@ pub trait ScheduleService: std::fmt::Debug + Send + Sync {
     async fn create_schedule(
         &self,
         req: crate::model::CreateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schedule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schedule>>;
 
     async fn delete_schedule(
         &self,
         req: crate::model::DeleteScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_schedule(
         &self,
         req: crate::model::GetScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schedule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schedule>>;
 
     async fn list_schedules(
         &self,
         req: crate::model::ListSchedulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchedulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchedulesResponse>>;
 
     async fn pause_schedule(
         &self,
         req: crate::model::PauseScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn resume_schedule(
         &self,
         req: crate::model::ResumeScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_schedule(
         &self,
         req: crate::model::UpdateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schedule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schedule>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ScheduleService] also implement [ScheduleService].
@@ -8947,8 +8732,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn create_schedule(
         &self,
         req: crate::model::CreateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schedule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schedule>> {
         T::create_schedule(self, req, options).await
     }
 
@@ -8956,8 +8741,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn delete_schedule(
         &self,
         req: crate::model::DeleteScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_schedule(self, req, options).await
     }
 
@@ -8965,8 +8750,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn get_schedule(
         &self,
         req: crate::model::GetScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schedule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schedule>> {
         T::get_schedule(self, req, options).await
     }
 
@@ -8974,8 +8759,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn list_schedules(
         &self,
         req: crate::model::ListSchedulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchedulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchedulesResponse>> {
         T::list_schedules(self, req, options).await
     }
 
@@ -8983,8 +8768,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn pause_schedule(
         &self,
         req: crate::model::PauseScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::pause_schedule(self, req, options).await
     }
 
@@ -8992,8 +8777,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn resume_schedule(
         &self,
         req: crate::model::ResumeScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::resume_schedule(self, req, options).await
     }
 
@@ -9001,8 +8786,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn update_schedule(
         &self,
         req: crate::model::UpdateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schedule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schedule>> {
         T::update_schedule(self, req, options).await
     }
 
@@ -9010,9 +8795,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -9020,8 +8804,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -9029,8 +8813,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -9038,8 +8822,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -9047,10 +8831,9 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -9058,10 +8841,9 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -9069,8 +8851,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -9078,8 +8860,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -9087,8 +8869,8 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -9096,22 +8878,22 @@ impl<T: super::ScheduleService> ScheduleService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9123,106 +8905,102 @@ pub trait SpecialistPoolService: std::fmt::Debug + Send + Sync {
     async fn create_specialist_pool(
         &self,
         req: crate::model::CreateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_specialist_pool(
         &self,
         req: crate::model::GetSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SpecialistPool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SpecialistPool>>;
 
     async fn list_specialist_pools(
         &self,
         req: crate::model::ListSpecialistPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSpecialistPoolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSpecialistPoolsResponse>>;
 
     async fn delete_specialist_pool(
         &self,
         req: crate::model::DeleteSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_specialist_pool(
         &self,
         req: crate::model::UpdateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SpecialistPoolService] also implement [SpecialistPoolService].
@@ -9233,8 +9011,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn create_specialist_pool(
         &self,
         req: crate::model::CreateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_specialist_pool(self, req, options).await
     }
 
@@ -9242,8 +9020,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn get_specialist_pool(
         &self,
         req: crate::model::GetSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SpecialistPool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SpecialistPool>> {
         T::get_specialist_pool(self, req, options).await
     }
 
@@ -9251,8 +9029,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn list_specialist_pools(
         &self,
         req: crate::model::ListSpecialistPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSpecialistPoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSpecialistPoolsResponse>> {
         T::list_specialist_pools(self, req, options).await
     }
 
@@ -9260,8 +9038,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn delete_specialist_pool(
         &self,
         req: crate::model::DeleteSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_specialist_pool(self, req, options).await
     }
 
@@ -9269,8 +9047,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn update_specialist_pool(
         &self,
         req: crate::model::UpdateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_specialist_pool(self, req, options).await
     }
 
@@ -9278,9 +9056,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -9288,8 +9065,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -9297,8 +9074,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -9306,8 +9083,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -9315,10 +9092,9 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -9326,10 +9102,9 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -9337,8 +9112,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -9346,8 +9121,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -9355,8 +9130,8 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -9364,22 +9139,22 @@ impl<T: super::SpecialistPoolService> SpecialistPoolService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9391,254 +9166,246 @@ pub trait TensorboardService: std::fmt::Debug + Send + Sync {
     async fn create_tensorboard(
         &self,
         req: crate::model::CreateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_tensorboard(
         &self,
         req: crate::model::GetTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tensorboard>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tensorboard>>;
 
     async fn update_tensorboard(
         &self,
         req: crate::model::UpdateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_tensorboards(
         &self,
         req: crate::model::ListTensorboardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardsResponse>>;
 
     async fn delete_tensorboard(
         &self,
         req: crate::model::DeleteTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn read_tensorboard_usage(
         &self,
         req: crate::model::ReadTensorboardUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadTensorboardUsageResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadTensorboardUsageResponse>>;
 
     async fn read_tensorboard_size(
         &self,
         req: crate::model::ReadTensorboardSizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadTensorboardSizeResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadTensorboardSizeResponse>>;
 
     async fn create_tensorboard_experiment(
         &self,
         req: crate::model::CreateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardExperiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardExperiment>>;
 
     async fn get_tensorboard_experiment(
         &self,
         req: crate::model::GetTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardExperiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardExperiment>>;
 
     async fn update_tensorboard_experiment(
         &self,
         req: crate::model::UpdateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardExperiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardExperiment>>;
 
     async fn list_tensorboard_experiments(
         &self,
         req: crate::model::ListTensorboardExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardExperimentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardExperimentsResponse>>;
 
     async fn delete_tensorboard_experiment(
         &self,
         req: crate::model::DeleteTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_tensorboard_run(
         &self,
         req: crate::model::CreateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardRun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardRun>>;
 
     async fn batch_create_tensorboard_runs(
         &self,
         req: crate::model::BatchCreateTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchCreateTensorboardRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchCreateTensorboardRunsResponse>>;
 
     async fn get_tensorboard_run(
         &self,
         req: crate::model::GetTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardRun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardRun>>;
 
     async fn update_tensorboard_run(
         &self,
         req: crate::model::UpdateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardRun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardRun>>;
 
     async fn list_tensorboard_runs(
         &self,
         req: crate::model::ListTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardRunsResponse>>;
 
     async fn delete_tensorboard_run(
         &self,
         req: crate::model::DeleteTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_create_tensorboard_time_series(
         &self,
         req: crate::model::BatchCreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>>;
 
     async fn create_tensorboard_time_series(
         &self,
         req: crate::model::CreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardTimeSeries>>;
 
     async fn get_tensorboard_time_series(
         &self,
         req: crate::model::GetTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardTimeSeries>>;
 
     async fn update_tensorboard_time_series(
         &self,
         req: crate::model::UpdateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardTimeSeries>>;
 
     async fn list_tensorboard_time_series(
         &self,
         req: crate::model::ListTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardTimeSeriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardTimeSeriesResponse>>;
 
     async fn delete_tensorboard_time_series(
         &self,
         req: crate::model::DeleteTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_read_tensorboard_time_series_data(
         &self,
         req: crate::model::BatchReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>>;
 
     async fn read_tensorboard_time_series_data(
         &self,
         req: crate::model::ReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>>;
 
     async fn write_tensorboard_experiment_data(
         &self,
         req: crate::model::WriteTensorboardExperimentDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteTensorboardExperimentDataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteTensorboardExperimentDataResponse>>;
 
     async fn write_tensorboard_run_data(
         &self,
         req: crate::model::WriteTensorboardRunDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteTensorboardRunDataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteTensorboardRunDataResponse>>;
 
     async fn export_tensorboard_time_series_data(
         &self,
         req: crate::model::ExportTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TensorboardService] also implement [TensorboardService].
@@ -9649,8 +9416,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn create_tensorboard(
         &self,
         req: crate::model::CreateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_tensorboard(self, req, options).await
     }
 
@@ -9658,8 +9425,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_tensorboard(
         &self,
         req: crate::model::GetTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tensorboard>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tensorboard>> {
         T::get_tensorboard(self, req, options).await
     }
 
@@ -9667,8 +9434,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn update_tensorboard(
         &self,
         req: crate::model::UpdateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_tensorboard(self, req, options).await
     }
 
@@ -9676,8 +9443,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn list_tensorboards(
         &self,
         req: crate::model::ListTensorboardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardsResponse>> {
         T::list_tensorboards(self, req, options).await
     }
 
@@ -9685,8 +9452,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn delete_tensorboard(
         &self,
         req: crate::model::DeleteTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_tensorboard(self, req, options).await
     }
 
@@ -9694,8 +9461,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn read_tensorboard_usage(
         &self,
         req: crate::model::ReadTensorboardUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadTensorboardUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadTensorboardUsageResponse>> {
         T::read_tensorboard_usage(self, req, options).await
     }
 
@@ -9703,8 +9470,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn read_tensorboard_size(
         &self,
         req: crate::model::ReadTensorboardSizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadTensorboardSizeResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadTensorboardSizeResponse>> {
         T::read_tensorboard_size(self, req, options).await
     }
 
@@ -9712,8 +9479,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn create_tensorboard_experiment(
         &self,
         req: crate::model::CreateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardExperiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardExperiment>> {
         T::create_tensorboard_experiment(self, req, options).await
     }
 
@@ -9721,8 +9488,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_tensorboard_experiment(
         &self,
         req: crate::model::GetTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardExperiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardExperiment>> {
         T::get_tensorboard_experiment(self, req, options).await
     }
 
@@ -9730,8 +9497,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn update_tensorboard_experiment(
         &self,
         req: crate::model::UpdateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardExperiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardExperiment>> {
         T::update_tensorboard_experiment(self, req, options).await
     }
 
@@ -9739,9 +9506,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn list_tensorboard_experiments(
         &self,
         req: crate::model::ListTensorboardExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardExperimentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardExperimentsResponse>> {
         T::list_tensorboard_experiments(self, req, options).await
     }
 
@@ -9749,8 +9515,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn delete_tensorboard_experiment(
         &self,
         req: crate::model::DeleteTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_tensorboard_experiment(self, req, options).await
     }
 
@@ -9758,8 +9524,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn create_tensorboard_run(
         &self,
         req: crate::model::CreateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardRun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardRun>> {
         T::create_tensorboard_run(self, req, options).await
     }
 
@@ -9767,9 +9533,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn batch_create_tensorboard_runs(
         &self,
         req: crate::model::BatchCreateTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchCreateTensorboardRunsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchCreateTensorboardRunsResponse>> {
         T::batch_create_tensorboard_runs(self, req, options).await
     }
 
@@ -9777,8 +9542,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_tensorboard_run(
         &self,
         req: crate::model::GetTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardRun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardRun>> {
         T::get_tensorboard_run(self, req, options).await
     }
 
@@ -9786,8 +9551,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn update_tensorboard_run(
         &self,
         req: crate::model::UpdateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardRun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardRun>> {
         T::update_tensorboard_run(self, req, options).await
     }
 
@@ -9795,8 +9560,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn list_tensorboard_runs(
         &self,
         req: crate::model::ListTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardRunsResponse>> {
         T::list_tensorboard_runs(self, req, options).await
     }
 
@@ -9804,8 +9569,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn delete_tensorboard_run(
         &self,
         req: crate::model::DeleteTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_tensorboard_run(self, req, options).await
     }
 
@@ -9813,10 +9578,9 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn batch_create_tensorboard_time_series(
         &self,
         req: crate::model::BatchCreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>>
+    {
         T::batch_create_tensorboard_time_series(self, req, options).await
     }
 
@@ -9824,8 +9588,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn create_tensorboard_time_series(
         &self,
         req: crate::model::CreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         T::create_tensorboard_time_series(self, req, options).await
     }
 
@@ -9833,8 +9597,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_tensorboard_time_series(
         &self,
         req: crate::model::GetTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         T::get_tensorboard_time_series(self, req, options).await
     }
 
@@ -9842,8 +9606,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn update_tensorboard_time_series(
         &self,
         req: crate::model::UpdateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         T::update_tensorboard_time_series(self, req, options).await
     }
 
@@ -9851,9 +9615,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn list_tensorboard_time_series(
         &self,
         req: crate::model::ListTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTensorboardTimeSeriesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTensorboardTimeSeriesResponse>> {
         T::list_tensorboard_time_series(self, req, options).await
     }
 
@@ -9861,8 +9624,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn delete_tensorboard_time_series(
         &self,
         req: crate::model::DeleteTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_tensorboard_time_series(self, req, options).await
     }
 
@@ -9870,10 +9633,9 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn batch_read_tensorboard_time_series_data(
         &self,
         req: crate::model::BatchReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>>
+    {
         T::batch_read_tensorboard_time_series_data(self, req, options).await
     }
 
@@ -9881,9 +9643,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn read_tensorboard_time_series_data(
         &self,
         req: crate::model::ReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>> {
         T::read_tensorboard_time_series_data(self, req, options).await
     }
 
@@ -9891,9 +9652,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn write_tensorboard_experiment_data(
         &self,
         req: crate::model::WriteTensorboardExperimentDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteTensorboardExperimentDataResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteTensorboardExperimentDataResponse>> {
         T::write_tensorboard_experiment_data(self, req, options).await
     }
 
@@ -9901,8 +9661,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn write_tensorboard_run_data(
         &self,
         req: crate::model::WriteTensorboardRunDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteTensorboardRunDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteTensorboardRunDataResponse>> {
         T::write_tensorboard_run_data(self, req, options).await
     }
 
@@ -9910,9 +9670,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn export_tensorboard_time_series_data(
         &self,
         req: crate::model::ExportTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>> {
         T::export_tensorboard_time_series_data(self, req, options).await
     }
 
@@ -9920,9 +9679,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -9930,8 +9688,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -9939,8 +9697,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -9948,8 +9706,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -9957,10 +9715,9 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -9968,10 +9725,9 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -9979,8 +9735,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -9988,8 +9744,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -9997,8 +9753,8 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -10006,22 +9762,22 @@ impl<T: super::TensorboardService> TensorboardService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10033,148 +9789,144 @@ pub trait VertexRagDataService: std::fmt::Debug + Send + Sync {
     async fn create_rag_corpus(
         &self,
         req: crate::model::CreateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_rag_corpus(
         &self,
         req: crate::model::UpdateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_rag_corpus(
         &self,
         req: crate::model::GetRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RagCorpus>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RagCorpus>>;
 
     async fn list_rag_corpora(
         &self,
         req: crate::model::ListRagCorporaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRagCorporaResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRagCorporaResponse>>;
 
     async fn delete_rag_corpus(
         &self,
         req: crate::model::DeleteRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn upload_rag_file(
         &self,
         req: crate::model::UploadRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UploadRagFileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UploadRagFileResponse>>;
 
     async fn import_rag_files(
         &self,
         req: crate::model::ImportRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_rag_file(
         &self,
         req: crate::model::GetRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RagFile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RagFile>>;
 
     async fn list_rag_files(
         &self,
         req: crate::model::ListRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRagFilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRagFilesResponse>>;
 
     async fn delete_rag_file(
         &self,
         req: crate::model::DeleteRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_rag_engine_config(
         &self,
         req: crate::model::UpdateRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_rag_engine_config(
         &self,
         req: crate::model::GetRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RagEngineConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RagEngineConfig>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::VertexRagDataService] also implement [VertexRagDataService].
@@ -10185,8 +9937,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn create_rag_corpus(
         &self,
         req: crate::model::CreateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_rag_corpus(self, req, options).await
     }
 
@@ -10194,8 +9946,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn update_rag_corpus(
         &self,
         req: crate::model::UpdateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_rag_corpus(self, req, options).await
     }
 
@@ -10203,8 +9955,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn get_rag_corpus(
         &self,
         req: crate::model::GetRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RagCorpus>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RagCorpus>> {
         T::get_rag_corpus(self, req, options).await
     }
 
@@ -10212,8 +9964,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn list_rag_corpora(
         &self,
         req: crate::model::ListRagCorporaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRagCorporaResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRagCorporaResponse>> {
         T::list_rag_corpora(self, req, options).await
     }
 
@@ -10221,8 +9973,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn delete_rag_corpus(
         &self,
         req: crate::model::DeleteRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_rag_corpus(self, req, options).await
     }
 
@@ -10230,8 +9982,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn upload_rag_file(
         &self,
         req: crate::model::UploadRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UploadRagFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UploadRagFileResponse>> {
         T::upload_rag_file(self, req, options).await
     }
 
@@ -10239,8 +9991,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn import_rag_files(
         &self,
         req: crate::model::ImportRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_rag_files(self, req, options).await
     }
 
@@ -10248,8 +10000,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn get_rag_file(
         &self,
         req: crate::model::GetRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RagFile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RagFile>> {
         T::get_rag_file(self, req, options).await
     }
 
@@ -10257,8 +10009,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn list_rag_files(
         &self,
         req: crate::model::ListRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRagFilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRagFilesResponse>> {
         T::list_rag_files(self, req, options).await
     }
 
@@ -10266,8 +10018,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn delete_rag_file(
         &self,
         req: crate::model::DeleteRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_rag_file(self, req, options).await
     }
 
@@ -10275,8 +10027,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn update_rag_engine_config(
         &self,
         req: crate::model::UpdateRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_rag_engine_config(self, req, options).await
     }
 
@@ -10284,8 +10036,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn get_rag_engine_config(
         &self,
         req: crate::model::GetRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RagEngineConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RagEngineConfig>> {
         T::get_rag_engine_config(self, req, options).await
     }
 
@@ -10293,9 +10045,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -10303,8 +10054,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -10312,8 +10063,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -10321,8 +10072,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -10330,10 +10081,9 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10341,10 +10091,9 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -10352,8 +10101,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -10361,8 +10110,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -10370,8 +10119,8 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -10379,22 +10128,22 @@ impl<T: super::VertexRagDataService> VertexRagDataService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10406,84 +10155,80 @@ pub trait VertexRagService: std::fmt::Debug + Send + Sync {
     async fn retrieve_contexts(
         &self,
         req: crate::model::RetrieveContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetrieveContextsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetrieveContextsResponse>>;
 
     async fn augment_prompt(
         &self,
         req: crate::model::AugmentPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AugmentPromptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AugmentPromptResponse>>;
 
     async fn corroborate_content(
         &self,
         req: crate::model::CorroborateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CorroborateContentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CorroborateContentResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::VertexRagService] also implement [VertexRagService].
@@ -10494,8 +10239,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn retrieve_contexts(
         &self,
         req: crate::model::RetrieveContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetrieveContextsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetrieveContextsResponse>> {
         T::retrieve_contexts(self, req, options).await
     }
 
@@ -10503,8 +10248,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn augment_prompt(
         &self,
         req: crate::model::AugmentPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AugmentPromptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AugmentPromptResponse>> {
         T::augment_prompt(self, req, options).await
     }
 
@@ -10512,8 +10257,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn corroborate_content(
         &self,
         req: crate::model::CorroborateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CorroborateContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CorroborateContentResponse>> {
         T::corroborate_content(self, req, options).await
     }
 
@@ -10521,9 +10266,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -10531,8 +10275,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -10540,8 +10284,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -10549,8 +10293,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -10558,10 +10302,9 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10569,10 +10312,9 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -10580,8 +10322,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -10589,8 +10331,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -10598,8 +10340,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -10607,8 +10349,8 @@ impl<T: super::VertexRagService> VertexRagService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 }
@@ -10620,166 +10362,162 @@ pub trait VizierService: std::fmt::Debug + Send + Sync {
     async fn create_study(
         &self,
         req: crate::model::CreateStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Study>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Study>>;
 
     async fn get_study(
         &self,
         req: crate::model::GetStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Study>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Study>>;
 
     async fn list_studies(
         &self,
         req: crate::model::ListStudiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStudiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStudiesResponse>>;
 
     async fn delete_study(
         &self,
         req: crate::model::DeleteStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn lookup_study(
         &self,
         req: crate::model::LookupStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Study>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Study>>;
 
     async fn suggest_trials(
         &self,
         req: crate::model::SuggestTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_trial(
         &self,
         req: crate::model::CreateTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>>;
 
     async fn get_trial(
         &self,
         req: crate::model::GetTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>>;
 
     async fn list_trials(
         &self,
         req: crate::model::ListTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTrialsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTrialsResponse>>;
 
     async fn add_trial_measurement(
         &self,
         req: crate::model::AddTrialMeasurementRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>>;
 
     async fn complete_trial(
         &self,
         req: crate::model::CompleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>>;
 
     async fn delete_trial(
         &self,
         req: crate::model::DeleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn check_trial_early_stopping_state(
         &self,
         req: crate::model::CheckTrialEarlyStoppingStateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn stop_trial(
         &self,
         req: crate::model::StopTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>>;
 
     async fn list_optimal_trials(
         &self,
         req: crate::model::ListOptimalTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOptimalTrialsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOptimalTrialsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::VizierService] also implement [VizierService].
@@ -10790,8 +10528,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn create_study(
         &self,
         req: crate::model::CreateStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Study>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Study>> {
         T::create_study(self, req, options).await
     }
 
@@ -10799,8 +10537,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn get_study(
         &self,
         req: crate::model::GetStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Study>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Study>> {
         T::get_study(self, req, options).await
     }
 
@@ -10808,8 +10546,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn list_studies(
         &self,
         req: crate::model::ListStudiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStudiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStudiesResponse>> {
         T::list_studies(self, req, options).await
     }
 
@@ -10817,8 +10555,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn delete_study(
         &self,
         req: crate::model::DeleteStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_study(self, req, options).await
     }
 
@@ -10826,8 +10564,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn lookup_study(
         &self,
         req: crate::model::LookupStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Study>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Study>> {
         T::lookup_study(self, req, options).await
     }
 
@@ -10835,8 +10573,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn suggest_trials(
         &self,
         req: crate::model::SuggestTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::suggest_trials(self, req, options).await
     }
 
@@ -10844,8 +10582,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn create_trial(
         &self,
         req: crate::model::CreateTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>> {
         T::create_trial(self, req, options).await
     }
 
@@ -10853,8 +10591,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn get_trial(
         &self,
         req: crate::model::GetTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>> {
         T::get_trial(self, req, options).await
     }
 
@@ -10862,8 +10600,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn list_trials(
         &self,
         req: crate::model::ListTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTrialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTrialsResponse>> {
         T::list_trials(self, req, options).await
     }
 
@@ -10871,8 +10609,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn add_trial_measurement(
         &self,
         req: crate::model::AddTrialMeasurementRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>> {
         T::add_trial_measurement(self, req, options).await
     }
 
@@ -10880,8 +10618,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn complete_trial(
         &self,
         req: crate::model::CompleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>> {
         T::complete_trial(self, req, options).await
     }
 
@@ -10889,8 +10627,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn delete_trial(
         &self,
         req: crate::model::DeleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_trial(self, req, options).await
     }
 
@@ -10898,8 +10636,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn check_trial_early_stopping_state(
         &self,
         req: crate::model::CheckTrialEarlyStoppingStateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::check_trial_early_stopping_state(self, req, options).await
     }
 
@@ -10907,8 +10645,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn stop_trial(
         &self,
         req: crate::model::StopTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trial>> {
         T::stop_trial(self, req, options).await
     }
 
@@ -10916,8 +10654,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn list_optimal_trials(
         &self,
         req: crate::model::ListOptimalTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOptimalTrialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOptimalTrialsResponse>> {
         T::list_optimal_trials(self, req, options).await
     }
 
@@ -10925,9 +10663,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -10935,8 +10672,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -10944,8 +10681,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -10953,8 +10690,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -10962,10 +10699,9 @@ impl<T: super::VizierService> VizierService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10973,10 +10709,9 @@ impl<T: super::VizierService> VizierService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -10984,8 +10719,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -10993,8 +10728,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -11002,8 +10737,8 @@ impl<T: super::VizierService> VizierService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
@@ -11011,22 +10746,22 @@ impl<T: super::VizierService> VizierService for T {
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::wait_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/aiplatform/v1/src/tracing.rs b/src/generated/cloud/aiplatform/v1/src/tracing.rs
index 53fff69d4a..23205e9ba2 100644
--- a/src/generated/cloud/aiplatform/v1/src/tracing.rs
+++ b/src/generated/cloud/aiplatform/v1/src/tracing.rs
@@ -79,8 +79,8 @@ where
     async fn generate_synthetic_data(
         &self,
         req: crate::model::GenerateSyntheticDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateSyntheticDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateSyntheticDataResponse>> {
         self.inner.generate_synthetic_data(req, options).await
     }
 
@@ -88,8 +88,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -97,8 +97,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -106,8 +106,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -115,8 +115,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -124,9 +124,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -134,9 +133,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -144,8 +142,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -153,8 +151,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -162,8 +160,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -171,8 +169,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -206,8 +204,8 @@ where
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_dataset(req, options).await
     }
 
@@ -215,8 +213,8 @@ where
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.get_dataset(req, options).await
     }
 
@@ -224,8 +222,8 @@ where
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.update_dataset(req, options).await
     }
 
@@ -233,8 +231,8 @@ where
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatasetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatasetsResponse>> {
         self.inner.list_datasets(req, options).await
     }
 
@@ -242,8 +240,8 @@ where
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_dataset(req, options).await
     }
 
@@ -251,8 +249,8 @@ where
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_data(req, options).await
     }
 
@@ -260,8 +258,8 @@ where
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_data(req, options).await
     }
 
@@ -269,8 +267,8 @@ where
     async fn create_dataset_version(
         &self,
         req: crate::model::CreateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_dataset_version(req, options).await
     }
 
@@ -278,8 +276,8 @@ where
     async fn update_dataset_version(
         &self,
         req: crate::model::UpdateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DatasetVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DatasetVersion>> {
         self.inner.update_dataset_version(req, options).await
     }
 
@@ -287,8 +285,8 @@ where
     async fn delete_dataset_version(
         &self,
         req: crate::model::DeleteDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_dataset_version(req, options).await
     }
 
@@ -296,8 +294,8 @@ where
     async fn get_dataset_version(
         &self,
         req: crate::model::GetDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DatasetVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DatasetVersion>> {
         self.inner.get_dataset_version(req, options).await
     }
 
@@ -305,8 +303,8 @@ where
     async fn list_dataset_versions(
         &self,
         req: crate::model::ListDatasetVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatasetVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatasetVersionsResponse>> {
         self.inner.list_dataset_versions(req, options).await
     }
 
@@ -314,8 +312,8 @@ where
     async fn restore_dataset_version(
         &self,
         req: crate::model::RestoreDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_dataset_version(req, options).await
     }
 
@@ -323,8 +321,8 @@ where
     async fn list_data_items(
         &self,
         req: crate::model::ListDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataItemsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataItemsResponse>> {
         self.inner.list_data_items(req, options).await
     }
 
@@ -332,8 +330,8 @@ where
     async fn search_data_items(
         &self,
         req: crate::model::SearchDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchDataItemsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchDataItemsResponse>> {
         self.inner.search_data_items(req, options).await
     }
 
@@ -341,8 +339,8 @@ where
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSavedQueriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSavedQueriesResponse>> {
         self.inner.list_saved_queries(req, options).await
     }
 
@@ -350,8 +348,8 @@ where
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_saved_query(req, options).await
     }
 
@@ -359,8 +357,8 @@ where
     async fn get_annotation_spec(
         &self,
         req: crate::model::GetAnnotationSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnnotationSpec>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnnotationSpec>> {
         self.inner.get_annotation_spec(req, options).await
     }
 
@@ -368,8 +366,8 @@ where
     async fn list_annotations(
         &self,
         req: crate::model::ListAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnnotationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnnotationsResponse>> {
         self.inner.list_annotations(req, options).await
     }
 
@@ -377,8 +375,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -386,8 +384,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -395,8 +393,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -404,8 +402,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -413,9 +411,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -423,9 +420,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -433,8 +429,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -442,8 +438,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -451,8 +447,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -460,22 +456,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -509,8 +505,8 @@ where
     async fn create_deployment_resource_pool(
         &self,
         req: crate::model::CreateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_deployment_resource_pool(req, options)
             .await
@@ -520,8 +516,8 @@ where
     async fn get_deployment_resource_pool(
         &self,
         req: crate::model::GetDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeploymentResourcePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeploymentResourcePool>> {
         self.inner.get_deployment_resource_pool(req, options).await
     }
 
@@ -529,8 +525,8 @@ where
     async fn list_deployment_resource_pools(
         &self,
         req: crate::model::ListDeploymentResourcePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentResourcePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentResourcePoolsResponse>> {
         self.inner
             .list_deployment_resource_pools(req, options)
             .await
@@ -540,8 +536,8 @@ where
     async fn update_deployment_resource_pool(
         &self,
         req: crate::model::UpdateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_deployment_resource_pool(req, options)
             .await
@@ -551,8 +547,8 @@ where
     async fn delete_deployment_resource_pool(
         &self,
         req: crate::model::DeleteDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_deployment_resource_pool(req, options)
             .await
@@ -562,8 +558,8 @@ where
     async fn query_deployed_models(
         &self,
         req: crate::model::QueryDeployedModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryDeployedModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryDeployedModelsResponse>> {
         self.inner.query_deployed_models(req, options).await
     }
 
@@ -571,8 +567,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -580,8 +576,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -589,8 +585,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -598,8 +594,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -607,9 +603,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -617,9 +612,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -627,8 +621,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -636,8 +630,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -645,8 +639,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -654,22 +648,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -703,8 +697,8 @@ where
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_endpoint(req, options).await
     }
 
@@ -712,8 +706,8 @@ where
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Endpoint>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Endpoint>> {
         self.inner.get_endpoint(req, options).await
     }
 
@@ -721,8 +715,8 @@ where
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEndpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEndpointsResponse>> {
         self.inner.list_endpoints(req, options).await
     }
 
@@ -730,8 +724,8 @@ where
     async fn update_endpoint(
         &self,
         req: crate::model::UpdateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Endpoint>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Endpoint>> {
         self.inner.update_endpoint(req, options).await
     }
 
@@ -739,8 +733,8 @@ where
     async fn update_endpoint_long_running(
         &self,
         req: crate::model::UpdateEndpointLongRunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_endpoint_long_running(req, options).await
     }
 
@@ -748,8 +742,8 @@ where
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_endpoint(req, options).await
     }
 
@@ -757,8 +751,8 @@ where
     async fn deploy_model(
         &self,
         req: crate::model::DeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy_model(req, options).await
     }
 
@@ -766,8 +760,8 @@ where
     async fn undeploy_model(
         &self,
         req: crate::model::UndeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undeploy_model(req, options).await
     }
 
@@ -775,8 +769,8 @@ where
     async fn mutate_deployed_model(
         &self,
         req: crate::model::MutateDeployedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.mutate_deployed_model(req, options).await
     }
 
@@ -784,8 +778,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -793,8 +787,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -802,8 +796,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -811,8 +805,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -820,9 +814,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -830,9 +823,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -840,8 +832,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -849,8 +841,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -858,8 +850,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -867,22 +859,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -916,8 +908,8 @@ where
     async fn evaluate_instances(
         &self,
         req: crate::model::EvaluateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EvaluateInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EvaluateInstancesResponse>> {
         self.inner.evaluate_instances(req, options).await
     }
 
@@ -925,8 +917,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -934,8 +926,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -943,8 +935,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -952,8 +944,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -961,9 +953,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -971,9 +962,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -981,8 +971,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -990,8 +980,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -999,8 +989,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -1008,8 +998,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -1043,8 +1033,8 @@ where
     async fn create_feature_online_store(
         &self,
         req: crate::model::CreateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_feature_online_store(req, options).await
     }
 
@@ -1052,8 +1042,8 @@ where
     async fn get_feature_online_store(
         &self,
         req: crate::model::GetFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureOnlineStore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureOnlineStore>> {
         self.inner.get_feature_online_store(req, options).await
     }
 
@@ -1061,8 +1051,8 @@ where
     async fn list_feature_online_stores(
         &self,
         req: crate::model::ListFeatureOnlineStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureOnlineStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureOnlineStoresResponse>> {
         self.inner.list_feature_online_stores(req, options).await
     }
 
@@ -1070,8 +1060,8 @@ where
     async fn update_feature_online_store(
         &self,
         req: crate::model::UpdateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_feature_online_store(req, options).await
     }
 
@@ -1079,8 +1069,8 @@ where
     async fn delete_feature_online_store(
         &self,
         req: crate::model::DeleteFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature_online_store(req, options).await
     }
 
@@ -1088,8 +1078,8 @@ where
     async fn create_feature_view(
         &self,
         req: crate::model::CreateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_feature_view(req, options).await
     }
 
@@ -1097,8 +1087,8 @@ where
     async fn get_feature_view(
         &self,
         req: crate::model::GetFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureView>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureView>> {
         self.inner.get_feature_view(req, options).await
     }
 
@@ -1106,8 +1096,8 @@ where
     async fn list_feature_views(
         &self,
         req: crate::model::ListFeatureViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureViewsResponse>> {
         self.inner.list_feature_views(req, options).await
     }
 
@@ -1115,8 +1105,8 @@ where
     async fn update_feature_view(
         &self,
         req: crate::model::UpdateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_feature_view(req, options).await
     }
 
@@ -1124,8 +1114,8 @@ where
     async fn delete_feature_view(
         &self,
         req: crate::model::DeleteFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature_view(req, options).await
     }
 
@@ -1133,8 +1123,8 @@ where
     async fn sync_feature_view(
         &self,
         req: crate::model::SyncFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SyncFeatureViewResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SyncFeatureViewResponse>> {
         self.inner.sync_feature_view(req, options).await
     }
 
@@ -1142,8 +1132,8 @@ where
     async fn get_feature_view_sync(
         &self,
         req: crate::model::GetFeatureViewSyncRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureViewSync>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureViewSync>> {
         self.inner.get_feature_view_sync(req, options).await
     }
 
@@ -1151,8 +1141,8 @@ where
     async fn list_feature_view_syncs(
         &self,
         req: crate::model::ListFeatureViewSyncsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureViewSyncsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureViewSyncsResponse>> {
         self.inner.list_feature_view_syncs(req, options).await
     }
 
@@ -1160,8 +1150,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1169,8 +1159,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1178,8 +1168,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1187,8 +1177,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1196,9 +1186,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1206,9 +1195,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1216,8 +1204,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1225,8 +1213,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1234,8 +1222,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -1243,22 +1231,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1292,8 +1280,8 @@ where
     async fn fetch_feature_values(
         &self,
         req: crate::model::FetchFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchFeatureValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchFeatureValuesResponse>> {
         self.inner.fetch_feature_values(req, options).await
     }
 
@@ -1301,8 +1289,8 @@ where
     async fn search_nearest_entities(
         &self,
         req: crate::model::SearchNearestEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchNearestEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchNearestEntitiesResponse>> {
         self.inner.search_nearest_entities(req, options).await
     }
 
@@ -1310,8 +1298,8 @@ where
     async fn generate_fetch_access_token(
         &self,
         req: crate::model::GenerateFetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateFetchAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateFetchAccessTokenResponse>> {
         self.inner.generate_fetch_access_token(req, options).await
     }
 
@@ -1319,8 +1307,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1328,8 +1316,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1337,8 +1325,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1346,8 +1334,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1355,9 +1343,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1365,9 +1352,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1375,8 +1361,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1384,8 +1370,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1393,8 +1379,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -1402,8 +1388,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -1437,8 +1423,8 @@ where
     async fn create_feature_group(
         &self,
         req: crate::model::CreateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_feature_group(req, options).await
     }
 
@@ -1446,8 +1432,8 @@ where
     async fn get_feature_group(
         &self,
         req: crate::model::GetFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureGroup>> {
         self.inner.get_feature_group(req, options).await
     }
 
@@ -1455,8 +1441,8 @@ where
     async fn list_feature_groups(
         &self,
         req: crate::model::ListFeatureGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureGroupsResponse>> {
         self.inner.list_feature_groups(req, options).await
     }
 
@@ -1464,8 +1450,8 @@ where
     async fn update_feature_group(
         &self,
         req: crate::model::UpdateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_feature_group(req, options).await
     }
 
@@ -1473,8 +1459,8 @@ where
     async fn delete_feature_group(
         &self,
         req: crate::model::DeleteFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature_group(req, options).await
     }
 
@@ -1482,8 +1468,8 @@ where
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_feature(req, options).await
     }
 
@@ -1491,8 +1477,8 @@ where
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_create_features(req, options).await
     }
 
@@ -1500,8 +1486,8 @@ where
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         self.inner.get_feature(req, options).await
     }
 
@@ -1509,8 +1495,8 @@ where
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturesResponse>> {
         self.inner.list_features(req, options).await
     }
 
@@ -1518,8 +1504,8 @@ where
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_feature(req, options).await
     }
 
@@ -1527,8 +1513,8 @@ where
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature(req, options).await
     }
 
@@ -1536,8 +1522,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1545,8 +1531,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1554,8 +1540,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1563,8 +1549,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1572,9 +1558,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1582,9 +1567,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1592,8 +1576,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1601,8 +1585,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1610,8 +1594,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -1619,22 +1603,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1668,8 +1652,8 @@ where
     async fn read_feature_values(
         &self,
         req: crate::model::ReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadFeatureValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadFeatureValuesResponse>> {
         self.inner.read_feature_values(req, options).await
     }
 
@@ -1677,8 +1661,8 @@ where
     async fn write_feature_values(
         &self,
         req: crate::model::WriteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteFeatureValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteFeatureValuesResponse>> {
         self.inner.write_feature_values(req, options).await
     }
 
@@ -1686,8 +1670,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1695,8 +1679,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1704,8 +1688,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1713,8 +1697,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1722,9 +1706,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1732,9 +1715,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1742,8 +1724,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1751,8 +1733,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1760,8 +1742,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -1769,8 +1751,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -1804,8 +1786,8 @@ where
     async fn create_featurestore(
         &self,
         req: crate::model::CreateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_featurestore(req, options).await
     }
 
@@ -1813,8 +1795,8 @@ where
     async fn get_featurestore(
         &self,
         req: crate::model::GetFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Featurestore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Featurestore>> {
         self.inner.get_featurestore(req, options).await
     }
 
@@ -1822,8 +1804,8 @@ where
     async fn list_featurestores(
         &self,
         req: crate::model::ListFeaturestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturestoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturestoresResponse>> {
         self.inner.list_featurestores(req, options).await
     }
 
@@ -1831,8 +1813,8 @@ where
     async fn update_featurestore(
         &self,
         req: crate::model::UpdateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_featurestore(req, options).await
     }
 
@@ -1840,8 +1822,8 @@ where
     async fn delete_featurestore(
         &self,
         req: crate::model::DeleteFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_featurestore(req, options).await
     }
 
@@ -1849,8 +1831,8 @@ where
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_entity_type(req, options).await
     }
 
@@ -1858,8 +1840,8 @@ where
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.get_entity_type(req, options).await
     }
 
@@ -1867,8 +1849,8 @@ where
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         self.inner.list_entity_types(req, options).await
     }
 
@@ -1876,8 +1858,8 @@ where
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.update_entity_type(req, options).await
     }
 
@@ -1885,8 +1867,8 @@ where
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_entity_type(req, options).await
     }
 
@@ -1894,8 +1876,8 @@ where
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_feature(req, options).await
     }
 
@@ -1903,8 +1885,8 @@ where
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_create_features(req, options).await
     }
 
@@ -1912,8 +1894,8 @@ where
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         self.inner.get_feature(req, options).await
     }
 
@@ -1921,8 +1903,8 @@ where
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturesResponse>> {
         self.inner.list_features(req, options).await
     }
 
@@ -1930,8 +1912,8 @@ where
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         self.inner.update_feature(req, options).await
     }
 
@@ -1939,8 +1921,8 @@ where
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature(req, options).await
     }
 
@@ -1948,8 +1930,8 @@ where
     async fn import_feature_values(
         &self,
         req: crate::model::ImportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_feature_values(req, options).await
     }
 
@@ -1957,8 +1939,8 @@ where
     async fn batch_read_feature_values(
         &self,
         req: crate::model::BatchReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_read_feature_values(req, options).await
     }
 
@@ -1966,8 +1948,8 @@ where
     async fn export_feature_values(
         &self,
         req: crate::model::ExportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_feature_values(req, options).await
     }
 
@@ -1975,8 +1957,8 @@ where
     async fn delete_feature_values(
         &self,
         req: crate::model::DeleteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature_values(req, options).await
     }
 
@@ -1984,8 +1966,8 @@ where
     async fn search_features(
         &self,
         req: crate::model::SearchFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchFeaturesResponse>> {
         self.inner.search_features(req, options).await
     }
 
@@ -1993,8 +1975,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2002,8 +1984,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2011,8 +1993,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -2020,8 +2002,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -2029,9 +2011,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2039,9 +2020,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2049,8 +2029,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2058,8 +2038,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -2067,8 +2047,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -2076,22 +2056,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2125,8 +2105,8 @@ where
     async fn create_cached_content(
         &self,
         req: crate::model::CreateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CachedContent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CachedContent>> {
         self.inner.create_cached_content(req, options).await
     }
 
@@ -2134,8 +2114,8 @@ where
     async fn get_cached_content(
         &self,
         req: crate::model::GetCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CachedContent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CachedContent>> {
         self.inner.get_cached_content(req, options).await
     }
 
@@ -2143,8 +2123,8 @@ where
     async fn update_cached_content(
         &self,
         req: crate::model::UpdateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CachedContent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CachedContent>> {
         self.inner.update_cached_content(req, options).await
     }
 
@@ -2152,8 +2132,8 @@ where
     async fn delete_cached_content(
         &self,
         req: crate::model::DeleteCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_cached_content(req, options).await
     }
 
@@ -2161,8 +2141,8 @@ where
     async fn list_cached_contents(
         &self,
         req: crate::model::ListCachedContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCachedContentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCachedContentsResponse>> {
         self.inner.list_cached_contents(req, options).await
     }
 
@@ -2170,8 +2150,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2179,8 +2159,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2188,8 +2168,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -2197,8 +2177,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -2206,9 +2186,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2216,9 +2195,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2226,8 +2204,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2235,8 +2213,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -2244,8 +2222,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -2253,8 +2231,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -2288,8 +2266,8 @@ where
     async fn create_tuning_job(
         &self,
         req: crate::model::CreateTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TuningJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TuningJob>> {
         self.inner.create_tuning_job(req, options).await
     }
 
@@ -2297,8 +2275,8 @@ where
     async fn get_tuning_job(
         &self,
         req: crate::model::GetTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TuningJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TuningJob>> {
         self.inner.get_tuning_job(req, options).await
     }
 
@@ -2306,8 +2284,8 @@ where
     async fn list_tuning_jobs(
         &self,
         req: crate::model::ListTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTuningJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTuningJobsResponse>> {
         self.inner.list_tuning_jobs(req, options).await
     }
 
@@ -2315,8 +2293,8 @@ where
     async fn cancel_tuning_job(
         &self,
         req: crate::model::CancelTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_tuning_job(req, options).await
     }
 
@@ -2324,8 +2302,8 @@ where
     async fn rebase_tuned_model(
         &self,
         req: crate::model::RebaseTunedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.rebase_tuned_model(req, options).await
     }
 
@@ -2333,8 +2311,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2342,8 +2320,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2351,8 +2329,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -2360,8 +2338,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -2369,9 +2347,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2379,9 +2356,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2389,8 +2365,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2398,8 +2374,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -2407,8 +2383,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -2416,22 +2392,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2465,8 +2441,8 @@ where
     async fn create_index_endpoint(
         &self,
         req: crate::model::CreateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_index_endpoint(req, options).await
     }
 
@@ -2474,8 +2450,8 @@ where
     async fn get_index_endpoint(
         &self,
         req: crate::model::GetIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IndexEndpoint>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IndexEndpoint>> {
         self.inner.get_index_endpoint(req, options).await
     }
 
@@ -2483,8 +2459,8 @@ where
     async fn list_index_endpoints(
         &self,
         req: crate::model::ListIndexEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIndexEndpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIndexEndpointsResponse>> {
         self.inner.list_index_endpoints(req, options).await
     }
 
@@ -2492,8 +2468,8 @@ where
     async fn update_index_endpoint(
         &self,
         req: crate::model::UpdateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IndexEndpoint>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IndexEndpoint>> {
         self.inner.update_index_endpoint(req, options).await
     }
 
@@ -2501,8 +2477,8 @@ where
     async fn delete_index_endpoint(
         &self,
         req: crate::model::DeleteIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_index_endpoint(req, options).await
     }
 
@@ -2510,8 +2486,8 @@ where
     async fn deploy_index(
         &self,
         req: crate::model::DeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy_index(req, options).await
     }
 
@@ -2519,8 +2495,8 @@ where
     async fn undeploy_index(
         &self,
         req: crate::model::UndeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undeploy_index(req, options).await
     }
 
@@ -2528,8 +2504,8 @@ where
     async fn mutate_deployed_index(
         &self,
         req: crate::model::MutateDeployedIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.mutate_deployed_index(req, options).await
     }
 
@@ -2537,8 +2513,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2546,8 +2522,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2555,8 +2531,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -2564,8 +2540,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -2573,9 +2549,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2583,9 +2558,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2593,8 +2567,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2602,8 +2576,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -2611,8 +2585,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -2620,22 +2594,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2669,8 +2643,8 @@ where
     async fn create_index(
         &self,
         req: crate::model::CreateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_index(req, options).await
     }
 
@@ -2678,8 +2652,8 @@ where
     async fn get_index(
         &self,
         req: crate::model::GetIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Index>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Index>> {
         self.inner.get_index(req, options).await
     }
 
@@ -2687,8 +2661,8 @@ where
     async fn list_indexes(
         &self,
         req: crate::model::ListIndexesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIndexesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIndexesResponse>> {
         self.inner.list_indexes(req, options).await
     }
 
@@ -2696,8 +2670,8 @@ where
     async fn update_index(
         &self,
         req: crate::model::UpdateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_index(req, options).await
     }
 
@@ -2705,8 +2679,8 @@ where
     async fn delete_index(
         &self,
         req: crate::model::DeleteIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_index(req, options).await
     }
 
@@ -2714,8 +2688,8 @@ where
     async fn upsert_datapoints(
         &self,
         req: crate::model::UpsertDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UpsertDatapointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UpsertDatapointsResponse>> {
         self.inner.upsert_datapoints(req, options).await
     }
 
@@ -2723,8 +2697,8 @@ where
     async fn remove_datapoints(
         &self,
         req: crate::model::RemoveDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveDatapointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveDatapointsResponse>> {
         self.inner.remove_datapoints(req, options).await
     }
 
@@ -2732,8 +2706,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2741,8 +2715,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2750,8 +2724,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -2759,8 +2733,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -2768,9 +2742,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2778,9 +2751,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2788,8 +2760,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2797,8 +2769,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -2806,8 +2778,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -2815,22 +2787,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2864,8 +2836,8 @@ where
     async fn create_custom_job(
         &self,
         req: crate::model::CreateCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CustomJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CustomJob>> {
         self.inner.create_custom_job(req, options).await
     }
 
@@ -2873,8 +2845,8 @@ where
     async fn get_custom_job(
         &self,
         req: crate::model::GetCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CustomJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CustomJob>> {
         self.inner.get_custom_job(req, options).await
     }
 
@@ -2882,8 +2854,8 @@ where
     async fn list_custom_jobs(
         &self,
         req: crate::model::ListCustomJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomJobsResponse>> {
         self.inner.list_custom_jobs(req, options).await
     }
 
@@ -2891,8 +2863,8 @@ where
     async fn delete_custom_job(
         &self,
         req: crate::model::DeleteCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_custom_job(req, options).await
     }
 
@@ -2900,8 +2872,8 @@ where
     async fn cancel_custom_job(
         &self,
         req: crate::model::CancelCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_custom_job(req, options).await
     }
 
@@ -2909,8 +2881,8 @@ where
     async fn create_data_labeling_job(
         &self,
         req: crate::model::CreateDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataLabelingJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataLabelingJob>> {
         self.inner.create_data_labeling_job(req, options).await
     }
 
@@ -2918,8 +2890,8 @@ where
     async fn get_data_labeling_job(
         &self,
         req: crate::model::GetDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataLabelingJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataLabelingJob>> {
         self.inner.get_data_labeling_job(req, options).await
     }
 
@@ -2927,8 +2899,8 @@ where
     async fn list_data_labeling_jobs(
         &self,
         req: crate::model::ListDataLabelingJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataLabelingJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataLabelingJobsResponse>> {
         self.inner.list_data_labeling_jobs(req, options).await
     }
 
@@ -2936,8 +2908,8 @@ where
     async fn delete_data_labeling_job(
         &self,
         req: crate::model::DeleteDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_data_labeling_job(req, options).await
     }
 
@@ -2945,8 +2917,8 @@ where
     async fn cancel_data_labeling_job(
         &self,
         req: crate::model::CancelDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_data_labeling_job(req, options).await
     }
 
@@ -2954,8 +2926,8 @@ where
     async fn create_hyperparameter_tuning_job(
         &self,
         req: crate::model::CreateHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HyperparameterTuningJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HyperparameterTuningJob>> {
         self.inner
             .create_hyperparameter_tuning_job(req, options)
             .await
@@ -2965,8 +2937,8 @@ where
     async fn get_hyperparameter_tuning_job(
         &self,
         req: crate::model::GetHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HyperparameterTuningJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HyperparameterTuningJob>> {
         self.inner.get_hyperparameter_tuning_job(req, options).await
     }
 
@@ -2974,8 +2946,8 @@ where
     async fn list_hyperparameter_tuning_jobs(
         &self,
         req: crate::model::ListHyperparameterTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHyperparameterTuningJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHyperparameterTuningJobsResponse>> {
         self.inner
             .list_hyperparameter_tuning_jobs(req, options)
             .await
@@ -2985,8 +2957,8 @@ where
     async fn delete_hyperparameter_tuning_job(
         &self,
         req: crate::model::DeleteHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_hyperparameter_tuning_job(req, options)
             .await
@@ -2996,8 +2968,8 @@ where
     async fn cancel_hyperparameter_tuning_job(
         &self,
         req: crate::model::CancelHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .cancel_hyperparameter_tuning_job(req, options)
             .await
@@ -3007,8 +2979,8 @@ where
     async fn create_nas_job(
         &self,
         req: crate::model::CreateNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NasJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NasJob>> {
         self.inner.create_nas_job(req, options).await
     }
 
@@ -3016,8 +2988,8 @@ where
     async fn get_nas_job(
         &self,
         req: crate::model::GetNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NasJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NasJob>> {
         self.inner.get_nas_job(req, options).await
     }
 
@@ -3025,8 +2997,8 @@ where
     async fn list_nas_jobs(
         &self,
         req: crate::model::ListNasJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNasJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNasJobsResponse>> {
         self.inner.list_nas_jobs(req, options).await
     }
 
@@ -3034,8 +3006,8 @@ where
     async fn delete_nas_job(
         &self,
         req: crate::model::DeleteNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_nas_job(req, options).await
     }
 
@@ -3043,8 +3015,8 @@ where
     async fn cancel_nas_job(
         &self,
         req: crate::model::CancelNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_nas_job(req, options).await
     }
 
@@ -3052,8 +3024,8 @@ where
     async fn get_nas_trial_detail(
         &self,
         req: crate::model::GetNasTrialDetailRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NasTrialDetail>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NasTrialDetail>> {
         self.inner.get_nas_trial_detail(req, options).await
     }
 
@@ -3061,8 +3033,8 @@ where
     async fn list_nas_trial_details(
         &self,
         req: crate::model::ListNasTrialDetailsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNasTrialDetailsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNasTrialDetailsResponse>> {
         self.inner.list_nas_trial_details(req, options).await
     }
 
@@ -3070,8 +3042,8 @@ where
     async fn create_batch_prediction_job(
         &self,
         req: crate::model::CreateBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchPredictionJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchPredictionJob>> {
         self.inner.create_batch_prediction_job(req, options).await
     }
 
@@ -3079,8 +3051,8 @@ where
     async fn get_batch_prediction_job(
         &self,
         req: crate::model::GetBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchPredictionJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchPredictionJob>> {
         self.inner.get_batch_prediction_job(req, options).await
     }
 
@@ -3088,8 +3060,8 @@ where
     async fn list_batch_prediction_jobs(
         &self,
         req: crate::model::ListBatchPredictionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBatchPredictionJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBatchPredictionJobsResponse>> {
         self.inner.list_batch_prediction_jobs(req, options).await
     }
 
@@ -3097,8 +3069,8 @@ where
     async fn delete_batch_prediction_job(
         &self,
         req: crate::model::DeleteBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_batch_prediction_job(req, options).await
     }
 
@@ -3106,8 +3078,8 @@ where
     async fn cancel_batch_prediction_job(
         &self,
         req: crate::model::CancelBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_batch_prediction_job(req, options).await
     }
 
@@ -3115,8 +3087,8 @@ where
     async fn create_model_deployment_monitoring_job(
         &self,
         req: crate::model::CreateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>> {
         self.inner
             .create_model_deployment_monitoring_job(req, options)
             .await
@@ -3126,12 +3098,9 @@ where
     async fn search_model_deployment_monitoring_stats_anomalies(
         &self,
         req: crate::model::SearchModelDeploymentMonitoringStatsAnomaliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<
-            crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-        >,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse>>
+    {
         self.inner
             .search_model_deployment_monitoring_stats_anomalies(req, options)
             .await
@@ -3141,8 +3110,8 @@ where
     async fn get_model_deployment_monitoring_job(
         &self,
         req: crate::model::GetModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>> {
         self.inner
             .get_model_deployment_monitoring_job(req, options)
             .await
@@ -3152,9 +3121,8 @@ where
     async fn list_model_deployment_monitoring_jobs(
         &self,
         req: crate::model::ListModelDeploymentMonitoringJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>> {
         self.inner
             .list_model_deployment_monitoring_jobs(req, options)
             .await
@@ -3164,8 +3132,8 @@ where
     async fn update_model_deployment_monitoring_job(
         &self,
         req: crate::model::UpdateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_model_deployment_monitoring_job(req, options)
             .await
@@ -3175,8 +3143,8 @@ where
     async fn delete_model_deployment_monitoring_job(
         &self,
         req: crate::model::DeleteModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_model_deployment_monitoring_job(req, options)
             .await
@@ -3186,8 +3154,8 @@ where
     async fn pause_model_deployment_monitoring_job(
         &self,
         req: crate::model::PauseModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .pause_model_deployment_monitoring_job(req, options)
             .await
@@ -3197,8 +3165,8 @@ where
     async fn resume_model_deployment_monitoring_job(
         &self,
         req: crate::model::ResumeModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .resume_model_deployment_monitoring_job(req, options)
             .await
@@ -3208,8 +3176,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -3217,8 +3185,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -3226,8 +3194,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -3235,8 +3203,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -3244,9 +3212,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -3254,9 +3221,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -3264,8 +3230,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -3273,8 +3239,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -3282,8 +3248,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -3291,22 +3257,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3340,8 +3306,8 @@ where
     async fn count_tokens(
         &self,
         req: crate::model::CountTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CountTokensResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CountTokensResponse>> {
         self.inner.count_tokens(req, options).await
     }
 
@@ -3349,8 +3315,8 @@ where
     async fn compute_tokens(
         &self,
         req: crate::model::ComputeTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ComputeTokensResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ComputeTokensResponse>> {
         self.inner.compute_tokens(req, options).await
     }
 
@@ -3358,8 +3324,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -3367,8 +3333,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -3376,8 +3342,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -3385,8 +3351,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -3394,9 +3360,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -3404,9 +3369,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -3414,8 +3378,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -3423,8 +3387,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -3432,8 +3396,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -3441,8 +3405,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -3476,8 +3440,8 @@ where
     async fn find_neighbors(
         &self,
         req: crate::model::FindNeighborsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FindNeighborsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FindNeighborsResponse>> {
         self.inner.find_neighbors(req, options).await
     }
 
@@ -3485,8 +3449,8 @@ where
     async fn read_index_datapoints(
         &self,
         req: crate::model::ReadIndexDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadIndexDatapointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadIndexDatapointsResponse>> {
         self.inner.read_index_datapoints(req, options).await
     }
 
@@ -3494,8 +3458,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -3503,8 +3467,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -3512,8 +3476,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -3521,8 +3485,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -3530,9 +3494,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -3540,9 +3503,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -3550,8 +3512,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -3559,8 +3521,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -3568,8 +3530,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -3577,8 +3539,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -3612,8 +3574,8 @@ where
     async fn create_metadata_store(
         &self,
         req: crate::model::CreateMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_metadata_store(req, options).await
     }
 
@@ -3621,8 +3583,8 @@ where
     async fn get_metadata_store(
         &self,
         req: crate::model::GetMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataStore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataStore>> {
         self.inner.get_metadata_store(req, options).await
     }
 
@@ -3630,8 +3592,8 @@ where
     async fn list_metadata_stores(
         &self,
         req: crate::model::ListMetadataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataStoresResponse>> {
         self.inner.list_metadata_stores(req, options).await
     }
 
@@ -3639,8 +3601,8 @@ where
     async fn delete_metadata_store(
         &self,
         req: crate::model::DeleteMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_metadata_store(req, options).await
     }
 
@@ -3648,8 +3610,8 @@ where
     async fn create_artifact(
         &self,
         req: crate::model::CreateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Artifact>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Artifact>> {
         self.inner.create_artifact(req, options).await
     }
 
@@ -3657,8 +3619,8 @@ where
     async fn get_artifact(
         &self,
         req: crate::model::GetArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Artifact>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Artifact>> {
         self.inner.get_artifact(req, options).await
     }
 
@@ -3666,8 +3628,8 @@ where
     async fn list_artifacts(
         &self,
         req: crate::model::ListArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListArtifactsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListArtifactsResponse>> {
         self.inner.list_artifacts(req, options).await
     }
 
@@ -3675,8 +3637,8 @@ where
     async fn update_artifact(
         &self,
         req: crate::model::UpdateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Artifact>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Artifact>> {
         self.inner.update_artifact(req, options).await
     }
 
@@ -3684,8 +3646,8 @@ where
     async fn delete_artifact(
         &self,
         req: crate::model::DeleteArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_artifact(req, options).await
     }
 
@@ -3693,8 +3655,8 @@ where
     async fn purge_artifacts(
         &self,
         req: crate::model::PurgeArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_artifacts(req, options).await
     }
 
@@ -3702,8 +3664,8 @@ where
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.create_context(req, options).await
     }
 
@@ -3711,8 +3673,8 @@ where
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.get_context(req, options).await
     }
 
@@ -3720,8 +3682,8 @@ where
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContextsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContextsResponse>> {
         self.inner.list_contexts(req, options).await
     }
 
@@ -3729,8 +3691,8 @@ where
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.update_context(req, options).await
     }
 
@@ -3738,8 +3700,8 @@ where
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_context(req, options).await
     }
 
@@ -3747,8 +3709,8 @@ where
     async fn purge_contexts(
         &self,
         req: crate::model::PurgeContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_contexts(req, options).await
     }
 
@@ -3756,9 +3718,8 @@ where
     async fn add_context_artifacts_and_executions(
         &self,
         req: crate::model::AddContextArtifactsAndExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddContextArtifactsAndExecutionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddContextArtifactsAndExecutionsResponse>> {
         self.inner
             .add_context_artifacts_and_executions(req, options)
             .await
@@ -3768,8 +3729,8 @@ where
     async fn add_context_children(
         &self,
         req: crate::model::AddContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddContextChildrenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddContextChildrenResponse>> {
         self.inner.add_context_children(req, options).await
     }
 
@@ -3777,8 +3738,8 @@ where
     async fn remove_context_children(
         &self,
         req: crate::model::RemoveContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveContextChildrenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveContextChildrenResponse>> {
         self.inner.remove_context_children(req, options).await
     }
 
@@ -3786,8 +3747,8 @@ where
     async fn query_context_lineage_subgraph(
         &self,
         req: crate::model::QueryContextLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageSubgraph>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageSubgraph>> {
         self.inner
             .query_context_lineage_subgraph(req, options)
             .await
@@ -3797,8 +3758,8 @@ where
     async fn create_execution(
         &self,
         req: crate::model::CreateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Execution>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Execution>> {
         self.inner.create_execution(req, options).await
     }
 
@@ -3806,8 +3767,8 @@ where
     async fn get_execution(
         &self,
         req: crate::model::GetExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Execution>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Execution>> {
         self.inner.get_execution(req, options).await
     }
 
@@ -3815,8 +3776,8 @@ where
     async fn list_executions(
         &self,
         req: crate::model::ListExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExecutionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExecutionsResponse>> {
         self.inner.list_executions(req, options).await
     }
 
@@ -3824,8 +3785,8 @@ where
     async fn update_execution(
         &self,
         req: crate::model::UpdateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Execution>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Execution>> {
         self.inner.update_execution(req, options).await
     }
 
@@ -3833,8 +3794,8 @@ where
     async fn delete_execution(
         &self,
         req: crate::model::DeleteExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_execution(req, options).await
     }
 
@@ -3842,8 +3803,8 @@ where
     async fn purge_executions(
         &self,
         req: crate::model::PurgeExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_executions(req, options).await
     }
 
@@ -3851,8 +3812,8 @@ where
     async fn add_execution_events(
         &self,
         req: crate::model::AddExecutionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddExecutionEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddExecutionEventsResponse>> {
         self.inner.add_execution_events(req, options).await
     }
 
@@ -3860,8 +3821,8 @@ where
     async fn query_execution_inputs_and_outputs(
         &self,
         req: crate::model::QueryExecutionInputsAndOutputsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageSubgraph>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageSubgraph>> {
         self.inner
             .query_execution_inputs_and_outputs(req, options)
             .await
@@ -3871,8 +3832,8 @@ where
     async fn create_metadata_schema(
         &self,
         req: crate::model::CreateMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataSchema>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataSchema>> {
         self.inner.create_metadata_schema(req, options).await
     }
 
@@ -3880,8 +3841,8 @@ where
     async fn get_metadata_schema(
         &self,
         req: crate::model::GetMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataSchema>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataSchema>> {
         self.inner.get_metadata_schema(req, options).await
     }
 
@@ -3889,8 +3850,8 @@ where
     async fn list_metadata_schemas(
         &self,
         req: crate::model::ListMetadataSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataSchemasResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataSchemasResponse>> {
         self.inner.list_metadata_schemas(req, options).await
     }
 
@@ -3898,8 +3859,8 @@ where
     async fn query_artifact_lineage_subgraph(
         &self,
         req: crate::model::QueryArtifactLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageSubgraph>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageSubgraph>> {
         self.inner
             .query_artifact_lineage_subgraph(req, options)
             .await
@@ -3909,8 +3870,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -3918,8 +3879,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -3927,8 +3888,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -3936,8 +3897,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -3945,9 +3906,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -3955,9 +3915,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -3965,8 +3924,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -3974,8 +3933,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -3983,8 +3942,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -3992,22 +3951,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4041,8 +4000,8 @@ where
     async fn search_migratable_resources(
         &self,
         req: crate::model::SearchMigratableResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchMigratableResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchMigratableResourcesResponse>> {
         self.inner.search_migratable_resources(req, options).await
     }
 
@@ -4050,8 +4009,8 @@ where
     async fn batch_migrate_resources(
         &self,
         req: crate::model::BatchMigrateResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_migrate_resources(req, options).await
     }
 
@@ -4059,8 +4018,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -4068,8 +4027,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -4077,8 +4036,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4086,8 +4045,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4095,9 +4054,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4105,9 +4063,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -4115,8 +4072,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -4124,8 +4081,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -4133,8 +4090,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -4142,22 +4099,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4191,8 +4148,8 @@ where
     async fn get_publisher_model(
         &self,
         req: crate::model::GetPublisherModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublisherModel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublisherModel>> {
         self.inner.get_publisher_model(req, options).await
     }
 
@@ -4200,8 +4157,8 @@ where
     async fn deploy(
         &self,
         req: crate::model::DeployRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy(req, options).await
     }
 
@@ -4209,8 +4166,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -4218,8 +4175,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -4227,8 +4184,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4236,8 +4193,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4245,9 +4202,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4255,9 +4211,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -4265,8 +4220,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -4274,8 +4229,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -4283,8 +4238,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -4292,22 +4247,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4341,8 +4296,8 @@ where
     async fn upload_model(
         &self,
         req: crate::model::UploadModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.upload_model(req, options).await
     }
 
@@ -4350,8 +4305,8 @@ where
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         self.inner.get_model(req, options).await
     }
 
@@ -4359,8 +4314,8 @@ where
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelsResponse>> {
         self.inner.list_models(req, options).await
     }
 
@@ -4368,8 +4323,8 @@ where
     async fn list_model_versions(
         &self,
         req: crate::model::ListModelVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelVersionsResponse>> {
         self.inner.list_model_versions(req, options).await
     }
 
@@ -4377,8 +4332,8 @@ where
     async fn list_model_version_checkpoints(
         &self,
         req: crate::model::ListModelVersionCheckpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelVersionCheckpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelVersionCheckpointsResponse>> {
         self.inner
             .list_model_version_checkpoints(req, options)
             .await
@@ -4388,8 +4343,8 @@ where
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         self.inner.update_model(req, options).await
     }
 
@@ -4397,8 +4352,8 @@ where
     async fn update_explanation_dataset(
         &self,
         req: crate::model::UpdateExplanationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_explanation_dataset(req, options).await
     }
 
@@ -4406,8 +4361,8 @@ where
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_model(req, options).await
     }
 
@@ -4415,8 +4370,8 @@ where
     async fn delete_model_version(
         &self,
         req: crate::model::DeleteModelVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_model_version(req, options).await
     }
 
@@ -4424,8 +4379,8 @@ where
     async fn merge_version_aliases(
         &self,
         req: crate::model::MergeVersionAliasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         self.inner.merge_version_aliases(req, options).await
     }
 
@@ -4433,8 +4388,8 @@ where
     async fn export_model(
         &self,
         req: crate::model::ExportModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_model(req, options).await
     }
 
@@ -4442,8 +4397,8 @@ where
     async fn copy_model(
         &self,
         req: crate::model::CopyModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.copy_model(req, options).await
     }
 
@@ -4451,8 +4406,8 @@ where
     async fn import_model_evaluation(
         &self,
         req: crate::model::ImportModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelEvaluation>> {
         self.inner.import_model_evaluation(req, options).await
     }
 
@@ -4460,9 +4415,8 @@ where
     async fn batch_import_model_evaluation_slices(
         &self,
         req: crate::model::BatchImportModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchImportModelEvaluationSlicesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchImportModelEvaluationSlicesResponse>> {
         self.inner
             .batch_import_model_evaluation_slices(req, options)
             .await
@@ -4472,9 +4426,8 @@ where
     async fn batch_import_evaluated_annotations(
         &self,
         req: crate::model::BatchImportEvaluatedAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>> {
         self.inner
             .batch_import_evaluated_annotations(req, options)
             .await
@@ -4484,8 +4437,8 @@ where
     async fn get_model_evaluation(
         &self,
         req: crate::model::GetModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelEvaluation>> {
         self.inner.get_model_evaluation(req, options).await
     }
 
@@ -4493,8 +4446,8 @@ where
     async fn list_model_evaluations(
         &self,
         req: crate::model::ListModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelEvaluationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelEvaluationsResponse>> {
         self.inner.list_model_evaluations(req, options).await
     }
 
@@ -4502,8 +4455,8 @@ where
     async fn get_model_evaluation_slice(
         &self,
         req: crate::model::GetModelEvaluationSliceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelEvaluationSlice>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelEvaluationSlice>> {
         self.inner.get_model_evaluation_slice(req, options).await
     }
 
@@ -4511,8 +4464,8 @@ where
     async fn list_model_evaluation_slices(
         &self,
         req: crate::model::ListModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelEvaluationSlicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelEvaluationSlicesResponse>> {
         self.inner.list_model_evaluation_slices(req, options).await
     }
 
@@ -4520,8 +4473,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -4529,8 +4482,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -4538,8 +4491,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4547,8 +4500,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4556,9 +4509,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4566,9 +4518,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -4576,8 +4527,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -4585,8 +4536,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -4594,8 +4545,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -4603,22 +4554,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4652,8 +4603,8 @@ where
     async fn create_notebook_runtime_template(
         &self,
         req: crate::model::CreateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_notebook_runtime_template(req, options)
             .await
@@ -4663,8 +4614,8 @@ where
     async fn get_notebook_runtime_template(
         &self,
         req: crate::model::GetNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookRuntimeTemplate>> {
         self.inner.get_notebook_runtime_template(req, options).await
     }
 
@@ -4672,8 +4623,8 @@ where
     async fn list_notebook_runtime_templates(
         &self,
         req: crate::model::ListNotebookRuntimeTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotebookRuntimeTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotebookRuntimeTemplatesResponse>> {
         self.inner
             .list_notebook_runtime_templates(req, options)
             .await
@@ -4683,8 +4634,8 @@ where
     async fn delete_notebook_runtime_template(
         &self,
         req: crate::model::DeleteNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_notebook_runtime_template(req, options)
             .await
@@ -4694,8 +4645,8 @@ where
     async fn update_notebook_runtime_template(
         &self,
         req: crate::model::UpdateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookRuntimeTemplate>> {
         self.inner
             .update_notebook_runtime_template(req, options)
             .await
@@ -4705,8 +4656,8 @@ where
     async fn assign_notebook_runtime(
         &self,
         req: crate::model::AssignNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.assign_notebook_runtime(req, options).await
     }
 
@@ -4714,8 +4665,8 @@ where
     async fn get_notebook_runtime(
         &self,
         req: crate::model::GetNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookRuntime>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookRuntime>> {
         self.inner.get_notebook_runtime(req, options).await
     }
 
@@ -4723,8 +4674,8 @@ where
     async fn list_notebook_runtimes(
         &self,
         req: crate::model::ListNotebookRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotebookRuntimesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotebookRuntimesResponse>> {
         self.inner.list_notebook_runtimes(req, options).await
     }
 
@@ -4732,8 +4683,8 @@ where
     async fn delete_notebook_runtime(
         &self,
         req: crate::model::DeleteNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_notebook_runtime(req, options).await
     }
 
@@ -4741,8 +4692,8 @@ where
     async fn upgrade_notebook_runtime(
         &self,
         req: crate::model::UpgradeNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.upgrade_notebook_runtime(req, options).await
     }
 
@@ -4750,8 +4701,8 @@ where
     async fn start_notebook_runtime(
         &self,
         req: crate::model::StartNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.start_notebook_runtime(req, options).await
     }
 
@@ -4759,8 +4710,8 @@ where
     async fn stop_notebook_runtime(
         &self,
         req: crate::model::StopNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.stop_notebook_runtime(req, options).await
     }
 
@@ -4768,8 +4719,8 @@ where
     async fn create_notebook_execution_job(
         &self,
         req: crate::model::CreateNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_notebook_execution_job(req, options).await
     }
 
@@ -4777,8 +4728,8 @@ where
     async fn get_notebook_execution_job(
         &self,
         req: crate::model::GetNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookExecutionJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookExecutionJob>> {
         self.inner.get_notebook_execution_job(req, options).await
     }
 
@@ -4786,8 +4737,8 @@ where
     async fn list_notebook_execution_jobs(
         &self,
         req: crate::model::ListNotebookExecutionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotebookExecutionJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotebookExecutionJobsResponse>> {
         self.inner.list_notebook_execution_jobs(req, options).await
     }
 
@@ -4795,8 +4746,8 @@ where
     async fn delete_notebook_execution_job(
         &self,
         req: crate::model::DeleteNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_notebook_execution_job(req, options).await
     }
 
@@ -4804,8 +4755,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -4813,8 +4764,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -4822,8 +4773,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4831,8 +4782,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4840,9 +4791,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4850,9 +4800,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -4860,8 +4809,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -4869,8 +4818,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -4878,8 +4827,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -4887,22 +4836,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4936,8 +4885,8 @@ where
     async fn create_persistent_resource(
         &self,
         req: crate::model::CreatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_persistent_resource(req, options).await
     }
 
@@ -4945,8 +4894,8 @@ where
     async fn get_persistent_resource(
         &self,
         req: crate::model::GetPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PersistentResource>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PersistentResource>> {
         self.inner.get_persistent_resource(req, options).await
     }
 
@@ -4954,8 +4903,8 @@ where
     async fn list_persistent_resources(
         &self,
         req: crate::model::ListPersistentResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPersistentResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPersistentResourcesResponse>> {
         self.inner.list_persistent_resources(req, options).await
     }
 
@@ -4963,8 +4912,8 @@ where
     async fn delete_persistent_resource(
         &self,
         req: crate::model::DeletePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_persistent_resource(req, options).await
     }
 
@@ -4972,8 +4921,8 @@ where
     async fn update_persistent_resource(
         &self,
         req: crate::model::UpdatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_persistent_resource(req, options).await
     }
 
@@ -4981,8 +4930,8 @@ where
     async fn reboot_persistent_resource(
         &self,
         req: crate::model::RebootPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reboot_persistent_resource(req, options).await
     }
 
@@ -4990,8 +4939,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -4999,8 +4948,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -5008,8 +4957,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5017,8 +4966,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5026,9 +4975,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5036,9 +4984,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -5046,8 +4993,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -5055,8 +5002,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -5064,8 +5011,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -5073,22 +5020,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5122,8 +5069,8 @@ where
     async fn create_training_pipeline(
         &self,
         req: crate::model::CreateTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TrainingPipeline>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TrainingPipeline>> {
         self.inner.create_training_pipeline(req, options).await
     }
 
@@ -5131,8 +5078,8 @@ where
     async fn get_training_pipeline(
         &self,
         req: crate::model::GetTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TrainingPipeline>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TrainingPipeline>> {
         self.inner.get_training_pipeline(req, options).await
     }
 
@@ -5140,8 +5087,8 @@ where
     async fn list_training_pipelines(
         &self,
         req: crate::model::ListTrainingPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTrainingPipelinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTrainingPipelinesResponse>> {
         self.inner.list_training_pipelines(req, options).await
     }
 
@@ -5149,8 +5096,8 @@ where
     async fn delete_training_pipeline(
         &self,
         req: crate::model::DeleteTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_training_pipeline(req, options).await
     }
 
@@ -5158,8 +5105,8 @@ where
     async fn cancel_training_pipeline(
         &self,
         req: crate::model::CancelTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_training_pipeline(req, options).await
     }
 
@@ -5167,8 +5114,8 @@ where
     async fn create_pipeline_job(
         &self,
         req: crate::model::CreatePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PipelineJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PipelineJob>> {
         self.inner.create_pipeline_job(req, options).await
     }
 
@@ -5176,8 +5123,8 @@ where
     async fn get_pipeline_job(
         &self,
         req: crate::model::GetPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PipelineJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PipelineJob>> {
         self.inner.get_pipeline_job(req, options).await
     }
 
@@ -5185,8 +5132,8 @@ where
     async fn list_pipeline_jobs(
         &self,
         req: crate::model::ListPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPipelineJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPipelineJobsResponse>> {
         self.inner.list_pipeline_jobs(req, options).await
     }
 
@@ -5194,8 +5141,8 @@ where
     async fn delete_pipeline_job(
         &self,
         req: crate::model::DeletePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_pipeline_job(req, options).await
     }
 
@@ -5203,8 +5150,8 @@ where
     async fn batch_delete_pipeline_jobs(
         &self,
         req: crate::model::BatchDeletePipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_delete_pipeline_jobs(req, options).await
     }
 
@@ -5212,8 +5159,8 @@ where
     async fn cancel_pipeline_job(
         &self,
         req: crate::model::CancelPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_pipeline_job(req, options).await
     }
 
@@ -5221,8 +5168,8 @@ where
     async fn batch_cancel_pipeline_jobs(
         &self,
         req: crate::model::BatchCancelPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_cancel_pipeline_jobs(req, options).await
     }
 
@@ -5230,8 +5177,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -5239,8 +5186,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -5248,8 +5195,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5257,8 +5204,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5266,9 +5213,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5276,9 +5222,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -5286,8 +5231,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -5295,8 +5240,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -5304,8 +5249,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -5313,22 +5258,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5362,8 +5307,8 @@ where
     async fn predict(
         &self,
         req: crate::model::PredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PredictResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PredictResponse>> {
         self.inner.predict(req, options).await
     }
 
@@ -5371,8 +5316,8 @@ where
     async fn raw_predict(
         &self,
         req: crate::model::RawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.raw_predict(req, options).await
     }
 
@@ -5380,8 +5325,8 @@ where
     async fn direct_predict(
         &self,
         req: crate::model::DirectPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DirectPredictResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DirectPredictResponse>> {
         self.inner.direct_predict(req, options).await
     }
 
@@ -5389,8 +5334,8 @@ where
     async fn direct_raw_predict(
         &self,
         req: crate::model::DirectRawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DirectRawPredictResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DirectRawPredictResponse>> {
         self.inner.direct_raw_predict(req, options).await
     }
 
@@ -5398,8 +5343,8 @@ where
     async fn explain(
         &self,
         req: crate::model::ExplainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExplainResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExplainResponse>> {
         self.inner.explain(req, options).await
     }
 
@@ -5407,8 +5352,8 @@ where
     async fn generate_content(
         &self,
         req: crate::model::GenerateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateContentResponse>> {
         self.inner.generate_content(req, options).await
     }
 
@@ -5416,8 +5361,8 @@ where
     async fn embed_content(
         &self,
         req: crate::model::EmbedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EmbedContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EmbedContentResponse>> {
         self.inner.embed_content(req, options).await
     }
 
@@ -5425,8 +5370,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -5434,8 +5379,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -5443,8 +5388,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5452,8 +5397,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5461,9 +5406,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5471,9 +5415,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -5481,8 +5424,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -5490,8 +5433,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -5499,8 +5442,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -5508,8 +5451,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -5543,8 +5486,8 @@ where
     async fn query_reasoning_engine(
         &self,
         req: crate::model::QueryReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryReasoningEngineResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryReasoningEngineResponse>> {
         self.inner.query_reasoning_engine(req, options).await
     }
 
@@ -5552,8 +5495,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -5561,8 +5504,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -5570,8 +5513,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5579,8 +5522,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5588,9 +5531,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5598,9 +5540,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -5608,8 +5549,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -5617,8 +5558,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -5626,8 +5567,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -5635,8 +5576,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -5670,8 +5611,8 @@ where
     async fn create_reasoning_engine(
         &self,
         req: crate::model::CreateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_reasoning_engine(req, options).await
     }
 
@@ -5679,8 +5620,8 @@ where
     async fn get_reasoning_engine(
         &self,
         req: crate::model::GetReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReasoningEngine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReasoningEngine>> {
         self.inner.get_reasoning_engine(req, options).await
     }
 
@@ -5688,8 +5629,8 @@ where
     async fn list_reasoning_engines(
         &self,
         req: crate::model::ListReasoningEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReasoningEnginesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReasoningEnginesResponse>> {
         self.inner.list_reasoning_engines(req, options).await
     }
 
@@ -5697,8 +5638,8 @@ where
     async fn update_reasoning_engine(
         &self,
         req: crate::model::UpdateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_reasoning_engine(req, options).await
     }
 
@@ -5706,8 +5647,8 @@ where
     async fn delete_reasoning_engine(
         &self,
         req: crate::model::DeleteReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_reasoning_engine(req, options).await
     }
 
@@ -5715,8 +5656,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -5724,8 +5665,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -5733,8 +5674,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5742,8 +5683,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5751,9 +5692,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5761,9 +5701,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -5771,8 +5710,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -5780,8 +5719,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -5789,8 +5728,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -5798,22 +5737,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5847,8 +5786,8 @@ where
     async fn create_schedule(
         &self,
         req: crate::model::CreateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schedule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schedule>> {
         self.inner.create_schedule(req, options).await
     }
 
@@ -5856,8 +5795,8 @@ where
     async fn delete_schedule(
         &self,
         req: crate::model::DeleteScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_schedule(req, options).await
     }
 
@@ -5865,8 +5804,8 @@ where
     async fn get_schedule(
         &self,
         req: crate::model::GetScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schedule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schedule>> {
         self.inner.get_schedule(req, options).await
     }
 
@@ -5874,8 +5813,8 @@ where
     async fn list_schedules(
         &self,
         req: crate::model::ListSchedulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchedulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchedulesResponse>> {
         self.inner.list_schedules(req, options).await
     }
 
@@ -5883,8 +5822,8 @@ where
     async fn pause_schedule(
         &self,
         req: crate::model::PauseScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.pause_schedule(req, options).await
     }
 
@@ -5892,8 +5831,8 @@ where
     async fn resume_schedule(
         &self,
         req: crate::model::ResumeScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.resume_schedule(req, options).await
     }
 
@@ -5901,8 +5840,8 @@ where
     async fn update_schedule(
         &self,
         req: crate::model::UpdateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schedule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schedule>> {
         self.inner.update_schedule(req, options).await
     }
 
@@ -5910,8 +5849,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -5919,8 +5858,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -5928,8 +5867,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5937,8 +5876,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5946,9 +5885,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5956,9 +5894,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -5966,8 +5903,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -5975,8 +5912,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -5984,8 +5921,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -5993,22 +5930,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6042,8 +5979,8 @@ where
     async fn create_specialist_pool(
         &self,
         req: crate::model::CreateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_specialist_pool(req, options).await
     }
 
@@ -6051,8 +5988,8 @@ where
     async fn get_specialist_pool(
         &self,
         req: crate::model::GetSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SpecialistPool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SpecialistPool>> {
         self.inner.get_specialist_pool(req, options).await
     }
 
@@ -6060,8 +5997,8 @@ where
     async fn list_specialist_pools(
         &self,
         req: crate::model::ListSpecialistPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSpecialistPoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSpecialistPoolsResponse>> {
         self.inner.list_specialist_pools(req, options).await
     }
 
@@ -6069,8 +6006,8 @@ where
     async fn delete_specialist_pool(
         &self,
         req: crate::model::DeleteSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_specialist_pool(req, options).await
     }
 
@@ -6078,8 +6015,8 @@ where
     async fn update_specialist_pool(
         &self,
         req: crate::model::UpdateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_specialist_pool(req, options).await
     }
 
@@ -6087,8 +6024,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -6096,8 +6033,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -6105,8 +6042,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -6114,8 +6051,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -6123,9 +6060,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6133,9 +6069,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -6143,8 +6078,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -6152,8 +6087,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -6161,8 +6096,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -6170,22 +6105,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6219,8 +6154,8 @@ where
     async fn create_tensorboard(
         &self,
         req: crate::model::CreateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_tensorboard(req, options).await
     }
 
@@ -6228,8 +6163,8 @@ where
     async fn get_tensorboard(
         &self,
         req: crate::model::GetTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tensorboard>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tensorboard>> {
         self.inner.get_tensorboard(req, options).await
     }
 
@@ -6237,8 +6172,8 @@ where
     async fn update_tensorboard(
         &self,
         req: crate::model::UpdateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_tensorboard(req, options).await
     }
 
@@ -6246,8 +6181,8 @@ where
     async fn list_tensorboards(
         &self,
         req: crate::model::ListTensorboardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardsResponse>> {
         self.inner.list_tensorboards(req, options).await
     }
 
@@ -6255,8 +6190,8 @@ where
     async fn delete_tensorboard(
         &self,
         req: crate::model::DeleteTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_tensorboard(req, options).await
     }
 
@@ -6264,8 +6199,8 @@ where
     async fn read_tensorboard_usage(
         &self,
         req: crate::model::ReadTensorboardUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadTensorboardUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadTensorboardUsageResponse>> {
         self.inner.read_tensorboard_usage(req, options).await
     }
 
@@ -6273,8 +6208,8 @@ where
     async fn read_tensorboard_size(
         &self,
         req: crate::model::ReadTensorboardSizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadTensorboardSizeResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadTensorboardSizeResponse>> {
         self.inner.read_tensorboard_size(req, options).await
     }
 
@@ -6282,8 +6217,8 @@ where
     async fn create_tensorboard_experiment(
         &self,
         req: crate::model::CreateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardExperiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardExperiment>> {
         self.inner.create_tensorboard_experiment(req, options).await
     }
 
@@ -6291,8 +6226,8 @@ where
     async fn get_tensorboard_experiment(
         &self,
         req: crate::model::GetTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardExperiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardExperiment>> {
         self.inner.get_tensorboard_experiment(req, options).await
     }
 
@@ -6300,8 +6235,8 @@ where
     async fn update_tensorboard_experiment(
         &self,
         req: crate::model::UpdateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardExperiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardExperiment>> {
         self.inner.update_tensorboard_experiment(req, options).await
     }
 
@@ -6309,8 +6244,8 @@ where
     async fn list_tensorboard_experiments(
         &self,
         req: crate::model::ListTensorboardExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardExperimentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardExperimentsResponse>> {
         self.inner.list_tensorboard_experiments(req, options).await
     }
 
@@ -6318,8 +6253,8 @@ where
     async fn delete_tensorboard_experiment(
         &self,
         req: crate::model::DeleteTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_tensorboard_experiment(req, options).await
     }
 
@@ -6327,8 +6262,8 @@ where
     async fn create_tensorboard_run(
         &self,
         req: crate::model::CreateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardRun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardRun>> {
         self.inner.create_tensorboard_run(req, options).await
     }
 
@@ -6336,8 +6271,8 @@ where
     async fn batch_create_tensorboard_runs(
         &self,
         req: crate::model::BatchCreateTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchCreateTensorboardRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchCreateTensorboardRunsResponse>> {
         self.inner.batch_create_tensorboard_runs(req, options).await
     }
 
@@ -6345,8 +6280,8 @@ where
     async fn get_tensorboard_run(
         &self,
         req: crate::model::GetTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardRun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardRun>> {
         self.inner.get_tensorboard_run(req, options).await
     }
 
@@ -6354,8 +6289,8 @@ where
     async fn update_tensorboard_run(
         &self,
         req: crate::model::UpdateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardRun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardRun>> {
         self.inner.update_tensorboard_run(req, options).await
     }
 
@@ -6363,8 +6298,8 @@ where
     async fn list_tensorboard_runs(
         &self,
         req: crate::model::ListTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardRunsResponse>> {
         self.inner.list_tensorboard_runs(req, options).await
     }
 
@@ -6372,8 +6307,8 @@ where
     async fn delete_tensorboard_run(
         &self,
         req: crate::model::DeleteTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_tensorboard_run(req, options).await
     }
 
@@ -6381,9 +6316,8 @@ where
     async fn batch_create_tensorboard_time_series(
         &self,
         req: crate::model::BatchCreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>> {
         self.inner
             .batch_create_tensorboard_time_series(req, options)
             .await
@@ -6393,8 +6327,8 @@ where
     async fn create_tensorboard_time_series(
         &self,
         req: crate::model::CreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         self.inner
             .create_tensorboard_time_series(req, options)
             .await
@@ -6404,8 +6338,8 @@ where
     async fn get_tensorboard_time_series(
         &self,
         req: crate::model::GetTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         self.inner.get_tensorboard_time_series(req, options).await
     }
 
@@ -6413,8 +6347,8 @@ where
     async fn update_tensorboard_time_series(
         &self,
         req: crate::model::UpdateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         self.inner
             .update_tensorboard_time_series(req, options)
             .await
@@ -6424,8 +6358,8 @@ where
     async fn list_tensorboard_time_series(
         &self,
         req: crate::model::ListTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardTimeSeriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardTimeSeriesResponse>> {
         self.inner.list_tensorboard_time_series(req, options).await
     }
 
@@ -6433,8 +6367,8 @@ where
     async fn delete_tensorboard_time_series(
         &self,
         req: crate::model::DeleteTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_tensorboard_time_series(req, options)
             .await
@@ -6444,9 +6378,8 @@ where
     async fn batch_read_tensorboard_time_series_data(
         &self,
         req: crate::model::BatchReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>> {
         self.inner
             .batch_read_tensorboard_time_series_data(req, options)
             .await
@@ -6456,8 +6389,8 @@ where
     async fn read_tensorboard_time_series_data(
         &self,
         req: crate::model::ReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>> {
         self.inner
             .read_tensorboard_time_series_data(req, options)
             .await
@@ -6467,8 +6400,8 @@ where
     async fn write_tensorboard_experiment_data(
         &self,
         req: crate::model::WriteTensorboardExperimentDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteTensorboardExperimentDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteTensorboardExperimentDataResponse>> {
         self.inner
             .write_tensorboard_experiment_data(req, options)
             .await
@@ -6478,8 +6411,8 @@ where
     async fn write_tensorboard_run_data(
         &self,
         req: crate::model::WriteTensorboardRunDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteTensorboardRunDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteTensorboardRunDataResponse>> {
         self.inner.write_tensorboard_run_data(req, options).await
     }
 
@@ -6487,9 +6420,8 @@ where
     async fn export_tensorboard_time_series_data(
         &self,
         req: crate::model::ExportTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>> {
         self.inner
             .export_tensorboard_time_series_data(req, options)
             .await
@@ -6499,8 +6431,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -6508,8 +6440,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -6517,8 +6449,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -6526,8 +6458,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -6535,9 +6467,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6545,9 +6476,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -6555,8 +6485,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -6564,8 +6494,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -6573,8 +6503,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -6582,22 +6512,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6631,8 +6561,8 @@ where
     async fn create_rag_corpus(
         &self,
         req: crate::model::CreateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_rag_corpus(req, options).await
     }
 
@@ -6640,8 +6570,8 @@ where
     async fn update_rag_corpus(
         &self,
         req: crate::model::UpdateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_rag_corpus(req, options).await
     }
 
@@ -6649,8 +6579,8 @@ where
     async fn get_rag_corpus(
         &self,
         req: crate::model::GetRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RagCorpus>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RagCorpus>> {
         self.inner.get_rag_corpus(req, options).await
     }
 
@@ -6658,8 +6588,8 @@ where
     async fn list_rag_corpora(
         &self,
         req: crate::model::ListRagCorporaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRagCorporaResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRagCorporaResponse>> {
         self.inner.list_rag_corpora(req, options).await
     }
 
@@ -6667,8 +6597,8 @@ where
     async fn delete_rag_corpus(
         &self,
         req: crate::model::DeleteRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_rag_corpus(req, options).await
     }
 
@@ -6676,8 +6606,8 @@ where
     async fn upload_rag_file(
         &self,
         req: crate::model::UploadRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UploadRagFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UploadRagFileResponse>> {
         self.inner.upload_rag_file(req, options).await
     }
 
@@ -6685,8 +6615,8 @@ where
     async fn import_rag_files(
         &self,
         req: crate::model::ImportRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_rag_files(req, options).await
     }
 
@@ -6694,8 +6624,8 @@ where
     async fn get_rag_file(
         &self,
         req: crate::model::GetRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RagFile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RagFile>> {
         self.inner.get_rag_file(req, options).await
     }
 
@@ -6703,8 +6633,8 @@ where
     async fn list_rag_files(
         &self,
         req: crate::model::ListRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRagFilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRagFilesResponse>> {
         self.inner.list_rag_files(req, options).await
     }
 
@@ -6712,8 +6642,8 @@ where
     async fn delete_rag_file(
         &self,
         req: crate::model::DeleteRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_rag_file(req, options).await
     }
 
@@ -6721,8 +6651,8 @@ where
     async fn update_rag_engine_config(
         &self,
         req: crate::model::UpdateRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_rag_engine_config(req, options).await
     }
 
@@ -6730,8 +6660,8 @@ where
     async fn get_rag_engine_config(
         &self,
         req: crate::model::GetRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RagEngineConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RagEngineConfig>> {
         self.inner.get_rag_engine_config(req, options).await
     }
 
@@ -6739,8 +6669,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -6748,8 +6678,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -6757,8 +6687,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -6766,8 +6696,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -6775,9 +6705,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6785,9 +6714,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -6795,8 +6723,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -6804,8 +6732,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -6813,8 +6741,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -6822,22 +6750,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6871,8 +6799,8 @@ where
     async fn retrieve_contexts(
         &self,
         req: crate::model::RetrieveContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetrieveContextsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetrieveContextsResponse>> {
         self.inner.retrieve_contexts(req, options).await
     }
 
@@ -6880,8 +6808,8 @@ where
     async fn augment_prompt(
         &self,
         req: crate::model::AugmentPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AugmentPromptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AugmentPromptResponse>> {
         self.inner.augment_prompt(req, options).await
     }
 
@@ -6889,8 +6817,8 @@ where
     async fn corroborate_content(
         &self,
         req: crate::model::CorroborateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CorroborateContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CorroborateContentResponse>> {
         self.inner.corroborate_content(req, options).await
     }
 
@@ -6898,8 +6826,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -6907,8 +6835,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -6916,8 +6844,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -6925,8 +6853,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -6934,9 +6862,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6944,9 +6871,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -6954,8 +6880,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -6963,8 +6889,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -6972,8 +6898,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -6981,8 +6907,8 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 }
@@ -7016,8 +6942,8 @@ where
     async fn create_study(
         &self,
         req: crate::model::CreateStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Study>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Study>> {
         self.inner.create_study(req, options).await
     }
 
@@ -7025,8 +6951,8 @@ where
     async fn get_study(
         &self,
         req: crate::model::GetStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Study>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Study>> {
         self.inner.get_study(req, options).await
     }
 
@@ -7034,8 +6960,8 @@ where
     async fn list_studies(
         &self,
         req: crate::model::ListStudiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStudiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStudiesResponse>> {
         self.inner.list_studies(req, options).await
     }
 
@@ -7043,8 +6969,8 @@ where
     async fn delete_study(
         &self,
         req: crate::model::DeleteStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_study(req, options).await
     }
 
@@ -7052,8 +6978,8 @@ where
     async fn lookup_study(
         &self,
         req: crate::model::LookupStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Study>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Study>> {
         self.inner.lookup_study(req, options).await
     }
 
@@ -7061,8 +6987,8 @@ where
     async fn suggest_trials(
         &self,
         req: crate::model::SuggestTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.suggest_trials(req, options).await
     }
 
@@ -7070,8 +6996,8 @@ where
     async fn create_trial(
         &self,
         req: crate::model::CreateTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         self.inner.create_trial(req, options).await
     }
 
@@ -7079,8 +7005,8 @@ where
     async fn get_trial(
         &self,
         req: crate::model::GetTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         self.inner.get_trial(req, options).await
     }
 
@@ -7088,8 +7014,8 @@ where
     async fn list_trials(
         &self,
         req: crate::model::ListTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTrialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTrialsResponse>> {
         self.inner.list_trials(req, options).await
     }
 
@@ -7097,8 +7023,8 @@ where
     async fn add_trial_measurement(
         &self,
         req: crate::model::AddTrialMeasurementRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         self.inner.add_trial_measurement(req, options).await
     }
 
@@ -7106,8 +7032,8 @@ where
     async fn complete_trial(
         &self,
         req: crate::model::CompleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         self.inner.complete_trial(req, options).await
     }
 
@@ -7115,8 +7041,8 @@ where
     async fn delete_trial(
         &self,
         req: crate::model::DeleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_trial(req, options).await
     }
 
@@ -7124,8 +7050,8 @@ where
     async fn check_trial_early_stopping_state(
         &self,
         req: crate::model::CheckTrialEarlyStoppingStateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .check_trial_early_stopping_state(req, options)
             .await
@@ -7135,8 +7061,8 @@ where
     async fn stop_trial(
         &self,
         req: crate::model::StopTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         self.inner.stop_trial(req, options).await
     }
 
@@ -7144,8 +7070,8 @@ where
     async fn list_optimal_trials(
         &self,
         req: crate::model::ListOptimalTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOptimalTrialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOptimalTrialsResponse>> {
         self.inner.list_optimal_trials(req, options).await
     }
 
@@ -7153,8 +7079,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -7162,8 +7088,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -7171,8 +7097,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -7180,8 +7106,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -7189,9 +7115,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -7199,9 +7124,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -7209,8 +7133,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -7218,8 +7142,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -7227,8 +7151,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
@@ -7236,22 +7160,22 @@ where
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.wait_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/aiplatform/v1/src/transport.rs b/src/generated/cloud/aiplatform/v1/src/transport.rs
index 02e59b3a14..305d50eec1 100644
--- a/src/generated/cloud/aiplatform/v1/src/transport.rs
+++ b/src/generated/cloud/aiplatform/v1/src/transport.rs
@@ -14,6 +14,8 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
+#[allow(unused_imports)]
+use crate::Error;
 #[cfg(any(
     feature = "data-foundry-service",
     feature = "dataset-service",
@@ -50,8 +52,6 @@
     feature = "vizier-service",
 ))]
 use crate::Result;
-#[allow(unused_imports)]
-use gax::error::Error;
 
 /// Implements [DataFoundryService](super::stub::DataFoundryService) using a [gaxi::http::ReqwestClient].
 #[cfg(feature = "data-foundry-service")]
@@ -71,7 +71,7 @@ impl std::fmt::Debug for DataFoundryService {
 
 #[cfg(feature = "data-foundry-service")]
 impl DataFoundryService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -82,13 +82,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn generate_synthetic_data(
         &self,
         req: crate::model::GenerateSyntheticDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateSyntheticDataResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateSyntheticDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -125,9 +125,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -142,13 +142,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -204,9 +204,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -221,13 +221,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -858,9 +858,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -875,13 +875,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1640,9 +1640,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1657,14 +1657,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2258,9 +2257,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2275,14 +2274,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6602,9 +6600,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6619,13 +6617,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -8510,9 +8508,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8527,13 +8525,13 @@ impl super::stub::DataFoundryService for DataFoundryService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -10361,9 +10359,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10372,24 +10370,25 @@ impl super::stub::DataFoundryService for DataFoundryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -12084,9 +12083,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12095,24 +12094,25 @@ impl super::stub::DataFoundryService for DataFoundryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -14250,9 +14250,9 @@ impl super::stub::DataFoundryService for DataFoundryService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14283,7 +14283,7 @@ impl std::fmt::Debug for DatasetService {
 
 #[cfg(feature = "dataset-service")]
 impl DatasetService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -14294,13 +14294,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14349,9 +14349,9 @@ impl super::stub::DatasetService for DatasetService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14366,13 +14366,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14460,9 +14460,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14477,13 +14477,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14583,9 +14583,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14600,13 +14600,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatasetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatasetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14687,9 +14687,9 @@ impl super::stub::DatasetService for DatasetService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14704,13 +14704,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14774,9 +14774,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14791,13 +14791,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14838,9 +14838,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14855,13 +14855,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14902,9 +14902,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14919,13 +14919,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn create_dataset_version(
         &self,
         req: crate::model::CreateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14989,9 +14989,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15006,13 +15006,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn update_dataset_version(
         &self,
         req: crate::model::UpdateDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DatasetVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DatasetVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15126,9 +15126,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15143,13 +15143,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn delete_dataset_version(
         &self,
         req: crate::model::DeleteDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15227,9 +15227,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15244,13 +15244,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_dataset_version(
         &self,
         req: crate::model::GetDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DatasetVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DatasetVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15352,9 +15352,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15369,13 +15369,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_dataset_versions(
         &self,
         req: crate::model::ListDatasetVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatasetVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatasetVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15471,9 +15471,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15488,13 +15488,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn restore_dataset_version(
         &self,
         req: crate::model::RestoreDatasetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15572,9 +15572,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15589,13 +15589,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_data_items(
         &self,
         req: crate::model::ListDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataItemsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataItemsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15652,9 +15652,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15669,13 +15669,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn search_data_items(
         &self,
         req: crate::model::SearchDataItemsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchDataItemsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchDataItemsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15751,9 +15751,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15768,13 +15768,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSavedQueriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSavedQueriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15831,9 +15831,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15848,13 +15848,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15899,9 +15899,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15916,13 +15916,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_annotation_spec(
         &self,
         req: crate::model::GetAnnotationSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnnotationSpec>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnnotationSpec>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15979,9 +15979,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15996,13 +15996,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_annotations(
         &self,
         req: crate::model::ListAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnnotationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnnotationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16063,9 +16063,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16080,13 +16080,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16142,9 +16142,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16159,13 +16159,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16235,9 +16235,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16252,13 +16252,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16796,9 +16796,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16813,13 +16813,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17578,9 +17578,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17595,14 +17595,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18196,9 +18195,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18213,14 +18212,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22540,9 +22538,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22557,13 +22555,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -24448,9 +24446,9 @@ impl super::stub::DatasetService for DatasetService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24465,13 +24463,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -26299,9 +26297,9 @@ impl super::stub::DatasetService for DatasetService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26310,24 +26308,25 @@ impl super::stub::DatasetService for DatasetService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -28022,9 +28021,9 @@ impl super::stub::DatasetService for DatasetService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28033,24 +28032,25 @@ impl super::stub::DatasetService for DatasetService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -30188,9 +30188,9 @@ impl super::stub::DatasetService for DatasetService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30204,15 +30204,15 @@ impl super::stub::DatasetService for DatasetService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -30235,7 +30235,7 @@ impl std::fmt::Debug for DeploymentResourcePoolService {
 
 #[cfg(feature = "deployment-resource-pool-service")]
 impl DeploymentResourcePoolService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -30246,13 +30246,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn create_deployment_resource_pool(
         &self,
         req: crate::model::CreateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30289,9 +30289,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30306,13 +30306,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn get_deployment_resource_pool(
         &self,
         req: crate::model::GetDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeploymentResourcePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeploymentResourcePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30353,9 +30353,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30370,13 +30370,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn list_deployment_resource_pools(
         &self,
         req: crate::model::ListDeploymentResourcePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentResourcePoolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentResourcePoolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30415,9 +30415,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30432,13 +30432,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn update_deployment_resource_pool(
         &self,
         req: crate::model::UpdateDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30497,9 +30497,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30514,13 +30514,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn delete_deployment_resource_pool(
         &self,
         req: crate::model::DeleteDeploymentResourcePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30561,9 +30561,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30578,13 +30578,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn query_deployed_models(
         &self,
         req: crate::model::QueryDeployedModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryDeployedModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryDeployedModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30631,9 +30631,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30648,13 +30648,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30710,9 +30710,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30727,13 +30727,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30803,9 +30803,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30820,13 +30820,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31364,9 +31364,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31381,13 +31381,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32146,9 +32146,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32163,14 +32163,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32764,9 +32763,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32781,14 +32780,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37108,9 +37106,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37125,13 +37123,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -39016,9 +39014,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39033,13 +39031,13 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -40867,9 +40865,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40878,24 +40876,25 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -42590,9 +42589,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42601,24 +42600,25 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -44756,9 +44756,9 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44772,15 +44772,15 @@ impl super::stub::DeploymentResourcePoolService for DeploymentResourcePoolServic
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -44803,7 +44803,7 @@ impl std::fmt::Debug for EndpointService {
 
 #[cfg(feature = "endpoint-service")]
 impl EndpointService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -44814,13 +44814,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44858,9 +44858,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44875,13 +44875,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Endpoint>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Endpoint>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44922,9 +44922,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44939,13 +44939,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEndpointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEndpointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44998,9 +44998,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45015,13 +45015,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn update_endpoint(
         &self,
         req: crate::model::UpdateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Endpoint>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Endpoint>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45080,9 +45080,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45097,13 +45097,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn update_endpoint_long_running(
         &self,
         req: crate::model::UpdateEndpointLongRunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45150,9 +45150,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45167,13 +45167,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45214,9 +45214,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45231,13 +45231,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn deploy_model(
         &self,
         req: crate::model::DeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45278,9 +45278,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45295,13 +45295,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn undeploy_model(
         &self,
         req: crate::model::UndeployModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45342,9 +45342,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45359,13 +45359,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn mutate_deployed_model(
         &self,
         req: crate::model::MutateDeployedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45406,9 +45406,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45423,13 +45423,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45485,9 +45485,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45502,13 +45502,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45578,9 +45578,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45595,13 +45595,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46139,9 +46139,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46156,13 +46156,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46921,9 +46921,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46938,14 +46938,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47539,9 +47538,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47556,14 +47555,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51883,9 +51881,9 @@ impl super::stub::EndpointService for EndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51900,13 +51898,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -53791,9 +53789,9 @@ impl super::stub::EndpointService for EndpointService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53808,13 +53806,13 @@ impl super::stub::EndpointService for EndpointService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -55642,9 +55640,9 @@ impl super::stub::EndpointService for EndpointService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55653,24 +55651,25 @@ impl super::stub::EndpointService for EndpointService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -57365,9 +57364,9 @@ impl super::stub::EndpointService for EndpointService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57376,24 +57375,25 @@ impl super::stub::EndpointService for EndpointService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -59531,9 +59531,9 @@ impl super::stub::EndpointService for EndpointService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59547,15 +59547,15 @@ impl super::stub::EndpointService for EndpointService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -59578,7 +59578,7 @@ impl std::fmt::Debug for EvaluationService {
 
 #[cfg(feature = "evaluation-service")]
 impl EvaluationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -59589,13 +59589,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn evaluate_instances(
         &self,
         req: crate::model::EvaluateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EvaluateInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EvaluateInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59632,9 +59632,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59649,13 +59649,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59711,9 +59711,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59728,13 +59728,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59804,9 +59804,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59821,13 +59821,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60365,9 +60365,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60382,13 +60382,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61147,9 +61147,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61164,14 +61164,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61765,9 +61764,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61782,14 +61781,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66109,9 +66107,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66126,13 +66124,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -68017,9 +68015,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68034,13 +68032,13 @@ impl super::stub::EvaluationService for EvaluationService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -69868,9 +69866,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69879,24 +69877,25 @@ impl super::stub::EvaluationService for EvaluationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -71591,9 +71590,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71602,24 +71601,25 @@ impl super::stub::EvaluationService for EvaluationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -73757,9 +73757,9 @@ impl super::stub::EvaluationService for EvaluationService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73790,7 +73790,7 @@ impl std::fmt::Debug for FeatureOnlineStoreAdminService {
 
 #[cfg(feature = "feature-online-store-admin-service")]
 impl FeatureOnlineStoreAdminService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -73801,13 +73801,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn create_feature_online_store(
         &self,
         req: crate::model::CreateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73846,9 +73846,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73863,13 +73863,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn get_feature_online_store(
         &self,
         req: crate::model::GetFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureOnlineStore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureOnlineStore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73910,9 +73910,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73927,13 +73927,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn list_feature_online_stores(
         &self,
         req: crate::model::ListFeatureOnlineStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureOnlineStoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureOnlineStoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73974,9 +73974,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73991,13 +73991,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn update_feature_online_store(
         &self,
         req: crate::model::UpdateFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74056,9 +74056,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74073,13 +74073,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn delete_feature_online_store(
         &self,
         req: crate::model::DeleteFeatureOnlineStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74121,9 +74121,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74138,13 +74138,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn create_feature_view(
         &self,
         req: crate::model::CreateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74187,9 +74187,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74204,13 +74204,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn get_feature_view(
         &self,
         req: crate::model::GetFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureView>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureView>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74255,9 +74255,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74272,13 +74272,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn list_feature_views(
         &self,
         req: crate::model::ListFeatureViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureViewsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureViewsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74323,9 +74323,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74340,13 +74340,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn update_feature_view(
         &self,
         req: crate::model::UpdateFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74409,9 +74409,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74426,13 +74426,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn delete_feature_view(
         &self,
         req: crate::model::DeleteFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74477,9 +74477,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74494,13 +74494,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn sync_feature_view(
         &self,
         req: crate::model::SyncFeatureViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SyncFeatureViewResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SyncFeatureViewResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74545,9 +74545,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74562,13 +74562,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn get_feature_view_sync(
         &self,
         req: crate::model::GetFeatureViewSyncRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureViewSync>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureViewSync>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -74591,9 +74591,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/featureViewSyncs/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74608,13 +74608,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn list_feature_view_syncs(
         &self,
         req: crate::model::ListFeatureViewSyncsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureViewSyncsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureViewSyncsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74663,9 +74663,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74680,13 +74680,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74742,9 +74742,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74759,13 +74759,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -74835,9 +74835,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -74852,13 +74852,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -75396,9 +75396,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -75413,13 +75413,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76178,9 +76178,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -76195,14 +76195,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76796,9 +76795,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -76813,14 +76812,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -81140,9 +81138,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -81157,13 +81155,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -83048,9 +83046,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -83065,13 +83063,13 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -84899,9 +84897,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -84910,24 +84908,25 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -86622,9 +86621,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -86633,24 +86632,25 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -88788,9 +88788,9 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -88804,15 +88804,15 @@ impl super::stub::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminServ
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -88835,7 +88835,7 @@ impl std::fmt::Debug for FeatureOnlineStoreService {
 
 #[cfg(feature = "feature-online-store-service")]
 impl FeatureOnlineStoreService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -88846,13 +88846,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn fetch_feature_values(
         &self,
         req: crate::model::FetchFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchFeatureValuesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchFeatureValuesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88897,9 +88897,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -88914,13 +88914,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn search_nearest_entities(
         &self,
         req: crate::model::SearchNearestEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchNearestEntitiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchNearestEntitiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88965,9 +88965,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -88982,13 +88982,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn generate_fetch_access_token(
         &self,
         req: crate::model::GenerateFetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateFetchAccessTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateFetchAccessTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89033,9 +89033,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -89050,13 +89050,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89112,9 +89112,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -89129,13 +89129,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89205,9 +89205,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -89222,13 +89222,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89766,9 +89766,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -89783,13 +89783,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90548,9 +90548,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -90565,14 +90565,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -91166,9 +91165,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -91183,14 +91182,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -95510,9 +95508,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -95527,13 +95525,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -97418,9 +97416,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -97435,13 +97433,13 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -99269,9 +99267,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -99280,24 +99278,25 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -100992,9 +100991,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -101003,24 +101002,25 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -103158,9 +103158,9 @@ impl super::stub::FeatureOnlineStoreService for FeatureOnlineStoreService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103191,7 +103191,7 @@ impl std::fmt::Debug for FeatureRegistryService {
 
 #[cfg(feature = "feature-registry-service")]
 impl FeatureRegistryService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -103202,13 +103202,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn create_feature_group(
         &self,
         req: crate::model::CreateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103246,9 +103246,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103263,13 +103263,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn get_feature_group(
         &self,
         req: crate::model::GetFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeatureGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeatureGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103310,9 +103310,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103327,13 +103327,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn list_feature_groups(
         &self,
         req: crate::model::ListFeatureGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeatureGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeatureGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103374,9 +103374,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103391,13 +103391,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn update_feature_group(
         &self,
         req: crate::model::UpdateFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103456,9 +103456,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103473,13 +103473,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn delete_feature_group(
         &self,
         req: crate::model::DeleteFeatureGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103521,9 +103521,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103538,13 +103538,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103586,9 +103586,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103603,13 +103603,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103650,9 +103650,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103667,13 +103667,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103718,9 +103718,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103735,13 +103735,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103799,9 +103799,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103816,13 +103816,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103885,9 +103885,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103902,13 +103902,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -103953,9 +103953,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103970,13 +103970,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -104032,9 +104032,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104049,13 +104049,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -104125,9 +104125,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104142,13 +104142,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -104686,9 +104686,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104703,13 +104703,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -105468,9 +105468,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105485,14 +105485,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -106086,9 +106085,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -106103,14 +106102,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -110430,9 +110428,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -110447,13 +110445,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -112338,9 +112336,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -112355,13 +112353,13 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -114189,9 +114187,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -114200,24 +114198,25 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -115912,9 +115911,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -115923,24 +115922,25 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -118078,9 +118078,9 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -118094,15 +118094,15 @@ impl super::stub::FeatureRegistryService for FeatureRegistryService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -118125,7 +118125,7 @@ impl std::fmt::Debug for FeaturestoreOnlineServingService {
 
 #[cfg(feature = "featurestore-online-serving-service")]
 impl FeaturestoreOnlineServingService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -118136,13 +118136,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn read_feature_values(
         &self,
         req: crate::model::ReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadFeatureValuesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadFeatureValuesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -118187,9 +118187,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -118204,13 +118204,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn write_feature_values(
         &self,
         req: crate::model::WriteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteFeatureValuesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteFeatureValuesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -118255,9 +118255,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -118272,13 +118272,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -118334,9 +118334,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -118351,13 +118351,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -118427,9 +118427,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -118444,13 +118444,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -118988,9 +118988,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -119005,13 +119005,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -119770,9 +119770,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -119787,14 +119787,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -120388,9 +120387,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -120405,14 +120404,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -124732,9 +124730,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -124749,13 +124747,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -126640,9 +126638,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -126657,13 +126655,13 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -128491,9 +128489,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -128502,24 +128500,25 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -130214,9 +130213,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -130225,24 +130224,25 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -132380,9 +132380,9 @@ impl super::stub::FeaturestoreOnlineServingService for FeaturestoreOnlineServing
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132413,7 +132413,7 @@ impl std::fmt::Debug for FeaturestoreService {
 
 #[cfg(feature = "featurestore-service")]
 impl FeaturestoreService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -132424,13 +132424,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn create_featurestore(
         &self,
         req: crate::model::CreateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132468,9 +132468,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132485,13 +132485,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn get_featurestore(
         &self,
         req: crate::model::GetFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Featurestore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Featurestore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132532,9 +132532,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132549,13 +132549,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn list_featurestores(
         &self,
         req: crate::model::ListFeaturestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturestoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturestoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132608,9 +132608,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132625,13 +132625,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn update_featurestore(
         &self,
         req: crate::model::UpdateFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132690,9 +132690,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132707,13 +132707,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn delete_featurestore(
         &self,
         req: crate::model::DeleteFeaturestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132755,9 +132755,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132772,13 +132772,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132820,9 +132820,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132837,13 +132837,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132888,9 +132888,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132905,13 +132905,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -132968,9 +132968,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132985,13 +132985,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133054,9 +133054,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133071,13 +133071,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133123,9 +133123,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133140,13 +133140,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133192,9 +133192,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133209,13 +133209,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn batch_create_features(
         &self,
         req: crate::model::BatchCreateFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133260,9 +133260,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133277,13 +133277,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133332,9 +133332,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133349,13 +133349,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133417,9 +133417,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133434,13 +133434,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133507,9 +133507,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133524,13 +133524,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133579,9 +133579,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133596,13 +133596,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn import_feature_values(
         &self,
         req: crate::model::ImportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133647,9 +133647,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133664,13 +133664,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn batch_read_feature_values(
         &self,
         req: crate::model::BatchReadFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133711,9 +133711,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133728,13 +133728,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn export_feature_values(
         &self,
         req: crate::model::ExportFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133779,9 +133779,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133796,13 +133796,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn delete_feature_values(
         &self,
         req: crate::model::DeleteFeatureValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133847,9 +133847,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133864,13 +133864,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn search_features(
         &self,
         req: crate::model::SearchFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchFeaturesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchFeaturesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133910,9 +133910,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -133927,13 +133927,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -133989,9 +133989,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -134006,13 +134006,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -134082,9 +134082,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -134099,13 +134099,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -134643,9 +134643,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -134660,13 +134660,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -135425,9 +135425,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -135442,14 +135442,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -136043,9 +136042,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -136060,14 +136059,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -140387,9 +140385,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -140404,13 +140402,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -142295,9 +142293,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -142312,13 +142310,13 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -144146,9 +144144,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -144157,24 +144155,25 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -145869,9 +145868,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -145880,24 +145879,25 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -148035,9 +148035,9 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148051,15 +148051,15 @@ impl super::stub::FeaturestoreService for FeaturestoreService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -148082,7 +148082,7 @@ impl std::fmt::Debug for GenAiCacheService {
 
 #[cfg(feature = "gen-ai-cache-service")]
 impl GenAiCacheService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -148093,13 +148093,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn create_cached_content(
         &self,
         req: crate::model::CreateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CachedContent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CachedContent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148136,9 +148136,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148153,13 +148153,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn get_cached_content(
         &self,
         req: crate::model::GetCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CachedContent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CachedContent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148200,9 +148200,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148217,13 +148217,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn update_cached_content(
         &self,
         req: crate::model::UpdateCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CachedContent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CachedContent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148282,9 +148282,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148299,13 +148299,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn delete_cached_content(
         &self,
         req: crate::model::DeleteCachedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148346,9 +148346,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148357,24 +148357,25 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_cached_contents(
         &self,
         req: crate::model::ListCachedContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCachedContentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCachedContentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148413,9 +148414,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148430,13 +148431,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148492,9 +148493,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148509,13 +148510,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148585,9 +148586,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148602,13 +148603,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -149146,9 +149147,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -149163,13 +149164,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -149928,9 +149929,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -149945,14 +149946,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150546,9 +150546,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -150563,14 +150563,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154890,9 +154889,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -154907,13 +154906,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -156798,9 +156797,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -156815,13 +156814,13 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -158649,9 +158648,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -158660,24 +158659,25 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -160372,9 +160372,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -160383,24 +160383,25 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -162538,9 +162539,9 @@ impl super::stub::GenAiCacheService for GenAiCacheService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162571,7 +162572,7 @@ impl std::fmt::Debug for GenAiTuningService {
 
 #[cfg(feature = "gen-ai-tuning-service")]
 impl GenAiTuningService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -162582,13 +162583,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn create_tuning_job(
         &self,
         req: crate::model::CreateTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TuningJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TuningJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162625,9 +162626,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162642,13 +162643,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn get_tuning_job(
         &self,
         req: crate::model::GetTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TuningJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TuningJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162689,9 +162690,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162706,13 +162707,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn list_tuning_jobs(
         &self,
         req: crate::model::ListTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTuningJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTuningJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162752,9 +162753,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162769,13 +162770,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn cancel_tuning_job(
         &self,
         req: crate::model::CancelTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162816,9 +162817,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162827,24 +162828,25 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn rebase_tuned_model(
         &self,
         req: crate::model::RebaseTunedModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162881,9 +162883,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162898,13 +162900,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162960,9 +162962,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162977,13 +162979,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -163053,9 +163055,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -163070,13 +163072,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -163614,9 +163616,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -163631,13 +163633,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -164396,9 +164398,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -164413,14 +164415,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -165014,9 +165015,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -165031,14 +165032,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -169358,9 +169358,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -169375,13 +169375,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -171266,9 +171266,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171283,13 +171283,13 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -173117,9 +173117,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -173128,24 +173128,25 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -174840,9 +174841,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -174851,24 +174852,25 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -177006,9 +177008,9 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177022,15 +177024,15 @@ impl super::stub::GenAiTuningService for GenAiTuningService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -177053,7 +177055,7 @@ impl std::fmt::Debug for IndexEndpointService {
 
 #[cfg(feature = "index-endpoint-service")]
 impl IndexEndpointService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -177064,13 +177066,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn create_index_endpoint(
         &self,
         req: crate::model::CreateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177107,9 +177109,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177124,13 +177126,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn get_index_endpoint(
         &self,
         req: crate::model::GetIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IndexEndpoint>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IndexEndpoint>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177171,9 +177173,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177188,13 +177190,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn list_index_endpoints(
         &self,
         req: crate::model::ListIndexEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIndexEndpointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIndexEndpointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177246,9 +177248,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177263,13 +177265,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn update_index_endpoint(
         &self,
         req: crate::model::UpdateIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IndexEndpoint>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IndexEndpoint>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177328,9 +177330,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177345,13 +177347,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn delete_index_endpoint(
         &self,
         req: crate::model::DeleteIndexEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177392,9 +177394,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177409,13 +177411,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn deploy_index(
         &self,
         req: crate::model::DeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177456,9 +177458,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177473,13 +177475,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn undeploy_index(
         &self,
         req: crate::model::UndeployIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177520,9 +177522,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177537,13 +177539,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn mutate_deployed_index(
         &self,
         req: crate::model::MutateDeployedIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177584,9 +177586,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177601,13 +177603,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177663,9 +177665,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177680,13 +177682,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177756,9 +177758,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177773,13 +177775,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -178317,9 +178319,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -178334,13 +178336,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -179099,9 +179101,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -179116,14 +179118,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -179717,9 +179718,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -179734,14 +179735,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -184061,9 +184061,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -184078,13 +184078,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -185969,9 +185969,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -185986,13 +185986,13 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -187820,9 +187820,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -187831,24 +187831,25 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -189543,9 +189544,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -189554,24 +189555,25 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -191709,9 +191711,9 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -191725,15 +191727,15 @@ impl super::stub::IndexEndpointService for IndexEndpointService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -191756,7 +191758,7 @@ impl std::fmt::Debug for IndexService {
 
 #[cfg(feature = "index-service")]
 impl IndexService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -191767,13 +191769,13 @@ impl super::stub::IndexService for IndexService {
     async fn create_index(
         &self,
         req: crate::model::CreateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -191810,9 +191812,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -191827,13 +191829,13 @@ impl super::stub::IndexService for IndexService {
     async fn get_index(
         &self,
         req: crate::model::GetIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Index>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Index>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -191874,9 +191876,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -191891,13 +191893,13 @@ impl super::stub::IndexService for IndexService {
     async fn list_indexes(
         &self,
         req: crate::model::ListIndexesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIndexesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIndexesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -191949,9 +191951,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -191966,13 +191968,13 @@ impl super::stub::IndexService for IndexService {
     async fn update_index(
         &self,
         req: crate::model::UpdateIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192031,9 +192033,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192048,13 +192050,13 @@ impl super::stub::IndexService for IndexService {
     async fn delete_index(
         &self,
         req: crate::model::DeleteIndexRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192095,9 +192097,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192112,13 +192114,13 @@ impl super::stub::IndexService for IndexService {
     async fn upsert_datapoints(
         &self,
         req: crate::model::UpsertDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UpsertDatapointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UpsertDatapointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192159,9 +192161,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192176,13 +192178,13 @@ impl super::stub::IndexService for IndexService {
     async fn remove_datapoints(
         &self,
         req: crate::model::RemoveDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveDatapointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveDatapointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192223,9 +192225,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192240,13 +192242,13 @@ impl super::stub::IndexService for IndexService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192302,9 +192304,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192319,13 +192321,13 @@ impl super::stub::IndexService for IndexService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192395,9 +192397,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192412,13 +192414,13 @@ impl super::stub::IndexService for IndexService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -192956,9 +192958,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -192973,13 +192975,13 @@ impl super::stub::IndexService for IndexService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -193738,9 +193740,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -193755,14 +193757,13 @@ impl super::stub::IndexService for IndexService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -194356,9 +194357,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -194373,14 +194374,13 @@ impl super::stub::IndexService for IndexService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -198700,9 +198700,9 @@ impl super::stub::IndexService for IndexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -198717,13 +198717,13 @@ impl super::stub::IndexService for IndexService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -200608,9 +200608,9 @@ impl super::stub::IndexService for IndexService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -200625,13 +200625,13 @@ impl super::stub::IndexService for IndexService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -202459,9 +202459,9 @@ impl super::stub::IndexService for IndexService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -202470,24 +202470,25 @@ impl super::stub::IndexService for IndexService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -204182,9 +204183,9 @@ impl super::stub::IndexService for IndexService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -204193,24 +204194,25 @@ impl super::stub::IndexService for IndexService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -206348,9 +206350,9 @@ impl super::stub::IndexService for IndexService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206364,15 +206366,15 @@ impl super::stub::IndexService for IndexService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -206395,7 +206397,7 @@ impl std::fmt::Debug for JobService {
 
 #[cfg(feature = "job-service")]
 impl JobService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -206406,13 +206408,13 @@ impl super::stub::JobService for JobService {
     async fn create_custom_job(
         &self,
         req: crate::model::CreateCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CustomJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CustomJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206449,9 +206451,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206466,13 +206468,13 @@ impl super::stub::JobService for JobService {
     async fn get_custom_job(
         &self,
         req: crate::model::GetCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CustomJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CustomJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206513,9 +206515,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206530,13 +206532,13 @@ impl super::stub::JobService for JobService {
     async fn list_custom_jobs(
         &self,
         req: crate::model::ListCustomJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206588,9 +206590,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206605,13 +206607,13 @@ impl super::stub::JobService for JobService {
     async fn delete_custom_job(
         &self,
         req: crate::model::DeleteCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206652,9 +206654,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206669,13 +206671,13 @@ impl super::stub::JobService for JobService {
     async fn cancel_custom_job(
         &self,
         req: crate::model::CancelCustomJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206716,9 +206718,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206727,24 +206729,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_data_labeling_job(
         &self,
         req: crate::model::CreateDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataLabelingJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataLabelingJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206781,9 +206784,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206798,13 +206801,13 @@ impl super::stub::JobService for JobService {
     async fn get_data_labeling_job(
         &self,
         req: crate::model::GetDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataLabelingJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataLabelingJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206845,9 +206848,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206862,13 +206865,13 @@ impl super::stub::JobService for JobService {
     async fn list_data_labeling_jobs(
         &self,
         req: crate::model::ListDataLabelingJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataLabelingJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataLabelingJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206921,9 +206924,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -206938,13 +206941,13 @@ impl super::stub::JobService for JobService {
     async fn delete_data_labeling_job(
         &self,
         req: crate::model::DeleteDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -206985,9 +206988,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207002,13 +207005,13 @@ impl super::stub::JobService for JobService {
     async fn cancel_data_labeling_job(
         &self,
         req: crate::model::CancelDataLabelingJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207049,9 +207052,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207060,24 +207063,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_hyperparameter_tuning_job(
         &self,
         req: crate::model::CreateHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HyperparameterTuningJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HyperparameterTuningJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207114,9 +207118,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207131,13 +207135,13 @@ impl super::stub::JobService for JobService {
     async fn get_hyperparameter_tuning_job(
         &self,
         req: crate::model::GetHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HyperparameterTuningJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HyperparameterTuningJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207178,9 +207182,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207195,13 +207199,13 @@ impl super::stub::JobService for JobService {
     async fn list_hyperparameter_tuning_jobs(
         &self,
         req: crate::model::ListHyperparameterTuningJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHyperparameterTuningJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHyperparameterTuningJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207253,9 +207257,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207270,13 +207274,13 @@ impl super::stub::JobService for JobService {
     async fn delete_hyperparameter_tuning_job(
         &self,
         req: crate::model::DeleteHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207317,9 +207321,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207334,13 +207338,13 @@ impl super::stub::JobService for JobService {
     async fn cancel_hyperparameter_tuning_job(
         &self,
         req: crate::model::CancelHyperparameterTuningJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207381,9 +207385,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207392,24 +207396,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_nas_job(
         &self,
         req: crate::model::CreateNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NasJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NasJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207446,9 +207451,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207463,13 +207468,13 @@ impl super::stub::JobService for JobService {
     async fn get_nas_job(
         &self,
         req: crate::model::GetNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NasJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NasJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207510,9 +207515,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207527,13 +207532,13 @@ impl super::stub::JobService for JobService {
     async fn list_nas_jobs(
         &self,
         req: crate::model::ListNasJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNasJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNasJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207585,9 +207590,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207602,13 +207607,13 @@ impl super::stub::JobService for JobService {
     async fn delete_nas_job(
         &self,
         req: crate::model::DeleteNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207649,9 +207654,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207666,13 +207671,13 @@ impl super::stub::JobService for JobService {
     async fn cancel_nas_job(
         &self,
         req: crate::model::CancelNasJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207713,9 +207718,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207724,24 +207729,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_nas_trial_detail(
         &self,
         req: crate::model::GetNasTrialDetailRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NasTrialDetail>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NasTrialDetail>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207786,9 +207792,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207803,13 +207809,13 @@ impl super::stub::JobService for JobService {
     async fn list_nas_trial_details(
         &self,
         req: crate::model::ListNasTrialDetailsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNasTrialDetailsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNasTrialDetailsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207852,9 +207858,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207869,13 +207875,13 @@ impl super::stub::JobService for JobService {
     async fn create_batch_prediction_job(
         &self,
         req: crate::model::CreateBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchPredictionJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchPredictionJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207912,9 +207918,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207929,13 +207935,13 @@ impl super::stub::JobService for JobService {
     async fn get_batch_prediction_job(
         &self,
         req: crate::model::GetBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchPredictionJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchPredictionJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207976,9 +207982,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207993,13 +207999,13 @@ impl super::stub::JobService for JobService {
     async fn list_batch_prediction_jobs(
         &self,
         req: crate::model::ListBatchPredictionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBatchPredictionJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBatchPredictionJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208051,9 +208057,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208068,13 +208074,13 @@ impl super::stub::JobService for JobService {
     async fn delete_batch_prediction_job(
         &self,
         req: crate::model::DeleteBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208115,9 +208121,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208132,13 +208138,13 @@ impl super::stub::JobService for JobService {
     async fn cancel_batch_prediction_job(
         &self,
         req: crate::model::CancelBatchPredictionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208179,9 +208185,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208190,24 +208196,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_model_deployment_monitoring_job(
         &self,
         req: crate::model::CreateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208244,9 +208251,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208261,17 +208268,14 @@ impl super::stub::JobService for JobService {
     async fn search_model_deployment_monitoring_stats_anomalies(
         &self,
         req: crate::model::SearchModelDeploymentMonitoringStatsAnomaliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<
-            crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse,
-        >,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchModelDeploymentMonitoringStatsAnomaliesResponse>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208316,9 +208320,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208333,13 +208337,13 @@ impl super::stub::JobService for JobService {
     async fn get_model_deployment_monitoring_job(
         &self,
         req: crate::model::GetModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelDeploymentMonitoringJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelDeploymentMonitoringJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208380,9 +208384,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208397,14 +208401,13 @@ impl super::stub::JobService for JobService {
     async fn list_model_deployment_monitoring_jobs(
         &self,
         req: crate::model::ListModelDeploymentMonitoringJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelDeploymentMonitoringJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208456,9 +208459,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208473,13 +208476,13 @@ impl super::stub::JobService for JobService {
     async fn update_model_deployment_monitoring_job(
         &self,
         req: crate::model::UpdateModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208538,9 +208541,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208555,13 +208558,13 @@ impl super::stub::JobService for JobService {
     async fn delete_model_deployment_monitoring_job(
         &self,
         req: crate::model::DeleteModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208602,9 +208605,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208619,13 +208622,13 @@ impl super::stub::JobService for JobService {
     async fn pause_model_deployment_monitoring_job(
         &self,
         req: crate::model::PauseModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208666,9 +208669,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208677,24 +208680,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn resume_model_deployment_monitoring_job(
         &self,
         req: crate::model::ResumeModelDeploymentMonitoringJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208735,9 +208739,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208746,24 +208750,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208819,9 +208824,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208836,13 +208841,13 @@ impl super::stub::JobService for JobService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208912,9 +208917,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -208929,13 +208934,13 @@ impl super::stub::JobService for JobService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -209473,9 +209478,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -209490,13 +209495,13 @@ impl super::stub::JobService for JobService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -210255,9 +210260,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -210272,14 +210277,13 @@ impl super::stub::JobService for JobService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -210873,9 +210877,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -210890,14 +210894,13 @@ impl super::stub::JobService for JobService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215217,9 +215220,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -215234,13 +215237,13 @@ impl super::stub::JobService for JobService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -217125,9 +217128,9 @@ impl super::stub::JobService for JobService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -217142,13 +217145,13 @@ impl super::stub::JobService for JobService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -218976,9 +218979,9 @@ impl super::stub::JobService for JobService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -218987,24 +218990,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -220699,9 +220703,9 @@ impl super::stub::JobService for JobService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -220710,24 +220714,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -222865,9 +222870,9 @@ impl super::stub::JobService for JobService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -222881,15 +222886,15 @@ impl super::stub::JobService for JobService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -222912,7 +222917,7 @@ impl std::fmt::Debug for LlmUtilityService {
 
 #[cfg(feature = "llm-utility-service")]
 impl LlmUtilityService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -222923,13 +222928,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn count_tokens(
         &self,
         req: crate::model::CountTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CountTokensResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CountTokensResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -223067,9 +223072,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -223084,13 +223089,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn compute_tokens(
         &self,
         req: crate::model::ComputeTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ComputeTokensResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ComputeTokensResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -223228,9 +223233,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -223245,13 +223250,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -223307,9 +223312,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -223324,13 +223329,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -223400,9 +223405,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -223417,13 +223422,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -223961,9 +223966,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -223978,13 +223983,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -224743,9 +224748,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -224760,14 +224765,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -225361,9 +225365,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -225378,14 +225382,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -229705,9 +229708,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -229722,13 +229725,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -231613,9 +231616,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231630,13 +231633,13 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -233464,9 +233467,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233475,24 +233478,25 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -235187,9 +235191,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -235198,24 +235202,25 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -237353,9 +237358,9 @@ impl super::stub::LlmUtilityService for LlmUtilityService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -237386,7 +237391,7 @@ impl std::fmt::Debug for MatchService {
 
 #[cfg(feature = "match-service")]
 impl MatchService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -237397,13 +237402,13 @@ impl super::stub::MatchService for MatchService {
     async fn find_neighbors(
         &self,
         req: crate::model::FindNeighborsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FindNeighborsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FindNeighborsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -237444,9 +237449,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -237461,13 +237466,13 @@ impl super::stub::MatchService for MatchService {
     async fn read_index_datapoints(
         &self,
         req: crate::model::ReadIndexDatapointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadIndexDatapointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadIndexDatapointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -237508,9 +237513,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -237525,13 +237530,13 @@ impl super::stub::MatchService for MatchService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -237587,9 +237592,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -237604,13 +237609,13 @@ impl super::stub::MatchService for MatchService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -237680,9 +237685,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -237697,13 +237702,13 @@ impl super::stub::MatchService for MatchService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -238241,9 +238246,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -238258,13 +238263,13 @@ impl super::stub::MatchService for MatchService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -239023,9 +239028,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -239040,14 +239045,13 @@ impl super::stub::MatchService for MatchService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -239641,9 +239645,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -239658,14 +239662,13 @@ impl super::stub::MatchService for MatchService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -243985,9 +243988,9 @@ impl super::stub::MatchService for MatchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -244002,13 +244005,13 @@ impl super::stub::MatchService for MatchService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -245893,9 +245896,9 @@ impl super::stub::MatchService for MatchService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -245910,13 +245913,13 @@ impl super::stub::MatchService for MatchService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -247744,9 +247747,9 @@ impl super::stub::MatchService for MatchService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -247755,24 +247758,25 @@ impl super::stub::MatchService for MatchService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -249467,9 +249471,9 @@ impl super::stub::MatchService for MatchService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -249478,24 +249482,25 @@ impl super::stub::MatchService for MatchService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -251633,9 +251638,9 @@ impl super::stub::MatchService for MatchService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -251666,7 +251671,7 @@ impl std::fmt::Debug for MetadataService {
 
 #[cfg(feature = "metadata-service")]
 impl MetadataService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -251677,13 +251682,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_metadata_store(
         &self,
         req: crate::model::CreateMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -251721,9 +251726,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -251738,13 +251743,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_metadata_store(
         &self,
         req: crate::model::GetMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataStore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataStore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -251785,9 +251790,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -251802,13 +251807,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_metadata_stores(
         &self,
         req: crate::model::ListMetadataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataStoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataStoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -251847,9 +251852,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -251864,13 +251869,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_metadata_store(
         &self,
         req: crate::model::DeleteMetadataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -251912,9 +251917,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -251929,13 +251934,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_artifact(
         &self,
         req: crate::model::CreateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Artifact>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Artifact>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -251977,9 +251982,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -251994,13 +251999,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_artifact(
         &self,
         req: crate::model::GetArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Artifact>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Artifact>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252045,9 +252050,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252062,13 +252067,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_artifacts(
         &self,
         req: crate::model::ListArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListArtifactsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListArtifactsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252113,9 +252118,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252130,13 +252135,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn update_artifact(
         &self,
         req: crate::model::UpdateArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Artifact>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Artifact>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252200,9 +252205,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252217,13 +252222,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_artifact(
         &self,
         req: crate::model::DeleteArtifactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252269,9 +252274,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252286,13 +252291,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn purge_artifacts(
         &self,
         req: crate::model::PurgeArtifactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252333,9 +252338,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252350,13 +252355,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252398,9 +252403,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252415,13 +252420,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252466,9 +252471,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252483,13 +252488,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContextsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContextsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252534,9 +252539,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252551,13 +252556,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252621,9 +252626,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252638,13 +252643,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252691,9 +252696,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252708,13 +252713,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn purge_contexts(
         &self,
         req: crate::model::PurgeContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252755,9 +252760,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252772,14 +252777,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn add_context_artifacts_and_executions(
         &self,
         req: crate::model::AddContextArtifactsAndExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddContextArtifactsAndExecutionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddContextArtifactsAndExecutionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252824,9 +252828,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252841,13 +252845,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn add_context_children(
         &self,
         req: crate::model::AddContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddContextChildrenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddContextChildrenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252892,9 +252896,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252909,13 +252913,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn remove_context_children(
         &self,
         req: crate::model::RemoveContextChildrenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveContextChildrenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveContextChildrenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -252960,9 +252964,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252977,13 +252981,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn query_context_lineage_subgraph(
         &self,
         req: crate::model::QueryContextLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageSubgraph>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageSubgraph>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253028,9 +253032,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253045,13 +253049,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_execution(
         &self,
         req: crate::model::CreateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Execution>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Execution>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253093,9 +253097,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253110,13 +253114,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_execution(
         &self,
         req: crate::model::GetExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Execution>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Execution>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253161,9 +253165,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253178,13 +253182,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_executions(
         &self,
         req: crate::model::ListExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExecutionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExecutionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253229,9 +253233,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253246,13 +253250,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn update_execution(
         &self,
         req: crate::model::UpdateExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Execution>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Execution>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253316,9 +253320,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253333,13 +253337,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_execution(
         &self,
         req: crate::model::DeleteExecutionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253385,9 +253389,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253402,13 +253406,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn purge_executions(
         &self,
         req: crate::model::PurgeExecutionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253449,9 +253453,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253466,13 +253470,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn add_execution_events(
         &self,
         req: crate::model::AddExecutionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddExecutionEventsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddExecutionEventsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253517,9 +253521,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253534,13 +253538,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn query_execution_inputs_and_outputs(
         &self,
         req: crate::model::QueryExecutionInputsAndOutputsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageSubgraph>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageSubgraph>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253585,9 +253589,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253602,13 +253606,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_metadata_schema(
         &self,
         req: crate::model::CreateMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataSchema>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataSchema>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253650,9 +253654,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253667,13 +253671,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_metadata_schema(
         &self,
         req: crate::model::GetMetadataSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataSchema>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataSchema>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253718,9 +253722,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253735,13 +253739,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_metadata_schemas(
         &self,
         req: crate::model::ListMetadataSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataSchemasResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataSchemasResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253785,9 +253789,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253802,13 +253806,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn query_artifact_lineage_subgraph(
         &self,
         req: crate::model::QueryArtifactLineageSubgraphRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageSubgraph>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageSubgraph>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253855,9 +253859,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253872,13 +253876,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -253934,9 +253938,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253951,13 +253955,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -254027,9 +254031,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -254044,13 +254048,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -254588,9 +254592,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -254605,13 +254609,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -255370,9 +255374,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -255387,14 +255391,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -255988,9 +255991,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -256005,14 +256008,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -260332,9 +260334,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -260349,13 +260351,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -262240,9 +262242,9 @@ impl super::stub::MetadataService for MetadataService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -262257,13 +262259,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -264091,9 +264093,9 @@ impl super::stub::MetadataService for MetadataService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -264102,24 +264104,25 @@ impl super::stub::MetadataService for MetadataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -265814,9 +265817,9 @@ impl super::stub::MetadataService for MetadataService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -265825,24 +265828,25 @@ impl super::stub::MetadataService for MetadataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -267980,9 +267984,9 @@ impl super::stub::MetadataService for MetadataService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -267996,15 +268000,15 @@ impl super::stub::MetadataService for MetadataService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -268027,7 +268031,7 @@ impl std::fmt::Debug for MigrationService {
 
 #[cfg(feature = "migration-service")]
 impl MigrationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -268038,13 +268042,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn search_migratable_resources(
         &self,
         req: crate::model::SearchMigratableResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchMigratableResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchMigratableResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -268081,9 +268085,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -268098,13 +268102,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn batch_migrate_resources(
         &self,
         req: crate::model::BatchMigrateResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -268141,9 +268145,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -268158,13 +268162,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -268220,9 +268224,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -268237,13 +268241,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -268313,9 +268317,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -268330,13 +268334,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -268874,9 +268878,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -268891,13 +268895,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -269656,9 +269660,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -269673,14 +269677,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -270274,9 +270277,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -270291,14 +270294,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -274618,9 +274620,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -274635,13 +274637,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -276526,9 +276528,9 @@ impl super::stub::MigrationService for MigrationService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -276543,13 +276545,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -278377,9 +278379,9 @@ impl super::stub::MigrationService for MigrationService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -278388,24 +278390,25 @@ impl super::stub::MigrationService for MigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -280100,9 +280103,9 @@ impl super::stub::MigrationService for MigrationService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -280111,24 +280114,25 @@ impl super::stub::MigrationService for MigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -282266,9 +282270,9 @@ impl super::stub::MigrationService for MigrationService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -282282,15 +282286,15 @@ impl super::stub::MigrationService for MigrationService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -282313,7 +282317,7 @@ impl std::fmt::Debug for ModelGardenService {
 
 #[cfg(feature = "model-garden-service")]
 impl ModelGardenService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -282324,13 +282328,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn get_publisher_model(
         &self,
         req: crate::model::GetPublisherModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublisherModel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublisherModel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -282371,9 +282375,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -282388,13 +282392,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn deploy(
         &self,
         req: crate::model::DeployRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -282431,9 +282435,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -282448,13 +282452,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -282510,9 +282514,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -282527,13 +282531,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -282603,9 +282607,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -282620,13 +282624,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -283164,9 +283168,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -283181,13 +283185,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -283946,9 +283950,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -283963,14 +283967,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -284564,9 +284567,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -284581,14 +284584,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -288908,9 +288910,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -288925,13 +288927,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -290816,9 +290818,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -290833,13 +290835,13 @@ impl super::stub::ModelGardenService for ModelGardenService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -292667,9 +292669,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -292678,24 +292680,25 @@ impl super::stub::ModelGardenService for ModelGardenService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -294390,9 +294393,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -294401,24 +294404,25 @@ impl super::stub::ModelGardenService for ModelGardenService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -296556,9 +296560,9 @@ impl super::stub::ModelGardenService for ModelGardenService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296572,15 +296576,15 @@ impl super::stub::ModelGardenService for ModelGardenService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -296603,7 +296607,7 @@ impl std::fmt::Debug for ModelService {
 
 #[cfg(feature = "model-service")]
 impl ModelService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -296614,13 +296618,13 @@ impl super::stub::ModelService for ModelService {
     async fn upload_model(
         &self,
         req: crate::model::UploadModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296657,9 +296661,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296674,13 +296678,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296721,9 +296725,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296738,13 +296742,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296797,9 +296801,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296814,13 +296818,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_model_versions(
         &self,
         req: crate::model::ListModelVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296877,9 +296881,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296894,13 +296898,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_model_version_checkpoints(
         &self,
         req: crate::model::ListModelVersionCheckpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelVersionCheckpointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelVersionCheckpointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296943,9 +296947,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296960,13 +296964,13 @@ impl super::stub::ModelService for ModelService {
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297025,9 +297029,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297042,13 +297046,13 @@ impl super::stub::ModelService for ModelService {
     async fn update_explanation_dataset(
         &self,
         req: crate::model::UpdateExplanationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297089,9 +297093,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297106,13 +297110,13 @@ impl super::stub::ModelService for ModelService {
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297153,9 +297157,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297170,13 +297174,13 @@ impl super::stub::ModelService for ModelService {
     async fn delete_model_version(
         &self,
         req: crate::model::DeleteModelVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297217,9 +297221,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297234,13 +297238,13 @@ impl super::stub::ModelService for ModelService {
     async fn merge_version_aliases(
         &self,
         req: crate::model::MergeVersionAliasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297281,9 +297285,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297298,13 +297302,13 @@ impl super::stub::ModelService for ModelService {
     async fn export_model(
         &self,
         req: crate::model::ExportModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297345,9 +297349,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297362,13 +297366,13 @@ impl super::stub::ModelService for ModelService {
     async fn copy_model(
         &self,
         req: crate::model::CopyModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297405,9 +297409,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297422,13 +297426,13 @@ impl super::stub::ModelService for ModelService {
     async fn import_model_evaluation(
         &self,
         req: crate::model::ImportModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelEvaluation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelEvaluation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297469,9 +297473,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297486,14 +297490,13 @@ impl super::stub::ModelService for ModelService {
     async fn batch_import_model_evaluation_slices(
         &self,
         req: crate::model::BatchImportModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchImportModelEvaluationSlicesResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchImportModelEvaluationSlicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297538,9 +297541,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297555,14 +297558,13 @@ impl super::stub::ModelService for ModelService {
     async fn batch_import_evaluated_annotations(
         &self,
         req: crate::model::BatchImportEvaluatedAnnotationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchImportEvaluatedAnnotationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297611,9 +297613,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297628,13 +297630,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_model_evaluation(
         &self,
         req: crate::model::GetModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelEvaluation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelEvaluation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297679,9 +297681,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297696,13 +297698,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_model_evaluations(
         &self,
         req: crate::model::ListModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelEvaluationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelEvaluationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297758,9 +297760,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297775,13 +297777,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_model_evaluation_slice(
         &self,
         req: crate::model::GetModelEvaluationSliceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModelEvaluationSlice>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModelEvaluationSlice>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297830,9 +297832,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297847,13 +297849,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_model_evaluation_slices(
         &self,
         req: crate::model::ListModelEvaluationSlicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelEvaluationSlicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelEvaluationSlicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297913,9 +297915,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297930,13 +297932,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297992,9 +297994,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -298009,13 +298011,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -298085,9 +298087,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -298102,13 +298104,13 @@ impl super::stub::ModelService for ModelService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -298646,9 +298648,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -298663,13 +298665,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299428,9 +299430,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -299445,14 +299447,13 @@ impl super::stub::ModelService for ModelService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -300046,9 +300047,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -300063,14 +300064,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -304390,9 +304390,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -304407,13 +304407,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -306298,9 +306298,9 @@ impl super::stub::ModelService for ModelService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -306315,13 +306315,13 @@ impl super::stub::ModelService for ModelService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -308149,9 +308149,9 @@ impl super::stub::ModelService for ModelService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -308160,24 +308160,25 @@ impl super::stub::ModelService for ModelService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -309872,9 +309873,9 @@ impl super::stub::ModelService for ModelService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -309883,24 +309884,25 @@ impl super::stub::ModelService for ModelService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -312038,9 +312040,9 @@ impl super::stub::ModelService for ModelService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312054,15 +312056,15 @@ impl super::stub::ModelService for ModelService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -312085,7 +312087,7 @@ impl std::fmt::Debug for NotebookService {
 
 #[cfg(feature = "notebook-service")]
 impl NotebookService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -312096,13 +312098,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn create_notebook_runtime_template(
         &self,
         req: crate::model::CreateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312143,9 +312145,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312160,13 +312162,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn get_notebook_runtime_template(
         &self,
         req: crate::model::GetNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookRuntimeTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312207,9 +312209,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312224,13 +312226,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn list_notebook_runtime_templates(
         &self,
         req: crate::model::ListNotebookRuntimeTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotebookRuntimeTemplatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotebookRuntimeTemplatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312283,9 +312285,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312300,13 +312302,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn delete_notebook_runtime_template(
         &self,
         req: crate::model::DeleteNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312347,9 +312349,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312364,13 +312366,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn update_notebook_runtime_template(
         &self,
         req: crate::model::UpdateNotebookRuntimeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookRuntimeTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookRuntimeTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312429,9 +312431,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312446,13 +312448,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn assign_notebook_runtime(
         &self,
         req: crate::model::AssignNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312489,9 +312491,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312506,13 +312508,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn get_notebook_runtime(
         &self,
         req: crate::model::GetNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookRuntime>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookRuntime>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312553,9 +312555,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312570,13 +312572,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn list_notebook_runtimes(
         &self,
         req: crate::model::ListNotebookRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotebookRuntimesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotebookRuntimesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312629,9 +312631,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312646,13 +312648,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn delete_notebook_runtime(
         &self,
         req: crate::model::DeleteNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312693,9 +312695,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312710,13 +312712,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn upgrade_notebook_runtime(
         &self,
         req: crate::model::UpgradeNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312757,9 +312759,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312774,13 +312776,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn start_notebook_runtime(
         &self,
         req: crate::model::StartNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312821,9 +312823,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312838,13 +312840,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn stop_notebook_runtime(
         &self,
         req: crate::model::StopNotebookRuntimeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312885,9 +312887,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312902,13 +312904,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn create_notebook_execution_job(
         &self,
         req: crate::model::CreateNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312947,9 +312949,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312964,13 +312966,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn get_notebook_execution_job(
         &self,
         req: crate::model::GetNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotebookExecutionJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotebookExecutionJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313012,9 +313014,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313029,13 +313031,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn list_notebook_execution_jobs(
         &self,
         req: crate::model::ListNotebookExecutionJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNotebookExecutionJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNotebookExecutionJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313077,9 +313079,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313094,13 +313096,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn delete_notebook_execution_job(
         &self,
         req: crate::model::DeleteNotebookExecutionJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313141,9 +313143,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313158,13 +313160,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313220,9 +313222,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313237,13 +313239,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313313,9 +313315,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313330,13 +313332,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313874,9 +313876,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313891,13 +313893,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -314656,9 +314658,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314673,14 +314675,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -315274,9 +315275,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -315291,14 +315292,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -319618,9 +319618,9 @@ impl super::stub::NotebookService for NotebookService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -319635,13 +319635,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -321526,9 +321526,9 @@ impl super::stub::NotebookService for NotebookService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -321543,13 +321543,13 @@ impl super::stub::NotebookService for NotebookService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -323377,9 +323377,9 @@ impl super::stub::NotebookService for NotebookService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -323388,24 +323388,25 @@ impl super::stub::NotebookService for NotebookService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -325100,9 +325101,9 @@ impl super::stub::NotebookService for NotebookService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -325111,24 +325112,25 @@ impl super::stub::NotebookService for NotebookService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -327266,9 +327268,9 @@ impl super::stub::NotebookService for NotebookService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327282,15 +327284,15 @@ impl super::stub::NotebookService for NotebookService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -327313,7 +327315,7 @@ impl std::fmt::Debug for PersistentResourceService {
 
 #[cfg(feature = "persistent-resource-service")]
 impl PersistentResourceService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -327324,13 +327326,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn create_persistent_resource(
         &self,
         req: crate::model::CreatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327369,9 +327371,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327386,13 +327388,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn get_persistent_resource(
         &self,
         req: crate::model::GetPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PersistentResource>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PersistentResource>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327433,9 +327435,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327450,13 +327452,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn list_persistent_resources(
         &self,
         req: crate::model::ListPersistentResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPersistentResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPersistentResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327495,9 +327497,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327512,13 +327514,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn delete_persistent_resource(
         &self,
         req: crate::model::DeletePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327559,9 +327561,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327576,13 +327578,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn update_persistent_resource(
         &self,
         req: crate::model::UpdatePersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327641,9 +327643,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327658,13 +327660,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn reboot_persistent_resource(
         &self,
         req: crate::model::RebootPersistentResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327705,9 +327707,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327722,13 +327724,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327784,9 +327786,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327801,13 +327803,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327877,9 +327879,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -327894,13 +327896,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -328438,9 +328440,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -328455,13 +328457,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -329220,9 +329222,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -329237,14 +329239,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -329838,9 +329839,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -329855,14 +329856,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -334182,9 +334182,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -334199,13 +334199,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -336090,9 +336090,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -336107,13 +336107,13 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -337941,9 +337941,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -337952,24 +337952,25 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -339664,9 +339665,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -339675,24 +339676,25 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -341830,9 +341832,9 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -341846,15 +341848,15 @@ impl super::stub::PersistentResourceService for PersistentResourceService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -341877,7 +341879,7 @@ impl std::fmt::Debug for PipelineService {
 
 #[cfg(feature = "pipeline-service")]
 impl PipelineService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -341888,13 +341890,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn create_training_pipeline(
         &self,
         req: crate::model::CreateTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TrainingPipeline>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TrainingPipeline>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -341931,9 +341933,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -341948,13 +341950,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn get_training_pipeline(
         &self,
         req: crate::model::GetTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TrainingPipeline>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TrainingPipeline>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -341995,9 +341997,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342012,13 +342014,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn list_training_pipelines(
         &self,
         req: crate::model::ListTrainingPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTrainingPipelinesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTrainingPipelinesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342070,9 +342072,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342087,13 +342089,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn delete_training_pipeline(
         &self,
         req: crate::model::DeleteTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342134,9 +342136,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342151,13 +342153,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn cancel_training_pipeline(
         &self,
         req: crate::model::CancelTrainingPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342198,9 +342200,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342209,24 +342211,25 @@ impl super::stub::PipelineService for PipelineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_pipeline_job(
         &self,
         req: crate::model::CreatePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PipelineJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PipelineJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342264,9 +342267,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342281,13 +342284,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn get_pipeline_job(
         &self,
         req: crate::model::GetPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PipelineJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PipelineJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342328,9 +342331,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342345,13 +342348,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn list_pipeline_jobs(
         &self,
         req: crate::model::ListPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPipelineJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPipelineJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342404,9 +342407,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342421,13 +342424,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn delete_pipeline_job(
         &self,
         req: crate::model::DeletePipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342468,9 +342471,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342485,13 +342488,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn batch_delete_pipeline_jobs(
         &self,
         req: crate::model::BatchDeletePipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342528,9 +342531,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342545,13 +342548,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn cancel_pipeline_job(
         &self,
         req: crate::model::CancelPipelineJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342592,9 +342595,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342603,24 +342606,25 @@ impl super::stub::PipelineService for PipelineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn batch_cancel_pipeline_jobs(
         &self,
         req: crate::model::BatchCancelPipelineJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342657,9 +342661,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342674,13 +342678,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342736,9 +342740,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342753,13 +342757,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342829,9 +342833,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342846,13 +342850,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -343390,9 +343394,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -343407,13 +343411,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -344172,9 +344176,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -344189,14 +344193,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -344790,9 +344793,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -344807,14 +344810,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -349134,9 +349136,9 @@ impl super::stub::PipelineService for PipelineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -349151,13 +349153,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -351042,9 +351044,9 @@ impl super::stub::PipelineService for PipelineService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -351059,13 +351061,13 @@ impl super::stub::PipelineService for PipelineService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -352893,9 +352895,9 @@ impl super::stub::PipelineService for PipelineService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -352904,24 +352906,25 @@ impl super::stub::PipelineService for PipelineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -354616,9 +354619,9 @@ impl super::stub::PipelineService for PipelineService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -354627,24 +354630,25 @@ impl super::stub::PipelineService for PipelineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -356782,9 +356786,9 @@ impl super::stub::PipelineService for PipelineService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -356798,15 +356802,15 @@ impl super::stub::PipelineService for PipelineService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -356829,7 +356833,7 @@ impl std::fmt::Debug for PredictionService {
 
 #[cfg(feature = "prediction-service")]
 impl PredictionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -356840,13 +356844,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn predict(
         &self,
         req: crate::model::PredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PredictResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PredictResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -356928,9 +356932,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -356945,13 +356949,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn raw_predict(
         &self,
         req: crate::model::RawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357033,9 +357037,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357050,13 +357054,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn direct_predict(
         &self,
         req: crate::model::DirectPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DirectPredictResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DirectPredictResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357097,9 +357101,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357114,13 +357118,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn direct_raw_predict(
         &self,
         req: crate::model::DirectRawPredictRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DirectRawPredictResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DirectRawPredictResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357161,9 +357165,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357178,13 +357182,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn explain(
         &self,
         req: crate::model::ExplainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExplainResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExplainResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357225,9 +357229,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357242,13 +357246,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn generate_content(
         &self,
         req: crate::model::GenerateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateContentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateContentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357386,9 +357390,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357403,13 +357407,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn embed_content(
         &self,
         req: crate::model::EmbedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EmbedContentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EmbedContentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357458,9 +357462,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357475,13 +357479,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357537,9 +357541,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357554,13 +357558,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357630,9 +357634,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357647,13 +357651,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -358191,9 +358195,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -358208,13 +358212,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -358973,9 +358977,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -358990,14 +358994,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -359591,9 +359594,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -359608,14 +359611,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -363935,9 +363937,9 @@ impl super::stub::PredictionService for PredictionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -363952,13 +363954,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -365843,9 +365845,9 @@ impl super::stub::PredictionService for PredictionService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -365860,13 +365862,13 @@ impl super::stub::PredictionService for PredictionService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -367694,9 +367696,9 @@ impl super::stub::PredictionService for PredictionService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -367705,24 +367707,25 @@ impl super::stub::PredictionService for PredictionService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -369417,9 +369420,9 @@ impl super::stub::PredictionService for PredictionService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -369428,24 +369431,25 @@ impl super::stub::PredictionService for PredictionService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -371583,9 +371587,9 @@ impl super::stub::PredictionService for PredictionService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -371616,7 +371620,7 @@ impl std::fmt::Debug for ReasoningEngineExecutionService {
 
 #[cfg(feature = "reasoning-engine-execution-service")]
 impl ReasoningEngineExecutionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -371627,13 +371631,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn query_reasoning_engine(
         &self,
         req: crate::model::QueryReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryReasoningEngineResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryReasoningEngineResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -371674,9 +371678,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -371691,13 +371695,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -371753,9 +371757,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -371770,13 +371774,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -371846,9 +371850,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -371863,13 +371867,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -372407,9 +372411,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -372424,13 +372428,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -373189,9 +373193,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -373206,14 +373210,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -373807,9 +373810,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -373824,14 +373827,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -378151,9 +378153,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -378168,13 +378170,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -380059,9 +380061,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -380076,13 +380078,13 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -381910,9 +381912,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381921,24 +381923,25 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -383633,9 +383636,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -383644,24 +383647,25 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -385799,9 +385803,9 @@ impl super::stub::ReasoningEngineExecutionService for ReasoningEngineExecutionSe
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -385832,7 +385836,7 @@ impl std::fmt::Debug for ReasoningEngineService {
 
 #[cfg(feature = "reasoning-engine-service")]
 impl ReasoningEngineService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -385843,13 +385847,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn create_reasoning_engine(
         &self,
         req: crate::model::CreateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -385886,9 +385890,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -385903,13 +385907,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn get_reasoning_engine(
         &self,
         req: crate::model::GetReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReasoningEngine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReasoningEngine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -385950,9 +385954,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -385967,13 +385971,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn list_reasoning_engines(
         &self,
         req: crate::model::ListReasoningEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReasoningEnginesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReasoningEnginesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -386013,9 +386017,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386030,13 +386034,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn update_reasoning_engine(
         &self,
         req: crate::model::UpdateReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -386095,9 +386099,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386112,13 +386116,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn delete_reasoning_engine(
         &self,
         req: crate::model::DeleteReasoningEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -386160,9 +386164,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386177,13 +386181,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -386239,9 +386243,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386256,13 +386260,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -386332,9 +386336,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386349,13 +386353,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -386893,9 +386897,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386910,13 +386914,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -387675,9 +387679,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -387692,14 +387696,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -388293,9 +388296,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -388310,14 +388313,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -392637,9 +392639,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -392654,13 +392656,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -394545,9 +394547,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -394562,13 +394564,13 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -396396,9 +396398,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -396407,24 +396409,25 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -398119,9 +398122,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -398130,24 +398133,25 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -400285,9 +400289,9 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400301,15 +400305,15 @@ impl super::stub::ReasoningEngineService for ReasoningEngineService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -400332,7 +400336,7 @@ impl std::fmt::Debug for ScheduleService {
 
 #[cfg(feature = "schedule-service")]
 impl ScheduleService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -400343,13 +400347,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn create_schedule(
         &self,
         req: crate::model::CreateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schedule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schedule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400386,9 +400390,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400403,13 +400407,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn delete_schedule(
         &self,
         req: crate::model::DeleteScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400450,9 +400454,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400467,13 +400471,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn get_schedule(
         &self,
         req: crate::model::GetScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schedule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schedule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400514,9 +400518,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400531,13 +400535,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn list_schedules(
         &self,
         req: crate::model::ListSchedulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchedulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchedulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400578,9 +400582,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400595,13 +400599,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn pause_schedule(
         &self,
         req: crate::model::PauseScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400642,9 +400646,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400653,24 +400657,25 @@ impl super::stub::ScheduleService for ScheduleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn resume_schedule(
         &self,
         req: crate::model::ResumeScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400711,9 +400716,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400722,24 +400727,25 @@ impl super::stub::ScheduleService for ScheduleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_schedule(
         &self,
         req: crate::model::UpdateScheduleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schedule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schedule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400798,9 +400804,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400815,13 +400821,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400877,9 +400883,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400894,13 +400900,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -400970,9 +400976,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -400987,13 +400993,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -401531,9 +401537,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -401548,13 +401554,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -402313,9 +402319,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -402330,14 +402336,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -402931,9 +402936,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -402948,14 +402953,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -407275,9 +407279,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -407292,13 +407296,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -409183,9 +409187,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -409200,13 +409204,13 @@ impl super::stub::ScheduleService for ScheduleService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -411034,9 +411038,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -411045,24 +411049,25 @@ impl super::stub::ScheduleService for ScheduleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -412757,9 +412762,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -412768,24 +412773,25 @@ impl super::stub::ScheduleService for ScheduleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -414923,9 +414929,9 @@ impl super::stub::ScheduleService for ScheduleService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -414939,15 +414945,15 @@ impl super::stub::ScheduleService for ScheduleService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -414970,7 +414976,7 @@ impl std::fmt::Debug for SpecialistPoolService {
 
 #[cfg(feature = "specialist-pool-service")]
 impl SpecialistPoolService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -414981,13 +414987,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn create_specialist_pool(
         &self,
         req: crate::model::CreateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415024,9 +415030,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415041,13 +415047,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn get_specialist_pool(
         &self,
         req: crate::model::GetSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SpecialistPool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SpecialistPool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415088,9 +415094,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415105,13 +415111,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn list_specialist_pools(
         &self,
         req: crate::model::ListSpecialistPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSpecialistPoolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSpecialistPoolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415162,9 +415168,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415179,13 +415185,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn delete_specialist_pool(
         &self,
         req: crate::model::DeleteSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415227,9 +415233,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415244,13 +415250,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn update_specialist_pool(
         &self,
         req: crate::model::UpdateSpecialistPoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415309,9 +415315,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415326,13 +415332,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415388,9 +415394,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415405,13 +415411,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415481,9 +415487,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -415498,13 +415504,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -416042,9 +416048,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -416059,13 +416065,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -416824,9 +416830,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -416841,14 +416847,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -417442,9 +417447,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -417459,14 +417464,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -421786,9 +421790,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -421803,13 +421807,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -423694,9 +423698,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -423711,13 +423715,13 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -425545,9 +425549,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -425556,24 +425560,25 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -427268,9 +427273,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -427279,24 +427284,25 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -429434,9 +429440,9 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429450,15 +429456,15 @@ impl super::stub::SpecialistPoolService for SpecialistPoolService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -429481,7 +429487,7 @@ impl std::fmt::Debug for TensorboardService {
 
 #[cfg(feature = "tensorboard-service")]
 impl TensorboardService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -429492,13 +429498,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn create_tensorboard(
         &self,
         req: crate::model::CreateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429535,9 +429541,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429552,13 +429558,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_tensorboard(
         &self,
         req: crate::model::GetTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tensorboard>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tensorboard>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429599,9 +429605,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429616,13 +429622,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn update_tensorboard(
         &self,
         req: crate::model::UpdateTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429681,9 +429687,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429698,13 +429704,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn list_tensorboards(
         &self,
         req: crate::model::ListTensorboardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429757,9 +429763,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429774,13 +429780,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn delete_tensorboard(
         &self,
         req: crate::model::DeleteTensorboardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429821,9 +429827,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429838,13 +429844,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn read_tensorboard_usage(
         &self,
         req: crate::model::ReadTensorboardUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadTensorboardUsageResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadTensorboardUsageResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429885,9 +429891,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429902,13 +429908,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn read_tensorboard_size(
         &self,
         req: crate::model::ReadTensorboardSizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadTensorboardSizeResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadTensorboardSizeResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429949,9 +429955,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -429966,13 +429972,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn create_tensorboard_experiment(
         &self,
         req: crate::model::CreateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardExperiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardExperiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430015,9 +430021,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430032,13 +430038,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_tensorboard_experiment(
         &self,
         req: crate::model::GetTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardExperiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardExperiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430083,9 +430089,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430100,13 +430106,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn update_tensorboard_experiment(
         &self,
         req: crate::model::UpdateTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardExperiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardExperiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430169,9 +430175,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430186,13 +430192,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn list_tensorboard_experiments(
         &self,
         req: crate::model::ListTensorboardExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardExperimentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardExperimentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430249,9 +430255,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430266,13 +430272,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn delete_tensorboard_experiment(
         &self,
         req: crate::model::DeleteTensorboardExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430317,9 +430323,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430334,13 +430340,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn create_tensorboard_run(
         &self,
         req: crate::model::CreateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardRun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardRun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430386,9 +430392,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430403,13 +430409,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn batch_create_tensorboard_runs(
         &self,
         req: crate::model::BatchCreateTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchCreateTensorboardRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchCreateTensorboardRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430454,9 +430460,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430471,13 +430477,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_tensorboard_run(
         &self,
         req: crate::model::GetTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardRun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardRun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430526,9 +430532,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430543,13 +430549,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn update_tensorboard_run(
         &self,
         req: crate::model::UpdateTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardRun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardRun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430616,9 +430622,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430633,13 +430639,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn list_tensorboard_runs(
         &self,
         req: crate::model::ListTensorboardRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430700,9 +430706,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430717,13 +430723,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn delete_tensorboard_run(
         &self,
         req: crate::model::DeleteTensorboardRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430772,9 +430778,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430789,14 +430795,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn batch_create_tensorboard_time_series(
         &self,
         req: crate::model::BatchCreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchCreateTensorboardTimeSeriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430841,9 +430846,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430858,13 +430863,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn create_tensorboard_time_series(
         &self,
         req: crate::model::CreateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430915,9 +430920,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430932,13 +430937,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_tensorboard_time_series(
         &self,
         req: crate::model::GetTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430991,9 +430996,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431008,13 +431013,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn update_tensorboard_time_series(
         &self,
         req: crate::model::UpdateTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TensorboardTimeSeries>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TensorboardTimeSeries>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431085,9 +431090,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431102,13 +431107,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn list_tensorboard_time_series(
         &self,
         req: crate::model::ListTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTensorboardTimeSeriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTensorboardTimeSeriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431173,9 +431178,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431190,13 +431195,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn delete_tensorboard_time_series(
         &self,
         req: crate::model::DeleteTensorboardTimeSeriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431249,9 +431254,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431266,14 +431271,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn batch_read_tensorboard_time_series_data(
         &self,
         req: crate::model::BatchReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchReadTensorboardTimeSeriesDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431318,9 +431322,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431335,13 +431339,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn read_tensorboard_time_series_data(
         &self,
         req: crate::model::ReadTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadTensorboardTimeSeriesDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431400,9 +431404,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431417,13 +431421,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn write_tensorboard_experiment_data(
         &self,
         req: crate::model::WriteTensorboardExperimentDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteTensorboardExperimentDataResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteTensorboardExperimentDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431472,9 +431476,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431489,13 +431493,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn write_tensorboard_run_data(
         &self,
         req: crate::model::WriteTensorboardRunDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteTensorboardRunDataResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteTensorboardRunDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431544,9 +431548,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431561,14 +431565,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn export_tensorboard_time_series_data(
         &self,
         req: crate::model::ExportTensorboardTimeSeriesDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExportTensorboardTimeSeriesDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431625,9 +431628,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431642,13 +431645,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431704,9 +431707,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431721,13 +431724,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431797,9 +431800,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -431814,13 +431817,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -432358,9 +432361,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -432375,13 +432378,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -433140,9 +433143,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -433157,14 +433160,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -433758,9 +433760,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -433775,14 +433777,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -438102,9 +438103,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -438119,13 +438120,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -440010,9 +440011,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -440027,13 +440028,13 @@ impl super::stub::TensorboardService for TensorboardService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -441861,9 +441862,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -441872,24 +441873,25 @@ impl super::stub::TensorboardService for TensorboardService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -443584,9 +443586,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -443595,24 +443597,25 @@ impl super::stub::TensorboardService for TensorboardService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -445750,9 +445753,9 @@ impl super::stub::TensorboardService for TensorboardService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445766,15 +445769,15 @@ impl super::stub::TensorboardService for TensorboardService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -445797,7 +445800,7 @@ impl std::fmt::Debug for VertexRagDataService {
 
 #[cfg(feature = "vertex-rag-data-service")]
 impl VertexRagDataService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -445808,13 +445811,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn create_rag_corpus(
         &self,
         req: crate::model::CreateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -445851,9 +445854,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445868,13 +445871,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn update_rag_corpus(
         &self,
         req: crate::model::UpdateRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -445921,9 +445924,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445938,13 +445941,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn get_rag_corpus(
         &self,
         req: crate::model::GetRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RagCorpus>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RagCorpus>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -445985,9 +445988,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446002,13 +446005,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn list_rag_corpora(
         &self,
         req: crate::model::ListRagCorporaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRagCorporaResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRagCorporaResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446047,9 +446050,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446064,13 +446067,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn delete_rag_corpus(
         &self,
         req: crate::model::DeleteRagCorpusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446112,9 +446115,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446129,13 +446132,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn upload_rag_file(
         &self,
         req: crate::model::UploadRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UploadRagFileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UploadRagFileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446176,9 +446179,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446193,13 +446196,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn import_rag_files(
         &self,
         req: crate::model::ImportRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446240,9 +446243,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446257,13 +446260,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn get_rag_file(
         &self,
         req: crate::model::GetRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RagFile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RagFile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446308,9 +446311,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446325,13 +446328,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn list_rag_files(
         &self,
         req: crate::model::ListRagFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRagFilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRagFilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446374,9 +446377,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446391,13 +446394,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn delete_rag_file(
         &self,
         req: crate::model::DeleteRagFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446442,9 +446445,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446459,13 +446462,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn update_rag_engine_config(
         &self,
         req: crate::model::UpdateRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446510,9 +446513,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446527,13 +446530,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn get_rag_engine_config(
         &self,
         req: crate::model::GetRagEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RagEngineConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RagEngineConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446572,9 +446575,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446589,13 +446592,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446651,9 +446654,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446668,13 +446671,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -446744,9 +446747,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446761,13 +446764,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -447305,9 +447308,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -447322,13 +447325,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -448087,9 +448090,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448104,14 +448107,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -448705,9 +448707,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448722,14 +448724,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -453049,9 +453050,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -453066,13 +453067,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -454957,9 +454958,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -454974,13 +454975,13 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -456808,9 +456809,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -456819,24 +456820,25 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -458531,9 +458533,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -458542,24 +458544,25 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -460697,9 +460700,9 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -460713,15 +460716,15 @@ impl super::stub::VertexRagDataService for VertexRagDataService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -460744,7 +460747,7 @@ impl std::fmt::Debug for VertexRagService {
 
 #[cfg(feature = "vertex-rag-service")]
 impl VertexRagService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -460755,13 +460758,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn retrieve_contexts(
         &self,
         req: crate::model::RetrieveContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetrieveContextsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetrieveContextsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -460798,9 +460801,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -460815,13 +460818,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn augment_prompt(
         &self,
         req: crate::model::AugmentPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AugmentPromptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AugmentPromptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -460858,9 +460861,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -460875,13 +460878,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn corroborate_content(
         &self,
         req: crate::model::CorroborateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CorroborateContentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CorroborateContentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -460918,9 +460921,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -460935,13 +460938,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -460997,9 +461000,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -461014,13 +461017,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -461090,9 +461093,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -461107,13 +461110,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -461651,9 +461654,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -461668,13 +461671,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -462433,9 +462436,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -462450,14 +462453,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -463051,9 +463053,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -463068,14 +463070,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -467395,9 +467396,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -467412,13 +467413,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -469303,9 +469304,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -469320,13 +469321,13 @@ impl super::stub::VertexRagService for VertexRagService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -471154,9 +471155,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -471165,24 +471166,25 @@ impl super::stub::VertexRagService for VertexRagService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -472877,9 +472879,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -472888,24 +472890,25 @@ impl super::stub::VertexRagService for VertexRagService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -475043,9 +475046,9 @@ impl super::stub::VertexRagService for VertexRagService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475076,7 +475079,7 @@ impl std::fmt::Debug for VizierService {
 
 #[cfg(feature = "vizier-service")]
 impl VizierService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -475087,13 +475090,13 @@ impl super::stub::VizierService for VizierService {
     async fn create_study(
         &self,
         req: crate::model::CreateStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Study>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Study>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475130,9 +475133,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475147,13 +475150,13 @@ impl super::stub::VizierService for VizierService {
     async fn get_study(
         &self,
         req: crate::model::GetStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Study>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Study>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475194,9 +475197,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475211,13 +475214,13 @@ impl super::stub::VizierService for VizierService {
     async fn list_studies(
         &self,
         req: crate::model::ListStudiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStudiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStudiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475256,9 +475259,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475273,13 +475276,13 @@ impl super::stub::VizierService for VizierService {
     async fn delete_study(
         &self,
         req: crate::model::DeleteStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475320,9 +475323,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475331,24 +475334,25 @@ impl super::stub::VizierService for VizierService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn lookup_study(
         &self,
         req: crate::model::LookupStudyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Study>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Study>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475385,9 +475389,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475402,13 +475406,13 @@ impl super::stub::VizierService for VizierService {
     async fn suggest_trials(
         &self,
         req: crate::model::SuggestTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475449,9 +475453,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475466,13 +475470,13 @@ impl super::stub::VizierService for VizierService {
     async fn create_trial(
         &self,
         req: crate::model::CreateTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475513,9 +475517,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475530,13 +475534,13 @@ impl super::stub::VizierService for VizierService {
     async fn get_trial(
         &self,
         req: crate::model::GetTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475581,9 +475585,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475598,13 +475602,13 @@ impl super::stub::VizierService for VizierService {
     async fn list_trials(
         &self,
         req: crate::model::ListTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTrialsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTrialsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475647,9 +475651,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475664,13 +475668,13 @@ impl super::stub::VizierService for VizierService {
     async fn add_trial_measurement(
         &self,
         req: crate::model::AddTrialMeasurementRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475715,9 +475719,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475732,13 +475736,13 @@ impl super::stub::VizierService for VizierService {
     async fn complete_trial(
         &self,
         req: crate::model::CompleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475783,9 +475787,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475800,13 +475804,13 @@ impl super::stub::VizierService for VizierService {
     async fn delete_trial(
         &self,
         req: crate::model::DeleteTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475851,9 +475855,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475862,24 +475866,25 @@ impl super::stub::VizierService for VizierService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn check_trial_early_stopping_state(
         &self,
         req: crate::model::CheckTrialEarlyStoppingStateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475924,9 +475929,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -475941,13 +475946,13 @@ impl super::stub::VizierService for VizierService {
     async fn stop_trial(
         &self,
         req: crate::model::StopTrialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trial>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trial>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -475992,9 +475997,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -476009,13 +476014,13 @@ impl super::stub::VizierService for VizierService {
     async fn list_optimal_trials(
         &self,
         req: crate::model::ListOptimalTrialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOptimalTrialsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOptimalTrialsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -476056,9 +476061,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -476073,13 +476078,13 @@ impl super::stub::VizierService for VizierService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -476135,9 +476140,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -476152,13 +476157,13 @@ impl super::stub::VizierService for VizierService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -476228,9 +476233,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -476245,13 +476250,13 @@ impl super::stub::VizierService for VizierService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -476789,9 +476794,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -476806,13 +476811,13 @@ impl super::stub::VizierService for VizierService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -477571,9 +477576,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -477588,14 +477593,13 @@ impl super::stub::VizierService for VizierService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -478189,9 +478193,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -478206,14 +478210,13 @@ impl super::stub::VizierService for VizierService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -482533,9 +482536,9 @@ impl super::stub::VizierService for VizierService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -482550,13 +482553,13 @@ impl super::stub::VizierService for VizierService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -484441,9 +484444,9 @@ impl super::stub::VizierService for VizierService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -484458,13 +484461,13 @@ impl super::stub::VizierService for VizierService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -486292,9 +486295,9 @@ impl super::stub::VizierService for VizierService {
                     "projects/*/locations/*/featureOnlineStores/*/featureViews/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -486303,24 +486306,25 @@ impl super::stub::VizierService for VizierService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -488015,9 +488019,9 @@ impl super::stub::VizierService for VizierService {
                     "projects/*/locations/*/tensorboards/*/experiments/*/runs/*/timeSeries/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -488026,24 +488030,25 @@ impl super::stub::VizierService for VizierService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn wait_operation(
         &self,
         req: google_cloud_longrunning::model::WaitOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -490181,9 +490186,9 @@ impl super::stub::VizierService for VizierService {
                     "projects/*/locations/*/featureGroups/*/features/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -490197,15 +490202,15 @@ impl super::stub::VizierService for VizierService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/alloydb/v1/Cargo.toml b/src/generated/cloud/alloydb/v1/Cargo.toml
index d1f290dd83..3baafdc335 100644
--- a/src/generated/cloud/alloydb/v1/Cargo.toml
+++ b/src/generated/cloud/alloydb/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/alloydb/v1/src/builder.rs b/src/generated/cloud/alloydb/v1/src/builder.rs
index e7ecf48215..8fdd806ec2 100644
--- a/src/generated/cloud/alloydb/v1/src/builder.rs
+++ b/src/generated/cloud/alloydb/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod alloy_dbcsql_admin {
     /// A builder for [AlloyDBCSQLAdmin][crate::client::AlloyDBCSQLAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_alloydb_v1::*;
     /// # use builder::alloy_dbcsql_admin::ClientBuilder;
     /// # use client::AlloyDBCSQLAdmin;
@@ -30,19 +30,18 @@ pub mod alloy_dbcsql_admin {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AlloyDBCSQLAdmin;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AlloyDBCSQLAdmin;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod alloy_dbcsql_admin {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AlloyDBCSQLAdmin>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod alloy_dbcsql_admin {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::RestoreFromCloudSQL;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -108,7 +107,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123,7 +122,7 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .restore_from_cloud_sql(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_from_cloud_sql`.
@@ -140,7 +139,7 @@ pub mod alloy_dbcsql_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -234,8 +233,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreFromCloudSQL {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreFromCloudSQL {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -245,8 +244,8 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -280,7 +279,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -290,15 +289,15 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -307,17 +306,17 @@ pub mod alloy_dbcsql_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -347,8 +346,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -358,7 +357,7 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -389,7 +388,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -399,7 +398,7 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -410,8 +409,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -421,8 +420,8 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -458,7 +457,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -468,15 +467,15 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -485,17 +484,17 @@ pub mod alloy_dbcsql_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -531,8 +530,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -542,7 +541,7 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -573,7 +572,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -583,7 +582,7 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -594,8 +593,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -605,7 +604,7 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -638,7 +637,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -648,7 +647,7 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -659,8 +658,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -670,7 +669,7 @@ pub mod alloy_dbcsql_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_dbcsql_admin::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -703,7 +702,7 @@ pub mod alloy_dbcsql_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -713,7 +712,7 @@ pub mod alloy_dbcsql_admin {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -724,8 +723,8 @@ pub mod alloy_dbcsql_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -737,7 +736,7 @@ pub mod alloy_db_admin {
     /// A builder for [AlloyDBAdmin][crate::client::AlloyDBAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_alloydb_v1::*;
     /// # use builder::alloy_db_admin::ClientBuilder;
     /// # use client::AlloyDBAdmin;
@@ -747,19 +746,18 @@ pub mod alloy_db_admin {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AlloyDBAdmin;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AlloyDBAdmin;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -770,7 +768,7 @@ pub mod alloy_db_admin {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AlloyDBAdmin>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -783,7 +781,7 @@ pub mod alloy_db_admin {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -793,8 +791,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -825,7 +823,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -835,13 +833,13 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListClustersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListClustersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -850,15 +848,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListClustersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListClustersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -896,8 +896,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -907,7 +907,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -935,7 +935,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -945,7 +945,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetClusterRequest::name].
@@ -964,8 +964,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -975,7 +975,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CreateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1004,7 +1004,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1019,7 +1019,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .create_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_cluster`.
@@ -1036,7 +1036,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1115,8 +1115,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1126,7 +1126,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::UpdateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1155,7 +1155,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1170,7 +1170,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .update_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_cluster`.
@@ -1187,7 +1187,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1274,8 +1274,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1285,7 +1285,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ExportCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1314,7 +1314,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1329,7 +1329,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .export_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_cluster`.
@@ -1348,7 +1348,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1470,8 +1470,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1481,7 +1481,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ImportCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1510,7 +1510,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1525,7 +1525,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .import_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_cluster`.
@@ -1544,7 +1544,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1649,8 +1649,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1660,7 +1660,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::UpgradeCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1689,7 +1689,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1704,7 +1704,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .upgrade_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `upgrade_cluster`.
@@ -1723,7 +1723,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1786,8 +1786,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpgradeCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpgradeCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1797,7 +1797,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::DeleteCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1826,7 +1826,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1841,7 +1841,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .delete_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_cluster`.
@@ -1853,7 +1853,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1914,8 +1914,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1925,7 +1925,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::PromoteCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1954,7 +1954,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1969,7 +1969,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .promote_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `promote_cluster`.
@@ -1986,7 +1986,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2041,8 +2041,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PromoteCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PromoteCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2052,7 +2052,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::SwitchoverCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2084,7 +2084,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2099,7 +2099,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .switchover_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `switchover_cluster`.
@@ -2116,7 +2116,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2165,8 +2165,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SwitchoverCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SwitchoverCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2176,7 +2176,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::RestoreCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2205,7 +2205,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2220,7 +2220,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .restore_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_cluster`.
@@ -2237,7 +2237,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2358,8 +2358,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2369,7 +2369,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CreateSecondaryCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2401,7 +2401,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2416,7 +2416,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .create_secondary_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_secondary_cluster`.
@@ -2433,7 +2433,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2512,8 +2512,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSecondaryCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSecondaryCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2523,8 +2523,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2555,7 +2555,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2565,13 +2565,13 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2580,15 +2580,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2626,8 +2628,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2637,7 +2639,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2665,7 +2667,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2675,7 +2677,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -2694,8 +2696,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2705,7 +2707,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2734,7 +2736,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2749,7 +2751,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -2766,7 +2768,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2845,8 +2847,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2856,7 +2858,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CreateSecondaryInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2890,7 +2892,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2905,7 +2907,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .create_secondary_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_secondary_instance`.
@@ -2922,7 +2924,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3001,8 +3003,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSecondaryInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSecondaryInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3012,7 +3014,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::BatchCreateInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3044,7 +3046,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3059,7 +3061,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .batch_create_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_create_instances`.
@@ -3078,7 +3080,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3143,8 +3145,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3154,7 +3156,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3183,7 +3185,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3198,7 +3200,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -3215,7 +3217,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3302,8 +3304,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3313,7 +3315,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3342,7 +3344,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3357,7 +3359,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -3369,7 +3371,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3424,8 +3426,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3435,7 +3437,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::FailoverInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3467,7 +3469,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3482,7 +3484,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .failover_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `failover_instance`.
@@ -3499,7 +3501,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3548,8 +3550,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FailoverInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FailoverInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3559,7 +3561,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::InjectFault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3588,7 +3590,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3603,7 +3605,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .inject_fault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `inject_fault`.
@@ -3620,7 +3622,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3680,8 +3682,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InjectFault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InjectFault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3691,7 +3693,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::RestartInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3720,7 +3722,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3735,7 +3737,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .restart_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restart_instance`.
@@ -3752,7 +3754,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3812,8 +3814,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestartInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestartInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3823,7 +3825,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ExecuteSql;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3851,7 +3853,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3861,7 +3863,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .execute_sql(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::ExecuteSqlRequest::instance].
@@ -3926,8 +3928,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExecuteSql {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExecuteSql {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3937,8 +3939,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3969,7 +3971,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3979,13 +3981,13 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3994,15 +3996,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4040,8 +4044,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4051,7 +4055,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4079,7 +4083,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4089,7 +4093,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -4102,8 +4106,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4113,7 +4117,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CreateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4142,7 +4146,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4157,7 +4161,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .create_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup`.
@@ -4174,7 +4178,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4253,8 +4257,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4264,7 +4268,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::UpdateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4293,7 +4297,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4308,7 +4312,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .update_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup`.
@@ -4325,7 +4329,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4412,8 +4416,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4423,7 +4427,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4452,7 +4456,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4467,7 +4471,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -4479,7 +4483,7 @@ pub mod alloy_db_admin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4534,8 +4538,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4545,8 +4549,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListSupportedDatabaseFlags;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4582,7 +4586,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4592,15 +4596,15 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_supported_database_flags(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListSupportedDatabaseFlagsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4609,17 +4613,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSupportedDatabaseFlagsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4654,8 +4658,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSupportedDatabaseFlags {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSupportedDatabaseFlags {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4665,7 +4669,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GenerateClientCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4698,7 +4702,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4708,7 +4712,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .generate_client_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GenerateClientCertificateRequest::parent].
@@ -4757,8 +4761,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateClientCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateClientCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4768,7 +4772,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetConnectionInfo;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4799,7 +4803,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4809,7 +4813,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_connection_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GetConnectionInfoRequest::parent].
@@ -4828,8 +4832,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnectionInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnectionInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4839,8 +4843,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListUsers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4871,7 +4875,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4881,13 +4885,13 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_users(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListUsersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListUsersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4896,15 +4900,15 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListUsersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListUsersResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4942,8 +4946,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListUsers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListUsers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4953,7 +4957,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetUser;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4981,7 +4985,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4991,7 +4995,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_user(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetUserRequest::name].
@@ -5004,8 +5008,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetUser {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetUser {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5015,7 +5019,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CreateUser;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5043,7 +5047,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5053,7 +5057,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .create_user(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateUserRequest::parent].
@@ -5108,8 +5112,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateUser {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateUser {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5119,7 +5123,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::UpdateUser;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5147,7 +5151,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5157,7 +5161,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .update_user(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateUserRequest::update_mask].
@@ -5220,8 +5224,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateUser {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateUser {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5231,7 +5235,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::DeleteUser;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5259,7 +5263,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5269,7 +5273,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .delete_user(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteUserRequest::name].
@@ -5294,8 +5298,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteUser {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteUser {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5305,8 +5309,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListDatabases;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5337,7 +5341,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5347,13 +5351,13 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_databases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDatabasesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDatabasesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5362,15 +5366,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDatabasesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDatabasesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5402,8 +5408,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDatabases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDatabases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5413,8 +5419,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5448,7 +5454,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5458,15 +5464,15 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5475,17 +5481,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5515,8 +5521,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5526,7 +5532,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5557,7 +5563,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5567,7 +5573,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5578,8 +5584,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5589,8 +5595,8 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5626,7 +5632,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5636,15 +5642,15 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5653,17 +5659,17 @@ pub mod alloy_db_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5699,8 +5705,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5710,7 +5716,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5741,7 +5747,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5751,7 +5757,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5762,8 +5768,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5773,7 +5779,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5806,7 +5812,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5816,7 +5822,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5827,8 +5833,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5838,7 +5844,7 @@ pub mod alloy_db_admin {
     /// # Example
     /// ```
     /// # use google_cloud_alloydb_v1::builder::alloy_db_admin::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_alloydb_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5871,7 +5877,7 @@ pub mod alloy_db_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5881,7 +5887,7 @@ pub mod alloy_db_admin {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5892,8 +5898,8 @@ pub mod alloy_db_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/alloydb/v1/src/client.rs b/src/generated/cloud/alloydb/v1/src/client.rs
index 7640414032..88497715aa 100644
--- a/src/generated/cloud/alloydb/v1/src/client.rs
+++ b/src/generated/cloud/alloydb/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_alloydb_v1::client::AlloyDBCSQLAdmin;
 /// let client = AlloyDBCSQLAdmin::builder().build().await?;
 /// // use `client` to make requests to the AlloyDB API.
@@ -66,15 +66,13 @@ impl AlloyDBCSQLAdmin {
     /// Returns a builder for [AlloyDBCSQLAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_alloydb_v1::client::AlloyDBCSQLAdmin;
     /// let client = AlloyDBCSQLAdmin::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::alloy_dbcsql_admin::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::alloy_dbcsql_admin::client::Factory,
-        )
+        crate::new_client_builder(super::builder::alloy_dbcsql_admin::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl AlloyDBCSQLAdmin {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AlloyDBCSQLAdmin>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AlloyDBCSQLAdmin>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl AlloyDBCSQLAdmin {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AlloyDBCSQLAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AlloyDBCSQLAdmin> {
         super::transport::AlloyDBCSQLAdmin::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AlloyDBCSQLAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AlloyDBCSQLAdmin> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AlloyDBCSQLAdmin::new)
@@ -181,7 +179,7 @@ impl AlloyDBCSQLAdmin {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_alloydb_v1::client::AlloyDBAdmin;
 /// let client = AlloyDBAdmin::builder().build().await?;
 /// // use `client` to make requests to the AlloyDB API.
@@ -227,13 +225,13 @@ impl AlloyDBAdmin {
     /// Returns a builder for [AlloyDBAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_alloydb_v1::client::AlloyDBAdmin;
     /// let client = AlloyDBAdmin::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::alloy_db_admin::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::alloy_db_admin::client::Factory)
+        crate::new_client_builder(super::builder::alloy_db_admin::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -251,14 +249,14 @@ impl AlloyDBAdmin {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AlloyDBAdmin>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AlloyDBAdmin>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -267,13 +265,13 @@ impl AlloyDBAdmin {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AlloyDBAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AlloyDBAdmin> {
         super::transport::AlloyDBAdmin::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AlloyDBAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AlloyDBAdmin> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AlloyDBAdmin::new)
diff --git a/src/generated/cloud/alloydb/v1/src/lib.rs b/src/generated/cloud/alloydb/v1/src/lib.rs
index b7cc68a10c..e3094aa49a 100644
--- a/src/generated/cloud/alloydb/v1/src/lib.rs
+++ b/src/generated/cloud/alloydb/v1/src/lib.rs
@@ -47,8 +47,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -83,3 +83,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/alloydb/v1/src/model.rs b/src/generated/cloud/alloydb/v1/src/model.rs
index 90ac3eb878..d348e0a28d 100644
--- a/src/generated/cloud/alloydb/v1/src/model.rs
+++ b/src/generated/cloud/alloydb/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -9622,7 +9622,7 @@ impl wkt::message::Message for ListClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListClustersResponse {
     type PageItem = crate::model::Cluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12685,7 +12685,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -14931,7 +14931,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -15508,7 +15508,9 @@ impl wkt::message::Message for ListSupportedDatabaseFlagsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSupportedDatabaseFlagsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListSupportedDatabaseFlagsResponse
+{
     type PageItem = crate::model::SupportedDatabaseFlag;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -16880,7 +16882,7 @@ impl wkt::message::Message for ListUsersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListUsersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListUsersResponse {
     type PageItem = crate::model::User;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17433,7 +17435,7 @@ impl wkt::message::Message for ListDatabasesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDatabasesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDatabasesResponse {
     type PageItem = crate::model::Database;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/alloydb/v1/src/stub.rs b/src/generated/cloud/alloydb/v1/src/stub.rs
index 91a41aa265..0b57970bf4 100644
--- a/src/generated/cloud/alloydb/v1/src/stub.rs
+++ b/src/generated/cloud/alloydb/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn restore_from_cloud_sql(
         &self,
         _req: crate::model::RestoreFromCloudSQLRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,10 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -66,9 +66,9 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,10 +77,10 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -90,9 +90,9 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -101,8 +101,8 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -110,8 +110,8 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -121,9 +121,9 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -132,9 +132,9 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -154,9 +154,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_clusters(
         &self,
         _req: crate::model::ListClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,10 +165,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_cluster(
         &self,
         _req: crate::model::GetClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Cluster>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Cluster>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -176,9 +175,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn create_cluster(
         &self,
         _req: crate::model::CreateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,9 +186,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn update_cluster(
         &self,
         _req: crate::model::UpdateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,9 +197,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn export_cluster(
         &self,
         _req: crate::model::ExportClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -209,9 +208,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn import_cluster(
         &self,
         _req: crate::model::ImportClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +219,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn upgrade_cluster(
         &self,
         _req: crate::model::UpgradeClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +230,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn delete_cluster(
         &self,
         _req: crate::model::DeleteClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +241,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn promote_cluster(
         &self,
         _req: crate::model::PromoteClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +252,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn switchover_cluster(
         &self,
         _req: crate::model::SwitchoverClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,9 +263,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn restore_cluster(
         &self,
         _req: crate::model::RestoreClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -275,9 +274,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn create_secondary_cluster(
         &self,
         _req: crate::model::CreateSecondaryClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -286,9 +285,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -297,10 +296,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -308,9 +306,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -319,9 +317,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn create_secondary_instance(
         &self,
         _req: crate::model::CreateSecondaryInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -330,9 +328,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn batch_create_instances(
         &self,
         _req: crate::model::BatchCreateInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -341,9 +339,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -352,9 +350,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -363,9 +361,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn failover_instance(
         &self,
         _req: crate::model::FailoverInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -374,9 +372,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn inject_fault(
         &self,
         _req: crate::model::InjectFaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,9 +383,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn restart_instance(
         &self,
         _req: crate::model::RestartInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -396,9 +394,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn execute_sql(
         &self,
         _req: crate::model::ExecuteSqlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExecuteSqlResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ExecuteSqlResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -407,9 +405,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -418,10 +416,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -429,9 +426,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn create_backup(
         &self,
         _req: crate::model::CreateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -440,9 +437,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn update_backup(
         &self,
         _req: crate::model::UpdateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -451,9 +448,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -462,11 +459,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_supported_database_flags(
         &self,
         _req: crate::model::ListSupportedDatabaseFlagsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListSupportedDatabaseFlagsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListSupportedDatabaseFlagsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -475,11 +470,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn generate_client_certificate(
         &self,
         _req: crate::model::GenerateClientCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateClientCertificateResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateClientCertificateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -488,9 +481,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_connection_info(
         &self,
         _req: crate::model::GetConnectionInfoRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConnectionInfo>>,
+        Output = crate::Result<crate::Response<crate::model::ConnectionInfo>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -499,9 +492,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_users(
         &self,
         _req: crate::model::ListUsersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListUsersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListUsersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -510,10 +503,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_user(
         &self,
         _req: crate::model::GetUserRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::User>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::User>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -521,10 +513,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn create_user(
         &self,
         _req: crate::model::CreateUserRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::User>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::User>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -532,10 +523,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn update_user(
         &self,
         _req: crate::model::UpdateUserRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::User>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::User>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -543,8 +533,8 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn delete_user(
         &self,
         _req: crate::model::DeleteUserRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -552,9 +542,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_databases(
         &self,
         _req: crate::model::ListDatabasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDatabasesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDatabasesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -563,10 +553,10 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -576,9 +566,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -587,10 +577,10 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -600,9 +590,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -611,8 +601,8 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -620,8 +610,8 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -631,9 +621,9 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -642,8 +632,8 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/alloydb/v1/src/stub/dynamic.rs b/src/generated/cloud/alloydb/v1/src/stub/dynamic.rs
index cde274a5a0..89249abb18 100644
--- a/src/generated/cloud/alloydb/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/alloydb/v1/src/stub/dynamic.rs
@@ -20,56 +20,54 @@ pub trait AlloyDBCSQLAdmin: std::fmt::Debug + Send + Sync {
     async fn restore_from_cloud_sql(
         &self,
         req: crate::model::RestoreFromCloudSQLRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AlloyDBCSQLAdmin] also implement [AlloyDBCSQLAdmin].
@@ -79,8 +77,8 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn restore_from_cloud_sql(
         &self,
         req: crate::model::RestoreFromCloudSQLRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_from_cloud_sql(self, req, options).await
     }
 
@@ -88,9 +86,8 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -98,8 +95,8 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -107,10 +104,9 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -118,8 +114,8 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -127,8 +123,8 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -136,22 +132,22 @@ impl<T: super::AlloyDBCSQLAdmin> AlloyDBCSQLAdmin for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -162,272 +158,270 @@ pub trait AlloyDBAdmin: std::fmt::Debug + Send + Sync {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>>;
 
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>>;
 
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_cluster(
         &self,
         req: crate::model::ExportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_cluster(
         &self,
         req: crate::model::ImportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn promote_cluster(
         &self,
         req: crate::model::PromoteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn switchover_cluster(
         &self,
         req: crate::model::SwitchoverClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_cluster(
         &self,
         req: crate::model::RestoreClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_secondary_cluster(
         &self,
         req: crate::model::CreateSecondaryClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_secondary_instance(
         &self,
         req: crate::model::CreateSecondaryInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_create_instances(
         &self,
         req: crate::model::BatchCreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn failover_instance(
         &self,
         req: crate::model::FailoverInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn inject_fault(
         &self,
         req: crate::model::InjectFaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn execute_sql(
         &self,
         req: crate::model::ExecuteSqlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExecuteSqlResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExecuteSqlResponse>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_supported_database_flags(
         &self,
         req: crate::model::ListSupportedDatabaseFlagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSupportedDatabaseFlagsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSupportedDatabaseFlagsResponse>>;
 
     async fn generate_client_certificate(
         &self,
         req: crate::model::GenerateClientCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateClientCertificateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateClientCertificateResponse>>;
 
     async fn get_connection_info(
         &self,
         req: crate::model::GetConnectionInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionInfo>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionInfo>>;
 
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListUsersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListUsersResponse>>;
 
     async fn get_user(
         &self,
         req: crate::model::GetUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>>;
 
     async fn create_user(
         &self,
         req: crate::model::CreateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>>;
 
     async fn update_user(
         &self,
         req: crate::model::UpdateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>>;
 
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_databases(
         &self,
         req: crate::model::ListDatabasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatabasesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatabasesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AlloyDBAdmin] also implement [AlloyDBAdmin].
@@ -437,8 +431,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>> {
         T::list_clusters(self, req, options).await
     }
 
@@ -446,8 +440,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>> {
         T::get_cluster(self, req, options).await
     }
 
@@ -455,8 +449,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_cluster(self, req, options).await
     }
 
@@ -464,8 +458,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_cluster(self, req, options).await
     }
 
@@ -473,8 +467,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn export_cluster(
         &self,
         req: crate::model::ExportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_cluster(self, req, options).await
     }
 
@@ -482,8 +476,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn import_cluster(
         &self,
         req: crate::model::ImportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_cluster(self, req, options).await
     }
 
@@ -491,8 +485,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::upgrade_cluster(self, req, options).await
     }
 
@@ -500,8 +494,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_cluster(self, req, options).await
     }
 
@@ -509,8 +503,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn promote_cluster(
         &self,
         req: crate::model::PromoteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::promote_cluster(self, req, options).await
     }
 
@@ -518,8 +512,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn switchover_cluster(
         &self,
         req: crate::model::SwitchoverClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::switchover_cluster(self, req, options).await
     }
 
@@ -527,8 +521,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn restore_cluster(
         &self,
         req: crate::model::RestoreClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_cluster(self, req, options).await
     }
 
@@ -536,8 +530,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn create_secondary_cluster(
         &self,
         req: crate::model::CreateSecondaryClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_secondary_cluster(self, req, options).await
     }
 
@@ -545,8 +539,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -554,8 +548,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -563,8 +557,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -572,8 +566,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn create_secondary_instance(
         &self,
         req: crate::model::CreateSecondaryInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_secondary_instance(self, req, options).await
     }
 
@@ -581,8 +575,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn batch_create_instances(
         &self,
         req: crate::model::BatchCreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_create_instances(self, req, options).await
     }
 
@@ -590,8 +584,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -599,8 +593,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -608,8 +602,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn failover_instance(
         &self,
         req: crate::model::FailoverInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::failover_instance(self, req, options).await
     }
 
@@ -617,8 +611,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn inject_fault(
         &self,
         req: crate::model::InjectFaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::inject_fault(self, req, options).await
     }
 
@@ -626,8 +620,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restart_instance(self, req, options).await
     }
 
@@ -635,8 +629,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn execute_sql(
         &self,
         req: crate::model::ExecuteSqlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExecuteSqlResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExecuteSqlResponse>> {
         T::execute_sql(self, req, options).await
     }
 
@@ -644,8 +638,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -653,8 +647,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -662,8 +656,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup(self, req, options).await
     }
 
@@ -671,8 +665,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup(self, req, options).await
     }
 
@@ -680,8 +674,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -689,9 +683,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_supported_database_flags(
         &self,
         req: crate::model::ListSupportedDatabaseFlagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSupportedDatabaseFlagsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSupportedDatabaseFlagsResponse>> {
         T::list_supported_database_flags(self, req, options).await
     }
 
@@ -699,9 +692,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn generate_client_certificate(
         &self,
         req: crate::model::GenerateClientCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateClientCertificateResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateClientCertificateResponse>> {
         T::generate_client_certificate(self, req, options).await
     }
 
@@ -709,8 +701,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_connection_info(
         &self,
         req: crate::model::GetConnectionInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionInfo>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionInfo>> {
         T::get_connection_info(self, req, options).await
     }
 
@@ -718,8 +710,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListUsersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListUsersResponse>> {
         T::list_users(self, req, options).await
     }
 
@@ -727,8 +719,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_user(
         &self,
         req: crate::model::GetUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>> {
         T::get_user(self, req, options).await
     }
 
@@ -736,8 +728,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn create_user(
         &self,
         req: crate::model::CreateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>> {
         T::create_user(self, req, options).await
     }
 
@@ -745,8 +737,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn update_user(
         &self,
         req: crate::model::UpdateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>> {
         T::update_user(self, req, options).await
     }
 
@@ -754,8 +746,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_user(self, req, options).await
     }
 
@@ -763,8 +755,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_databases(
         &self,
         req: crate::model::ListDatabasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatabasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatabasesResponse>> {
         T::list_databases(self, req, options).await
     }
 
@@ -772,9 +764,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -782,8 +773,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -791,10 +782,9 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -802,8 +792,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -811,8 +801,8 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -820,22 +810,22 @@ impl<T: super::AlloyDBAdmin> AlloyDBAdmin for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/alloydb/v1/src/tracing.rs b/src/generated/cloud/alloydb/v1/src/tracing.rs
index a8b42600b5..26894df11c 100644
--- a/src/generated/cloud/alloydb/v1/src/tracing.rs
+++ b/src/generated/cloud/alloydb/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn restore_from_cloud_sql(
         &self,
         req: crate::model::RestoreFromCloudSQLRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_from_cloud_sql(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -68,9 +68,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -78,8 +77,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -87,8 +86,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -96,22 +95,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -142,8 +141,8 @@ where
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         self.inner.list_clusters(req, options).await
     }
 
@@ -151,8 +150,8 @@ where
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         self.inner.get_cluster(req, options).await
     }
 
@@ -160,8 +159,8 @@ where
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_cluster(req, options).await
     }
 
@@ -169,8 +168,8 @@ where
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_cluster(req, options).await
     }
 
@@ -178,8 +177,8 @@ where
     async fn export_cluster(
         &self,
         req: crate::model::ExportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_cluster(req, options).await
     }
 
@@ -187,8 +186,8 @@ where
     async fn import_cluster(
         &self,
         req: crate::model::ImportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_cluster(req, options).await
     }
 
@@ -196,8 +195,8 @@ where
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.upgrade_cluster(req, options).await
     }
 
@@ -205,8 +204,8 @@ where
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_cluster(req, options).await
     }
 
@@ -214,8 +213,8 @@ where
     async fn promote_cluster(
         &self,
         req: crate::model::PromoteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.promote_cluster(req, options).await
     }
 
@@ -223,8 +222,8 @@ where
     async fn switchover_cluster(
         &self,
         req: crate::model::SwitchoverClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.switchover_cluster(req, options).await
     }
 
@@ -232,8 +231,8 @@ where
     async fn restore_cluster(
         &self,
         req: crate::model::RestoreClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_cluster(req, options).await
     }
 
@@ -241,8 +240,8 @@ where
     async fn create_secondary_cluster(
         &self,
         req: crate::model::CreateSecondaryClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_secondary_cluster(req, options).await
     }
 
@@ -250,8 +249,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -259,8 +258,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -268,8 +267,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -277,8 +276,8 @@ where
     async fn create_secondary_instance(
         &self,
         req: crate::model::CreateSecondaryInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_secondary_instance(req, options).await
     }
 
@@ -286,8 +285,8 @@ where
     async fn batch_create_instances(
         &self,
         req: crate::model::BatchCreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_create_instances(req, options).await
     }
 
@@ -295,8 +294,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -304,8 +303,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -313,8 +312,8 @@ where
     async fn failover_instance(
         &self,
         req: crate::model::FailoverInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.failover_instance(req, options).await
     }
 
@@ -322,8 +321,8 @@ where
     async fn inject_fault(
         &self,
         req: crate::model::InjectFaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.inject_fault(req, options).await
     }
 
@@ -331,8 +330,8 @@ where
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restart_instance(req, options).await
     }
 
@@ -340,8 +339,8 @@ where
     async fn execute_sql(
         &self,
         req: crate::model::ExecuteSqlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExecuteSqlResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExecuteSqlResponse>> {
         self.inner.execute_sql(req, options).await
     }
 
@@ -349,8 +348,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -358,8 +357,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -367,8 +366,8 @@ where
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup(req, options).await
     }
 
@@ -376,8 +375,8 @@ where
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup(req, options).await
     }
 
@@ -385,8 +384,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -394,8 +393,8 @@ where
     async fn list_supported_database_flags(
         &self,
         req: crate::model::ListSupportedDatabaseFlagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSupportedDatabaseFlagsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSupportedDatabaseFlagsResponse>> {
         self.inner.list_supported_database_flags(req, options).await
     }
 
@@ -403,8 +402,8 @@ where
     async fn generate_client_certificate(
         &self,
         req: crate::model::GenerateClientCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateClientCertificateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateClientCertificateResponse>> {
         self.inner.generate_client_certificate(req, options).await
     }
 
@@ -412,8 +411,8 @@ where
     async fn get_connection_info(
         &self,
         req: crate::model::GetConnectionInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionInfo>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionInfo>> {
         self.inner.get_connection_info(req, options).await
     }
 
@@ -421,8 +420,8 @@ where
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListUsersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListUsersResponse>> {
         self.inner.list_users(req, options).await
     }
 
@@ -430,8 +429,8 @@ where
     async fn get_user(
         &self,
         req: crate::model::GetUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         self.inner.get_user(req, options).await
     }
 
@@ -439,8 +438,8 @@ where
     async fn create_user(
         &self,
         req: crate::model::CreateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         self.inner.create_user(req, options).await
     }
 
@@ -448,8 +447,8 @@ where
     async fn update_user(
         &self,
         req: crate::model::UpdateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         self.inner.update_user(req, options).await
     }
 
@@ -457,8 +456,8 @@ where
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_user(req, options).await
     }
 
@@ -466,8 +465,8 @@ where
     async fn list_databases(
         &self,
         req: crate::model::ListDatabasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatabasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatabasesResponse>> {
         self.inner.list_databases(req, options).await
     }
 
@@ -475,8 +474,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -484,8 +483,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -493,9 +492,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -503,8 +501,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -512,8 +510,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -521,22 +519,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/alloydb/v1/src/transport.rs b/src/generated/cloud/alloydb/v1/src/transport.rs
index ce4cd4b7d5..05609f960c 100644
--- a/src/generated/cloud/alloydb/v1/src/transport.rs
+++ b/src/generated/cloud/alloydb/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AlloyDBCSQLAdmin](super::stub::AlloyDBCSQLAdmin) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AlloyDBCSQLAdmin {
 }
 
 impl AlloyDBCSQLAdmin {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
     async fn restore_from_cloud_sql(
         &self,
         req: crate::model::RestoreFromCloudSQLRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -86,9 +86,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103,13 +103,13 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -139,9 +139,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -156,13 +156,13 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -199,9 +199,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -216,14 +216,13 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -265,9 +264,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -282,13 +281,13 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -329,9 +328,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -346,13 +345,13 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -393,9 +392,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -404,24 +403,25 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -462,9 +462,9 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -473,25 +473,26 @@ impl super::stub::AlloyDBCSQLAdmin for AlloyDBCSQLAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -511,7 +512,7 @@ impl std::fmt::Debug for AlloyDBAdmin {
 }
 
 impl AlloyDBAdmin {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -521,13 +522,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -568,9 +569,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -585,13 +586,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -633,9 +634,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -650,13 +651,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -696,9 +697,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -713,13 +714,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -781,9 +782,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -798,13 +799,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn export_cluster(
         &self,
         req: crate::model::ExportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -845,9 +846,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -862,13 +863,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn import_cluster(
         &self,
         req: crate::model::ImportClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -909,9 +910,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -926,13 +927,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -973,9 +974,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -990,13 +991,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1041,9 +1042,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1058,13 +1059,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn promote_cluster(
         &self,
         req: crate::model::PromoteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1105,9 +1106,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1122,13 +1123,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn switchover_cluster(
         &self,
         req: crate::model::SwitchoverClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1169,9 +1170,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1186,13 +1187,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn restore_cluster(
         &self,
         req: crate::model::RestoreClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1229,9 +1230,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1246,13 +1247,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn create_secondary_cluster(
         &self,
         req: crate::model::CreateSecondaryClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1292,9 +1293,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1309,13 +1310,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1360,9 +1361,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1377,13 +1378,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1429,9 +1430,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1446,13 +1447,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1496,9 +1497,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1513,13 +1514,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn create_secondary_instance(
         &self,
         req: crate::model::CreateSecondaryInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1563,9 +1564,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1580,13 +1581,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn batch_create_instances(
         &self,
         req: crate::model::BatchCreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1628,9 +1629,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1645,13 +1646,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1717,9 +1718,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1734,13 +1735,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1788,9 +1789,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1805,13 +1806,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn failover_instance(
         &self,
         req: crate::model::FailoverInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1856,9 +1857,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1873,13 +1874,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn inject_fault(
         &self,
         req: crate::model::InjectFaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1924,9 +1925,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1941,13 +1942,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1992,9 +1993,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2009,13 +2010,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn execute_sql(
         &self,
         req: crate::model::ExecuteSqlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExecuteSqlResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExecuteSqlResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2060,9 +2061,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2077,13 +2078,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2124,9 +2125,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2141,13 +2142,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2188,9 +2189,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2205,13 +2206,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2251,9 +2252,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2268,13 +2269,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2336,9 +2337,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2353,13 +2354,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2403,9 +2404,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2420,13 +2421,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_supported_database_flags(
         &self,
         req: crate::model::ListSupportedDatabaseFlagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSupportedDatabaseFlagsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSupportedDatabaseFlagsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2466,9 +2467,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2483,13 +2484,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn generate_client_certificate(
         &self,
         req: crate::model::GenerateClientCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateClientCertificateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateClientCertificateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2530,9 +2531,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2547,13 +2548,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_connection_info(
         &self,
         req: crate::model::GetConnectionInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionInfo>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionInfo>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2599,9 +2600,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2616,13 +2617,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListUsersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListUsersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2667,9 +2668,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2684,13 +2685,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_user(
         &self,
         req: crate::model::GetUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2735,9 +2736,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2752,13 +2753,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn create_user(
         &self,
         req: crate::model::CreateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2802,9 +2803,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2819,13 +2820,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn update_user(
         &self,
         req: crate::model::UpdateUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2891,9 +2892,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2908,13 +2909,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2961,9 +2962,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2972,24 +2973,25 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_databases(
         &self,
         req: crate::model::ListDatabasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatabasesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatabasesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3033,9 +3035,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3050,13 +3052,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3086,9 +3088,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3103,13 +3105,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3146,9 +3148,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3163,14 +3165,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3212,9 +3213,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3229,13 +3230,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3276,9 +3277,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3293,13 +3294,13 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3340,9 +3341,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3351,24 +3352,25 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3409,9 +3411,9 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3420,25 +3422,26 @@ impl super::stub::AlloyDBAdmin for AlloyDBAdmin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/apigateway/v1/Cargo.toml b/src/generated/cloud/apigateway/v1/Cargo.toml
index 153a08e717..1b72fdb496 100644
--- a/src/generated/cloud/apigateway/v1/Cargo.toml
+++ b/src/generated/cloud/apigateway/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/apigateway/v1/src/builder.rs b/src/generated/cloud/apigateway/v1/src/builder.rs
index 95c49209e3..8008bdaee7 100644
--- a/src/generated/cloud/apigateway/v1/src/builder.rs
+++ b/src/generated/cloud/apigateway/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod api_gateway_service {
     /// A builder for [ApiGatewayService][crate::client::ApiGatewayService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apigateway_v1::*;
     /// # use builder::api_gateway_service::ClientBuilder;
     /// # use client::ApiGatewayService;
@@ -30,19 +30,18 @@ pub mod api_gateway_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiGatewayService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiGatewayService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod api_gateway_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiGatewayService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod api_gateway_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::ListGateways;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .list_gateways(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGatewaysResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListGatewaysResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod api_gateway_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGatewaysResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGatewaysResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGateways {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGateways {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::GetGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .get_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGatewayRequest::name].
@@ -241,8 +242,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::CreateGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .create_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_gateway`.
@@ -313,7 +314,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -380,8 +381,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -391,7 +392,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::UpdateGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -420,7 +421,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -435,7 +436,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .update_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_gateway`.
@@ -452,7 +453,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -521,8 +522,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -532,7 +533,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::DeleteGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -561,7 +562,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -576,7 +577,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .delete_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_gateway`.
@@ -588,7 +589,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -625,8 +626,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -636,8 +637,8 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::ListApis;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -668,7 +669,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -678,13 +679,13 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .list_apis(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListApisResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListApisResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -693,15 +694,15 @@ pub mod api_gateway_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListApisResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListApisResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -739,8 +740,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListApis {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListApis {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -750,7 +751,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::GetApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -778,7 +779,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -788,7 +789,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .get_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApiRequest::name].
@@ -801,8 +802,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -812,7 +813,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::CreateApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -841,7 +842,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -856,7 +857,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .create_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_api`.
@@ -873,7 +874,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -940,8 +941,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -951,7 +952,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::UpdateApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -980,7 +981,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -995,7 +996,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .update_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_api`.
@@ -1012,7 +1013,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1081,8 +1082,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1092,7 +1093,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::DeleteApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1121,7 +1122,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1136,7 +1137,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .delete_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_api`.
@@ -1148,7 +1149,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1185,8 +1186,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1196,8 +1197,8 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::ListApiConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1228,7 +1229,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1238,14 +1239,16 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .list_api_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListApiConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListApiConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1253,15 +1256,17 @@ pub mod api_gateway_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListApiConfigsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListApiConfigsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1299,8 +1304,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListApiConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListApiConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1310,7 +1315,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::GetApiConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1338,7 +1343,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1348,7 +1353,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .get_api_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApiConfigRequest::name].
@@ -1370,8 +1375,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApiConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApiConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1381,7 +1386,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::CreateApiConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1410,7 +1415,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1425,7 +1430,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .create_api_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_api_config`.
@@ -1442,7 +1447,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1509,8 +1514,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApiConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApiConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1520,7 +1525,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::UpdateApiConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1549,7 +1554,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1564,7 +1569,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .update_api_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_api_config`.
@@ -1581,7 +1586,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1650,8 +1655,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateApiConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateApiConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1661,7 +1666,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::DeleteApiConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1690,7 +1695,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1705,7 +1710,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .delete_api_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_api_config`.
@@ -1717,7 +1722,7 @@ pub mod api_gateway_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1754,8 +1759,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteApiConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteApiConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1765,8 +1770,8 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1802,7 +1807,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1812,15 +1817,15 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1829,17 +1834,17 @@ pub mod api_gateway_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1875,8 +1880,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1886,7 +1891,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1917,7 +1922,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1927,7 +1932,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1938,8 +1943,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1949,7 +1954,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1982,7 +1987,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1992,7 +1997,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2003,8 +2008,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2014,7 +2019,7 @@ pub mod api_gateway_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigateway_v1::builder::api_gateway_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apigateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2047,7 +2052,7 @@ pub mod api_gateway_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2057,7 +2062,7 @@ pub mod api_gateway_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2068,8 +2073,8 @@ pub mod api_gateway_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/apigateway/v1/src/client.rs b/src/generated/cloud/apigateway/v1/src/client.rs
index 771df7091a..1d34967c5d 100644
--- a/src/generated/cloud/apigateway/v1/src/client.rs
+++ b/src/generated/cloud/apigateway/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apigateway_v1::client::ApiGatewayService;
 /// let client = ApiGatewayService::builder().build().await?;
 /// // use `client` to make requests to the API Gateway API.
@@ -66,15 +66,13 @@ impl ApiGatewayService {
     /// Returns a builder for [ApiGatewayService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apigateway_v1::client::ApiGatewayService;
     /// let client = ApiGatewayService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_gateway_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::api_gateway_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::api_gateway_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl ApiGatewayService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiGatewayService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiGatewayService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl ApiGatewayService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiGatewayService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiGatewayService> {
         super::transport::ApiGatewayService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiGatewayService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiGatewayService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiGatewayService::new)
diff --git a/src/generated/cloud/apigateway/v1/src/lib.rs b/src/generated/cloud/apigateway/v1/src/lib.rs
index d7fb862294..2c9adf7fad 100644
--- a/src/generated/cloud/apigateway/v1/src/lib.rs
+++ b/src/generated/cloud/apigateway/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/apigateway/v1/src/model.rs b/src/generated/cloud/apigateway/v1/src/model.rs
index f0a52c1b64..9cef950aa0 100644
--- a/src/generated/cloud/apigateway/v1/src/model.rs
+++ b/src/generated/cloud/apigateway/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -1578,7 +1578,7 @@ impl wkt::message::Message for ListGatewaysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGatewaysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGatewaysResponse {
     type PageItem = crate::model::Gateway;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2018,7 +2018,7 @@ impl wkt::message::Message for ListApisResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListApisResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListApisResponse {
     type PageItem = crate::model::Api;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2458,7 +2458,7 @@ impl wkt::message::Message for ListApiConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListApiConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListApiConfigsResponse {
     type PageItem = crate::model::ApiConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/apigateway/v1/src/stub.rs b/src/generated/cloud/apigateway/v1/src/stub.rs
index 76f47a8c20..8c435e43e7 100644
--- a/src/generated/cloud/apigateway/v1/src/stub.rs
+++ b/src/generated/cloud/apigateway/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn list_gateways(
         &self,
         _req: crate::model::ListGatewaysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGatewaysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGatewaysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn get_gateway(
         &self,
         _req: crate::model::GetGatewayRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Gateway>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Gateway>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn create_gateway(
         &self,
         _req: crate::model::CreateGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn update_gateway(
         &self,
         _req: crate::model::UpdateGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn delete_gateway(
         &self,
         _req: crate::model::DeleteGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn list_apis(
         &self,
         _req: crate::model::ListApisRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListApisResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListApisResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn get_api(
         &self,
         _req: crate::model::GetApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Api>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Api>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -118,9 +117,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn create_api(
         &self,
         _req: crate::model::CreateApiRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -129,9 +128,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn update_api(
         &self,
         _req: crate::model::UpdateApiRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -140,9 +139,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn delete_api(
         &self,
         _req: crate::model::DeleteApiRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -151,9 +150,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn list_api_configs(
         &self,
         _req: crate::model::ListApiConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListApiConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListApiConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -162,10 +161,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn get_api_config(
         &self,
         _req: crate::model::GetApiConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApiConfig>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ApiConfig>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -173,9 +171,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn create_api_config(
         &self,
         _req: crate::model::CreateApiConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -184,9 +182,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn update_api_config(
         &self,
         _req: crate::model::UpdateApiConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -195,9 +193,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn delete_api_config(
         &self,
         _req: crate::model::DeleteApiConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -206,10 +204,10 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -219,9 +217,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -230,8 +228,8 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -239,8 +237,8 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -250,9 +248,9 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -261,8 +259,8 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/apigateway/v1/src/stub/dynamic.rs b/src/generated/cloud/apigateway/v1/src/stub/dynamic.rs
index f10f04523c..6f20f5e4e2 100644
--- a/src/generated/cloud/apigateway/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/apigateway/v1/src/stub/dynamic.rs
@@ -20,128 +20,126 @@ pub trait ApiGatewayService: std::fmt::Debug + Send + Sync {
     async fn list_gateways(
         &self,
         req: crate::model::ListGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGatewaysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGatewaysResponse>>;
 
     async fn get_gateway(
         &self,
         req: crate::model::GetGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Gateway>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Gateway>>;
 
     async fn create_gateway(
         &self,
         req: crate::model::CreateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_gateway(
         &self,
         req: crate::model::UpdateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_gateway(
         &self,
         req: crate::model::DeleteGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApisResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApisResponse>>;
 
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>>;
 
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_api_configs(
         &self,
         req: crate::model::ListApiConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApiConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApiConfigsResponse>>;
 
     async fn get_api_config(
         &self,
         req: crate::model::GetApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiConfig>>;
 
     async fn create_api_config(
         &self,
         req: crate::model::CreateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_api_config(
         &self,
         req: crate::model::UpdateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_api_config(
         &self,
         req: crate::model::DeleteApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ApiGatewayService] also implement [ApiGatewayService].
@@ -151,8 +149,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn list_gateways(
         &self,
         req: crate::model::ListGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGatewaysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGatewaysResponse>> {
         T::list_gateways(self, req, options).await
     }
 
@@ -160,8 +158,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn get_gateway(
         &self,
         req: crate::model::GetGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Gateway>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Gateway>> {
         T::get_gateway(self, req, options).await
     }
 
@@ -169,8 +167,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn create_gateway(
         &self,
         req: crate::model::CreateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_gateway(self, req, options).await
     }
 
@@ -178,8 +176,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn update_gateway(
         &self,
         req: crate::model::UpdateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_gateway(self, req, options).await
     }
 
@@ -187,8 +185,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn delete_gateway(
         &self,
         req: crate::model::DeleteGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_gateway(self, req, options).await
     }
 
@@ -196,8 +194,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApisResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApisResponse>> {
         T::list_apis(self, req, options).await
     }
 
@@ -205,8 +203,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>> {
         T::get_api(self, req, options).await
     }
 
@@ -214,8 +212,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_api(self, req, options).await
     }
 
@@ -223,8 +221,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_api(self, req, options).await
     }
 
@@ -232,8 +230,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_api(self, req, options).await
     }
 
@@ -241,8 +239,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn list_api_configs(
         &self,
         req: crate::model::ListApiConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApiConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApiConfigsResponse>> {
         T::list_api_configs(self, req, options).await
     }
 
@@ -250,8 +248,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn get_api_config(
         &self,
         req: crate::model::GetApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiConfig>> {
         T::get_api_config(self, req, options).await
     }
 
@@ -259,8 +257,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn create_api_config(
         &self,
         req: crate::model::CreateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_api_config(self, req, options).await
     }
 
@@ -268,8 +266,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn update_api_config(
         &self,
         req: crate::model::UpdateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_api_config(self, req, options).await
     }
 
@@ -277,8 +275,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn delete_api_config(
         &self,
         req: crate::model::DeleteApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_api_config(self, req, options).await
     }
 
@@ -286,10 +284,9 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -297,8 +294,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -306,8 +303,8 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -315,22 +312,22 @@ impl<T: super::ApiGatewayService> ApiGatewayService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/apigateway/v1/src/tracing.rs b/src/generated/cloud/apigateway/v1/src/tracing.rs
index 0ce5a06a6e..e27f474610 100644
--- a/src/generated/cloud/apigateway/v1/src/tracing.rs
+++ b/src/generated/cloud/apigateway/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_gateways(
         &self,
         req: crate::model::ListGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGatewaysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGatewaysResponse>> {
         self.inner.list_gateways(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_gateway(
         &self,
         req: crate::model::GetGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Gateway>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Gateway>> {
         self.inner.get_gateway(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_gateway(
         &self,
         req: crate::model::CreateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_gateway(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_gateway(
         &self,
         req: crate::model::UpdateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_gateway(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_gateway(
         &self,
         req: crate::model::DeleteGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_gateway(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApisResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApisResponse>> {
         self.inner.list_apis(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         self.inner.get_api(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_api(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_api(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_api(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_api_configs(
         &self,
         req: crate::model::ListApiConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApiConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApiConfigsResponse>> {
         self.inner.list_api_configs(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_api_config(
         &self,
         req: crate::model::GetApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiConfig>> {
         self.inner.get_api_config(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn create_api_config(
         &self,
         req: crate::model::CreateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_api_config(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn update_api_config(
         &self,
         req: crate::model::UpdateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_api_config(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn delete_api_config(
         &self,
         req: crate::model::DeleteApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_api_config(req, options).await
     }
 
@@ -176,9 +176,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -186,8 +185,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -195,8 +194,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -204,22 +203,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/apigateway/v1/src/transport.rs b/src/generated/cloud/apigateway/v1/src/transport.rs
index 048f545928..ba10f9c9cc 100644
--- a/src/generated/cloud/apigateway/v1/src/transport.rs
+++ b/src/generated/cloud/apigateway/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ApiGatewayService](super::stub::ApiGatewayService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ApiGatewayService {
 }
 
 impl ApiGatewayService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn list_gateways(
         &self,
         req: crate::model::ListGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGatewaysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGatewaysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn get_gateway(
         &self,
         req: crate::model::GetGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Gateway>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Gateway>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn create_gateway(
         &self,
         req: crate::model::CreateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn update_gateway(
         &self,
         req: crate::model::UpdateGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn delete_gateway(
         &self,
         req: crate::model::DeleteGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -378,13 +378,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApisResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApisResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +489,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,13 +506,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -550,9 +550,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -567,13 +567,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -632,9 +632,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -649,13 +649,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -696,9 +696,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -713,13 +713,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn list_api_configs(
         &self,
         req: crate::model::ListApiConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApiConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApiConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -764,9 +764,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -781,13 +781,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn get_api_config(
         &self,
         req: crate::model::GetApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -833,9 +833,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -850,13 +850,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn create_api_config(
         &self,
         req: crate::model::CreateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -898,9 +898,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -915,13 +915,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn update_api_config(
         &self,
         req: crate::model::UpdateApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -984,9 +984,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1001,13 +1001,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn delete_api_config(
         &self,
         req: crate::model::DeleteApiConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1052,9 +1052,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1069,14 +1069,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1118,9 +1117,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1135,13 +1134,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1182,9 +1181,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1199,13 +1198,13 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1246,9 +1245,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1257,24 +1256,25 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1315,9 +1315,9 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1326,25 +1326,26 @@ impl super::stub::ApiGatewayService for ApiGatewayService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/apigeeconnect/v1/Cargo.toml b/src/generated/cloud/apigeeconnect/v1/Cargo.toml
index 6c17fae6b9..c691b6564a 100644
--- a/src/generated/cloud/apigeeconnect/v1/Cargo.toml
+++ b/src/generated/cloud/apigeeconnect/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace      = true
 bytes.workspace            = true
-gax.workspace              = true
 gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
 google-cloud-rpc.workspace = true
 lazy_static.workspace      = true
 serde.workspace            = true
diff --git a/src/generated/cloud/apigeeconnect/v1/src/builder.rs b/src/generated/cloud/apigeeconnect/v1/src/builder.rs
index 7a0b71ba31..d2f986d44b 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/builder.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod connection_service {
     /// A builder for [ConnectionService][crate::client::ConnectionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apigeeconnect_v1::*;
     /// # use builder::connection_service::ClientBuilder;
     /// # use client::ConnectionService;
@@ -30,19 +30,18 @@ pub mod connection_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConnectionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConnectionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod connection_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConnectionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod connection_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_apigeeconnect_v1::builder::connection_service::ListConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apigeeconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,14 +117,16 @@ pub mod connection_service {
             (*self.0.stub)
                 .list_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -133,15 +134,17 @@ pub mod connection_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -167,8 +170,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/apigeeconnect/v1/src/client.rs b/src/generated/cloud/apigeeconnect/v1/src/client.rs
index 5a6ed1ac5b..a08d0fdecd 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/client.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apigeeconnect_v1::client::ConnectionService;
 /// let client = ConnectionService::builder().build().await?;
 /// // use `client` to make requests to the Apigee Connect API.
@@ -66,15 +66,13 @@ impl ConnectionService {
     /// Returns a builder for [ConnectionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apigeeconnect_v1::client::ConnectionService;
     /// let client = ConnectionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::connection_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::connection_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::connection_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl ConnectionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConnectionService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConnectionService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl ConnectionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConnectionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConnectionService> {
         super::transport::ConnectionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConnectionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConnectionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConnectionService::new)
diff --git a/src/generated/cloud/apigeeconnect/v1/src/lib.rs b/src/generated/cloud/apigeeconnect/v1/src/lib.rs
index b3fa642793..c4e7ab6b27 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/lib.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/lib.rs
@@ -51,8 +51,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -87,3 +87,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/apigeeconnect/v1/src/model.rs b/src/generated/cloud/apigeeconnect/v1/src/model.rs
index 722033eedd..9028ad0a09 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/model.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
 extern crate serde;
@@ -167,7 +167,7 @@ impl wkt::message::Message for ListConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectionsResponse {
     type PageItem = crate::model::Connection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/apigeeconnect/v1/src/stub.rs b/src/generated/cloud/apigeeconnect/v1/src/stub.rs
index ccfba65408..00c577e32e 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/stub.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn list_connections(
         &self,
         _req: crate::model::ListConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/apigeeconnect/v1/src/stub/dynamic.rs b/src/generated/cloud/apigeeconnect/v1/src/stub/dynamic.rs
index 4c5ebb50ef..5e863115b3 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/stub/dynamic.rs
@@ -20,8 +20,8 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>>;
 }
 
 /// All implementations of [super::ConnectionService] also implement [ConnectionService].
@@ -31,8 +31,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>> {
         T::list_connections(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/apigeeconnect/v1/src/tracing.rs b/src/generated/cloud/apigeeconnect/v1/src/tracing.rs
index 807eec9ff7..1faba146a5 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/tracing.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         self.inner.list_connections(req, options).await
     }
 }
diff --git a/src/generated/cloud/apigeeconnect/v1/src/transport.rs b/src/generated/cloud/apigeeconnect/v1/src/transport.rs
index 2a1a655d2e..ad7951aac3 100644
--- a/src/generated/cloud/apigeeconnect/v1/src/transport.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ConnectionService](super::stub::ConnectionService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ConnectionService {
 }
 
 impl ConnectionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/apihub/v1/Cargo.toml b/src/generated/cloud/apihub/v1/Cargo.toml
index fa9f40762a..4ed1848ace 100644
--- a/src/generated/cloud/apihub/v1/Cargo.toml
+++ b/src/generated/cloud/apihub/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/apihub/v1/src/builder.rs b/src/generated/cloud/apihub/v1/src/builder.rs
index 8e4168a1a1..e482ec2776 100644
--- a/src/generated/cloud/apihub/v1/src/builder.rs
+++ b/src/generated/cloud/apihub/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod api_hub {
     /// A builder for [ApiHub][crate::client::ApiHub].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::api_hub::ClientBuilder;
     /// # use client::ApiHub;
@@ -30,19 +30,18 @@ pub mod api_hub {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiHub;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiHub;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod api_hub {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiHub>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod api_hub {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100,7 +99,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110,7 +109,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateApiRequest::parent].
@@ -151,8 +150,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -162,7 +161,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -188,7 +187,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -198,7 +197,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApiRequest::name].
@@ -211,8 +210,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -222,8 +221,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListApis;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -252,7 +251,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -262,13 +261,13 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_apis(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListApisResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListApisResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -277,15 +276,15 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListApisResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListApisResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -317,8 +316,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListApis {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListApis {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -328,7 +327,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -354,7 +353,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -364,7 +363,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [api][crate::model::UpdateApiRequest::api].
@@ -413,8 +412,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -424,7 +423,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -450,7 +449,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -460,7 +459,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteApiRequest::name].
@@ -479,8 +478,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -490,7 +489,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -516,7 +515,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -526,7 +525,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateVersionRequest::parent].
@@ -567,8 +566,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -578,7 +577,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -604,7 +603,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -614,7 +613,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVersionRequest::name].
@@ -627,8 +626,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -638,8 +637,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -668,7 +667,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -678,13 +677,13 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVersionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVersionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -693,15 +692,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVersionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVersionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -733,8 +734,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -744,7 +745,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -770,7 +771,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -780,7 +781,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [version][crate::model::UpdateVersionRequest::version].
@@ -829,8 +830,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -840,7 +841,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -866,7 +867,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -876,7 +877,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteVersionRequest::name].
@@ -895,8 +896,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -906,7 +907,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -932,7 +933,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -942,7 +943,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSpecRequest::parent].
@@ -983,8 +984,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -994,7 +995,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1020,7 +1021,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1030,7 +1031,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSpecRequest::name].
@@ -1043,8 +1044,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1054,7 +1055,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetSpecContents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1080,7 +1081,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1090,7 +1091,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_spec_contents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSpecContentsRequest::name].
@@ -1103,8 +1104,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSpecContents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSpecContents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1114,8 +1115,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListSpecs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1144,7 +1145,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1154,13 +1155,13 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_specs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSpecsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSpecsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1169,15 +1170,15 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSpecsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListSpecsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1209,8 +1210,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSpecs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSpecs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1220,7 +1221,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1246,7 +1247,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1256,7 +1257,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [spec][crate::model::UpdateSpecRequest::spec].
@@ -1305,8 +1306,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1316,7 +1317,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1342,7 +1343,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1352,7 +1353,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSpecRequest::name].
@@ -1365,8 +1366,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1376,7 +1377,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateApiOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1405,7 +1406,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1415,7 +1416,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_api_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateApiOperationRequest::parent].
@@ -1456,8 +1457,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApiOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApiOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1467,7 +1468,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetApiOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1493,7 +1494,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1503,7 +1504,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_api_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApiOperationRequest::name].
@@ -1516,8 +1517,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApiOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApiOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1527,8 +1528,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListApiOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1560,7 +1561,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1570,14 +1571,16 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_api_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListApiOperationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListApiOperationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1585,15 +1588,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListApiOperationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListApiOperationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1625,8 +1630,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListApiOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListApiOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1636,7 +1641,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateApiOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1665,7 +1670,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1675,7 +1680,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_api_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [api_operation][crate::model::UpdateApiOperationRequest::api_operation].
@@ -1724,8 +1729,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateApiOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateApiOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1735,7 +1740,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteApiOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1764,7 +1769,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1774,7 +1779,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_api_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteApiOperationRequest::name].
@@ -1787,8 +1792,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteApiOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteApiOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1798,7 +1803,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetDefinition;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1824,7 +1829,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1834,7 +1839,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_definition(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDefinitionRequest::name].
@@ -1847,8 +1852,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDefinition {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDefinition {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1858,7 +1863,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1887,7 +1892,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1897,7 +1902,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDeploymentRequest::parent].
@@ -1938,8 +1943,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1949,7 +1954,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1975,7 +1980,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1985,7 +1990,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeploymentRequest::name].
@@ -1998,8 +2003,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2009,8 +2014,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2039,7 +2044,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2049,14 +2054,16 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2064,15 +2071,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2104,8 +2113,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2115,7 +2124,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2144,7 +2153,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2154,7 +2163,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [deployment][crate::model::UpdateDeploymentRequest::deployment].
@@ -2203,8 +2212,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2214,7 +2223,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2243,7 +2252,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2253,7 +2262,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDeploymentRequest::name].
@@ -2266,8 +2275,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2277,7 +2286,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2303,7 +2312,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2313,7 +2322,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAttributeRequest::parent].
@@ -2354,8 +2363,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2365,7 +2374,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2391,7 +2400,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2401,7 +2410,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAttributeRequest::name].
@@ -2414,8 +2423,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2425,7 +2434,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2451,7 +2460,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2461,7 +2470,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [attribute][crate::model::UpdateAttributeRequest::attribute].
@@ -2510,8 +2519,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2521,7 +2530,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2547,7 +2556,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2557,7 +2566,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAttributeRequest::name].
@@ -2570,8 +2579,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2581,8 +2590,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListAttributes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2611,7 +2620,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2621,14 +2630,16 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_attributes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAttributesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAttributesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2636,15 +2647,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAttributesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAttributesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2676,8 +2689,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAttributes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAttributes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2687,8 +2700,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::SearchResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2717,7 +2730,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2727,14 +2740,16 @@ pub mod api_hub {
             (*self.0.stub)
                 .search_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchResourcesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchResourcesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2742,15 +2757,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchResourcesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchResourcesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2790,8 +2807,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2801,7 +2818,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CreateExternalApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2830,7 +2847,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2840,7 +2857,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .create_external_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateExternalApiRequest::parent].
@@ -2881,8 +2898,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateExternalApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateExternalApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2892,7 +2909,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetExternalApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2918,7 +2935,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2928,7 +2945,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_external_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetExternalApiRequest::name].
@@ -2941,8 +2958,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetExternalApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetExternalApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2952,7 +2969,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::UpdateExternalApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2981,7 +2998,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2991,7 +3008,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .update_external_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [external_api][crate::model::UpdateExternalApiRequest::external_api].
@@ -3040,8 +3057,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateExternalApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateExternalApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3051,7 +3068,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteExternalApi;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3080,7 +3097,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3090,7 +3107,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_external_api(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteExternalApiRequest::name].
@@ -3103,8 +3120,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteExternalApi {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteExternalApi {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3114,8 +3131,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListExternalApis;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3147,7 +3164,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3157,14 +3174,16 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_external_apis(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListExternalApisResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListExternalApisResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3172,15 +3191,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListExternalApisResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListExternalApisResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3206,8 +3227,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListExternalApis {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListExternalApis {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3217,8 +3238,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3250,7 +3271,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3260,15 +3281,15 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3277,17 +3298,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3317,8 +3338,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3328,7 +3349,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3357,7 +3378,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3367,7 +3388,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3378,8 +3399,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3389,8 +3410,8 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3424,7 +3445,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3434,15 +3455,15 @@ pub mod api_hub {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3451,17 +3472,17 @@ pub mod api_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3497,8 +3518,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3508,7 +3529,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3537,7 +3558,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3547,7 +3568,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3558,8 +3579,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3569,7 +3590,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3600,7 +3621,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3610,7 +3631,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3621,8 +3642,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3632,7 +3653,7 @@ pub mod api_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3663,7 +3684,7 @@ pub mod api_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3673,7 +3694,7 @@ pub mod api_hub {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3684,8 +3705,8 @@ pub mod api_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3697,7 +3718,7 @@ pub mod api_hub_dependencies {
     /// A builder for [ApiHubDependencies][crate::client::ApiHubDependencies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::api_hub_dependencies::ClientBuilder;
     /// # use client::ApiHubDependencies;
@@ -3707,19 +3728,18 @@ pub mod api_hub_dependencies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiHubDependencies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiHubDependencies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3730,7 +3750,7 @@ pub mod api_hub_dependencies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiHubDependencies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3743,7 +3763,7 @@ pub mod api_hub_dependencies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3753,7 +3773,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::CreateDependency;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3784,7 +3804,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3794,7 +3814,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .create_dependency(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDependencyRequest::parent].
@@ -3835,8 +3855,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDependency {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDependency {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3846,7 +3866,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::GetDependency;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3874,7 +3894,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3884,7 +3904,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .get_dependency(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDependencyRequest::name].
@@ -3897,8 +3917,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDependency {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDependency {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3908,7 +3928,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::UpdateDependency;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3939,7 +3959,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3949,7 +3969,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .update_dependency(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [dependency][crate::model::UpdateDependencyRequest::dependency].
@@ -3998,8 +4018,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDependency {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDependency {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4009,7 +4029,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::DeleteDependency;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4040,7 +4060,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4050,7 +4070,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .delete_dependency(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDependencyRequest::name].
@@ -4063,8 +4083,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDependency {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDependency {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4074,8 +4094,8 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::ListDependencies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4109,7 +4129,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4119,14 +4139,16 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .list_dependencies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDependenciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDependenciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4134,15 +4156,17 @@ pub mod api_hub_dependencies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDependenciesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDependenciesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4174,8 +4198,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDependencies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDependencies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4185,8 +4209,8 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4220,7 +4244,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4230,15 +4254,15 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4247,17 +4271,17 @@ pub mod api_hub_dependencies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4287,8 +4311,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4298,7 +4322,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4329,7 +4353,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4339,7 +4363,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4350,8 +4374,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4361,8 +4385,8 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4398,7 +4422,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4408,15 +4432,15 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4425,17 +4449,17 @@ pub mod api_hub_dependencies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4471,8 +4495,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4482,7 +4506,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4513,7 +4537,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4523,7 +4547,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4534,8 +4558,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4545,7 +4569,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4578,7 +4602,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4588,7 +4612,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4599,8 +4623,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4610,7 +4634,7 @@ pub mod api_hub_dependencies {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_dependencies::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4643,7 +4667,7 @@ pub mod api_hub_dependencies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4653,7 +4677,7 @@ pub mod api_hub_dependencies {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4664,8 +4688,8 @@ pub mod api_hub_dependencies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4677,7 +4701,7 @@ pub mod api_hub_collect {
     /// A builder for [ApiHubCollect][crate::client::ApiHubCollect].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::api_hub_collect::ClientBuilder;
     /// # use client::ApiHubCollect;
@@ -4687,19 +4711,18 @@ pub mod api_hub_collect {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiHubCollect;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiHubCollect;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4710,7 +4733,7 @@ pub mod api_hub_collect {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiHubCollect>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4723,7 +4746,7 @@ pub mod api_hub_collect {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4733,7 +4756,7 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::CollectApiData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4762,7 +4785,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4777,7 +4800,7 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .collect_api_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `collect_api_data`.
@@ -4796,7 +4819,7 @@ pub mod api_hub_collect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4879,8 +4902,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CollectApiData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CollectApiData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4890,8 +4913,8 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4925,7 +4948,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4935,15 +4958,15 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4952,17 +4975,17 @@ pub mod api_hub_collect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4992,8 +5015,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5003,7 +5026,7 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5034,7 +5057,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5044,7 +5067,7 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5055,8 +5078,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5066,8 +5089,8 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5103,7 +5126,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5113,15 +5136,15 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5130,17 +5153,17 @@ pub mod api_hub_collect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5176,8 +5199,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5187,7 +5210,7 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5218,7 +5241,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5228,7 +5251,7 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5239,8 +5262,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5250,7 +5273,7 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5283,7 +5306,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5293,7 +5316,7 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5304,8 +5327,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5315,7 +5338,7 @@ pub mod api_hub_collect {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_collect::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5348,7 +5371,7 @@ pub mod api_hub_collect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5358,7 +5381,7 @@ pub mod api_hub_collect {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5369,8 +5392,8 @@ pub mod api_hub_collect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5382,7 +5405,7 @@ pub mod api_hub_curate {
     /// A builder for [ApiHubCurate][crate::client::ApiHubCurate].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::api_hub_curate::ClientBuilder;
     /// # use client::ApiHubCurate;
@@ -5392,19 +5415,18 @@ pub mod api_hub_curate {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiHubCurate;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiHubCurate;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5415,7 +5437,7 @@ pub mod api_hub_curate {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiHubCurate>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5428,7 +5450,7 @@ pub mod api_hub_curate {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5438,7 +5460,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::CreateCuration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5466,7 +5488,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5476,7 +5498,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .create_curation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCurationRequest::parent].
@@ -5517,8 +5539,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCuration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCuration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5528,7 +5550,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::GetCuration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5556,7 +5578,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5566,7 +5588,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .get_curation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCurationRequest::name].
@@ -5579,8 +5601,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCuration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCuration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5590,8 +5612,8 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::ListCurations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5622,7 +5644,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5632,13 +5654,13 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .list_curations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCurationsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListCurationsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5647,15 +5669,17 @@ pub mod api_hub_curate {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCurationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCurationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5687,8 +5711,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCurations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCurations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5698,7 +5722,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::UpdateCuration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5726,7 +5750,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5736,7 +5760,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .update_curation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [curation][crate::model::UpdateCurationRequest::curation].
@@ -5781,8 +5805,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCuration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCuration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5792,7 +5816,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::DeleteCuration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5820,7 +5844,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5830,7 +5854,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .delete_curation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteCurationRequest::name].
@@ -5843,8 +5867,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCuration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCuration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5854,8 +5878,8 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5889,7 +5913,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5899,15 +5923,15 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5916,17 +5940,17 @@ pub mod api_hub_curate {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5956,8 +5980,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5967,7 +5991,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5998,7 +6022,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6008,7 +6032,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -6019,8 +6043,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6030,8 +6054,8 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6067,7 +6091,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6077,15 +6101,15 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6094,17 +6118,17 @@ pub mod api_hub_curate {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6140,8 +6164,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6151,7 +6175,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6182,7 +6206,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6192,7 +6216,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -6203,8 +6227,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6214,7 +6238,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6247,7 +6271,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6257,7 +6281,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -6268,8 +6292,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6279,7 +6303,7 @@ pub mod api_hub_curate {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_curate::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6312,7 +6336,7 @@ pub mod api_hub_curate {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6322,7 +6346,7 @@ pub mod api_hub_curate {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -6333,8 +6357,8 @@ pub mod api_hub_curate {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6346,7 +6370,7 @@ pub mod api_hub_discovery {
     /// A builder for [ApiHubDiscovery][crate::client::ApiHubDiscovery].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::api_hub_discovery::ClientBuilder;
     /// # use client::ApiHubDiscovery;
@@ -6356,19 +6380,18 @@ pub mod api_hub_discovery {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiHubDiscovery;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiHubDiscovery;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -6379,7 +6402,7 @@ pub mod api_hub_discovery {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiHubDiscovery>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -6392,7 +6415,7 @@ pub mod api_hub_discovery {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -6402,8 +6425,8 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::ListDiscoveredApiObservations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6439,7 +6462,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6449,15 +6472,15 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .list_discovered_api_observations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDiscoveredApiObservationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6466,17 +6489,17 @@ pub mod api_hub_discovery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDiscoveredApiObservationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6502,8 +6525,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDiscoveredApiObservations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDiscoveredApiObservations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6513,7 +6536,7 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::GetDiscoveredApiObservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6546,7 +6569,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6556,7 +6579,7 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .get_discovered_api_observation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDiscoveredApiObservationRequest::name].
@@ -6569,8 +6592,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDiscoveredApiObservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDiscoveredApiObservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6580,8 +6603,8 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::ListDiscoveredApiOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6617,7 +6640,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6627,15 +6650,15 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .list_discovered_api_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDiscoveredApiOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6644,17 +6667,17 @@ pub mod api_hub_discovery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDiscoveredApiOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6680,8 +6703,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDiscoveredApiOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDiscoveredApiOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6691,7 +6714,7 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::GetDiscoveredApiOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6724,7 +6747,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6734,7 +6757,7 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .get_discovered_api_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDiscoveredApiOperationRequest::name].
@@ -6747,8 +6770,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDiscoveredApiOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDiscoveredApiOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6758,8 +6781,8 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6793,7 +6816,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6803,15 +6826,15 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6820,17 +6843,17 @@ pub mod api_hub_discovery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6860,8 +6883,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6871,7 +6894,7 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6902,7 +6925,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6912,7 +6935,7 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -6923,8 +6946,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6934,8 +6957,8 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6971,7 +6994,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6981,15 +7004,15 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6998,17 +7021,17 @@ pub mod api_hub_discovery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7044,8 +7067,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7055,7 +7078,7 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7086,7 +7109,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7096,7 +7119,7 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7107,8 +7130,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7118,7 +7141,7 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7151,7 +7174,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7161,7 +7184,7 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -7172,8 +7195,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7183,7 +7206,7 @@ pub mod api_hub_discovery {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_discovery::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7216,7 +7239,7 @@ pub mod api_hub_discovery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7226,7 +7249,7 @@ pub mod api_hub_discovery {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7237,8 +7260,8 @@ pub mod api_hub_discovery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7250,7 +7273,7 @@ pub mod host_project_registration_service {
     /// A builder for [HostProjectRegistrationService][crate::client::HostProjectRegistrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::host_project_registration_service::ClientBuilder;
     /// # use client::HostProjectRegistrationService;
@@ -7260,19 +7283,18 @@ pub mod host_project_registration_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::HostProjectRegistrationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = HostProjectRegistrationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7283,7 +7305,7 @@ pub mod host_project_registration_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::HostProjectRegistrationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7296,7 +7318,7 @@ pub mod host_project_registration_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7306,7 +7328,7 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::CreateHostProjectRegistration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7339,7 +7361,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7349,7 +7371,7 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .create_host_project_registration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateHostProjectRegistrationRequest::parent].
@@ -7398,8 +7420,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateHostProjectRegistration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateHostProjectRegistration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7409,7 +7431,7 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::GetHostProjectRegistration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7442,7 +7464,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7452,7 +7474,7 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .get_host_project_registration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetHostProjectRegistrationRequest::name].
@@ -7465,8 +7487,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHostProjectRegistration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHostProjectRegistration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7476,8 +7498,8 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::ListHostProjectRegistrations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7513,7 +7535,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7523,15 +7545,15 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .list_host_project_registrations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListHostProjectRegistrationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7540,17 +7562,17 @@ pub mod host_project_registration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListHostProjectRegistrationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7588,8 +7610,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListHostProjectRegistrations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListHostProjectRegistrations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7599,8 +7621,8 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7634,7 +7656,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7644,15 +7666,15 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7661,17 +7683,17 @@ pub mod host_project_registration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7701,8 +7723,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7712,7 +7734,7 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7743,7 +7765,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7753,7 +7775,7 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -7764,8 +7786,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7775,8 +7797,8 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7812,7 +7834,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7822,15 +7844,15 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7839,17 +7861,17 @@ pub mod host_project_registration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7885,8 +7907,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7896,7 +7918,7 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7927,7 +7949,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7937,7 +7959,7 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7948,8 +7970,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7959,7 +7981,7 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7992,7 +8014,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8002,7 +8024,7 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -8013,8 +8035,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8024,7 +8046,7 @@ pub mod host_project_registration_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::host_project_registration_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8057,7 +8079,7 @@ pub mod host_project_registration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8067,7 +8089,7 @@ pub mod host_project_registration_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8078,8 +8100,8 @@ pub mod host_project_registration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8091,7 +8113,7 @@ pub mod linting_service {
     /// A builder for [LintingService][crate::client::LintingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::linting_service::ClientBuilder;
     /// # use client::LintingService;
@@ -8101,19 +8123,18 @@ pub mod linting_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::LintingService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = LintingService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8124,7 +8145,7 @@ pub mod linting_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::LintingService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8137,7 +8158,7 @@ pub mod linting_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8147,7 +8168,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::GetStyleGuide;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8175,7 +8196,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8185,7 +8206,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .get_style_guide(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetStyleGuideRequest::name].
@@ -8198,8 +8219,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStyleGuide {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStyleGuide {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8209,7 +8230,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::UpdateStyleGuide;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8240,7 +8261,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8250,7 +8271,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .update_style_guide(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [style_guide][crate::model::UpdateStyleGuideRequest::style_guide].
@@ -8295,8 +8316,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateStyleGuide {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateStyleGuide {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8306,7 +8327,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::GetStyleGuideContents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8337,7 +8358,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8347,7 +8368,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .get_style_guide_contents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetStyleGuideContentsRequest::name].
@@ -8360,8 +8381,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStyleGuideContents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStyleGuideContents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8371,7 +8392,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::LintSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8399,7 +8420,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8409,7 +8430,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .lint_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::LintSpecRequest::name].
@@ -8422,8 +8443,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LintSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LintSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8433,8 +8454,8 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8468,7 +8489,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8478,15 +8499,15 @@ pub mod linting_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8495,17 +8516,17 @@ pub mod linting_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8535,8 +8556,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8546,7 +8567,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8577,7 +8598,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8587,7 +8608,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -8598,8 +8619,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8609,8 +8630,8 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8646,7 +8667,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8656,15 +8677,15 @@ pub mod linting_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8673,17 +8694,17 @@ pub mod linting_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8719,8 +8740,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8730,7 +8751,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8761,7 +8782,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8771,7 +8792,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8782,8 +8803,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8793,7 +8814,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8826,7 +8847,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8836,7 +8857,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -8847,8 +8868,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8858,7 +8879,7 @@ pub mod linting_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::linting_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8891,7 +8912,7 @@ pub mod linting_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8901,7 +8922,7 @@ pub mod linting_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8912,8 +8933,8 @@ pub mod linting_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8925,7 +8946,7 @@ pub mod api_hub_plugin {
     /// A builder for [ApiHubPlugin][crate::client::ApiHubPlugin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::api_hub_plugin::ClientBuilder;
     /// # use client::ApiHubPlugin;
@@ -8935,19 +8956,18 @@ pub mod api_hub_plugin {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ApiHubPlugin;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ApiHubPlugin;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8958,7 +8978,7 @@ pub mod api_hub_plugin {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ApiHubPlugin>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8971,7 +8991,7 @@ pub mod api_hub_plugin {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8981,7 +9001,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::GetPlugin;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9009,7 +9029,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9019,7 +9039,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .get_plugin(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPluginRequest::name].
@@ -9032,8 +9052,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPlugin {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPlugin {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9043,7 +9063,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::EnablePlugin;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9071,7 +9091,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9081,7 +9101,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .enable_plugin(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::EnablePluginRequest::name].
@@ -9094,8 +9114,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnablePlugin {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnablePlugin {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9105,7 +9125,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::DisablePlugin;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9133,7 +9153,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9143,7 +9163,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .disable_plugin(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DisablePluginRequest::name].
@@ -9156,8 +9176,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisablePlugin {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisablePlugin {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9167,7 +9187,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::CreatePlugin;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9195,7 +9215,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9205,7 +9225,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .create_plugin(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePluginRequest::parent].
@@ -9246,8 +9266,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePlugin {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePlugin {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9257,8 +9277,8 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::ListPlugins;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9289,7 +9309,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9299,13 +9319,13 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .list_plugins(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPluginsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListPluginsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9314,15 +9334,17 @@ pub mod api_hub_plugin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPluginsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPluginsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9354,8 +9376,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPlugins {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPlugins {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9365,7 +9387,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::DeletePlugin;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9394,7 +9416,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9409,7 +9431,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .delete_plugin(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_plugin`.
@@ -9421,7 +9443,7 @@ pub mod api_hub_plugin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9458,8 +9480,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePlugin {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePlugin {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9469,7 +9491,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::CreatePluginInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9501,7 +9523,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9516,7 +9538,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .create_plugin_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_plugin_instance`.
@@ -9533,7 +9555,7 @@ pub mod api_hub_plugin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9598,8 +9620,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePluginInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePluginInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9609,7 +9631,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::ExecutePluginInstanceAction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9643,7 +9665,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9658,7 +9680,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .execute_plugin_instance_action(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `execute_plugin_instance_action`.
@@ -9677,7 +9699,7 @@ pub mod api_hub_plugin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9736,8 +9758,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExecutePluginInstanceAction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExecutePluginInstanceAction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9747,7 +9769,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::GetPluginInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9778,7 +9800,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9788,7 +9810,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .get_plugin_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPluginInstanceRequest::name].
@@ -9801,8 +9823,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPluginInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPluginInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9812,8 +9834,8 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::ListPluginInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9847,7 +9869,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9857,14 +9879,16 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .list_plugin_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPluginInstancesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPluginInstancesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -9872,17 +9896,17 @@ pub mod api_hub_plugin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPluginInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9914,8 +9938,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPluginInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPluginInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9925,7 +9949,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::EnablePluginInstanceAction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9959,7 +9983,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9974,7 +9998,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .enable_plugin_instance_action(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_plugin_instance_action`.
@@ -9993,7 +10017,7 @@ pub mod api_hub_plugin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10038,8 +10062,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnablePluginInstanceAction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnablePluginInstanceAction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10049,7 +10073,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::DisablePluginInstanceAction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10083,7 +10107,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10098,7 +10122,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .disable_plugin_instance_action(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_plugin_instance_action`.
@@ -10117,7 +10141,7 @@ pub mod api_hub_plugin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10162,8 +10186,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisablePluginInstanceAction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisablePluginInstanceAction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10173,7 +10197,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::UpdatePluginInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10204,7 +10228,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10214,7 +10238,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .update_plugin_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [plugin_instance][crate::model::UpdatePluginInstanceRequest::plugin_instance].
@@ -10259,8 +10283,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePluginInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePluginInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10270,7 +10294,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::DeletePluginInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10302,7 +10326,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10317,7 +10341,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .delete_plugin_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_plugin_instance`.
@@ -10329,7 +10353,7 @@ pub mod api_hub_plugin {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10366,8 +10390,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePluginInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePluginInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10377,8 +10401,8 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10412,7 +10436,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10422,15 +10446,15 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10439,17 +10463,17 @@ pub mod api_hub_plugin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10479,8 +10503,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10490,7 +10514,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10521,7 +10545,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10531,7 +10555,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -10542,8 +10566,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10553,8 +10577,8 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10590,7 +10614,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10600,15 +10624,15 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10617,17 +10641,17 @@ pub mod api_hub_plugin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10663,8 +10687,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10674,7 +10698,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10705,7 +10729,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10715,7 +10739,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -10726,8 +10750,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10737,7 +10761,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10770,7 +10794,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10780,7 +10804,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -10791,8 +10815,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10802,7 +10826,7 @@ pub mod api_hub_plugin {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::api_hub_plugin::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10835,7 +10859,7 @@ pub mod api_hub_plugin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10845,7 +10869,7 @@ pub mod api_hub_plugin {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -10856,8 +10880,8 @@ pub mod api_hub_plugin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10869,7 +10893,7 @@ pub mod provisioning {
     /// A builder for [Provisioning][crate::client::Provisioning].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::provisioning::ClientBuilder;
     /// # use client::Provisioning;
@@ -10879,19 +10903,18 @@ pub mod provisioning {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Provisioning;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Provisioning;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -10902,7 +10925,7 @@ pub mod provisioning {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Provisioning>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -10915,7 +10938,7 @@ pub mod provisioning {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -10925,7 +10948,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::CreateApiHubInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10957,7 +10980,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10972,7 +10995,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .create_api_hub_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_api_hub_instance`.
@@ -10989,7 +11012,7 @@ pub mod provisioning {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11054,8 +11077,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApiHubInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApiHubInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11065,7 +11088,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::DeleteApiHubInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11097,7 +11120,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11112,7 +11135,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .delete_api_hub_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_api_hub_instance`.
@@ -11124,7 +11147,7 @@ pub mod provisioning {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11161,8 +11184,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteApiHubInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteApiHubInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11172,7 +11195,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::GetApiHubInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11203,7 +11226,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11213,7 +11236,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .get_api_hub_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApiHubInstanceRequest::name].
@@ -11226,8 +11249,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApiHubInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApiHubInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11237,7 +11260,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::LookupApiHubInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11268,7 +11291,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11278,7 +11301,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .lookup_api_hub_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::LookupApiHubInstanceRequest::parent].
@@ -11291,8 +11314,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupApiHubInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupApiHubInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11302,8 +11325,8 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11337,7 +11360,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11347,15 +11370,15 @@ pub mod provisioning {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11364,17 +11387,17 @@ pub mod provisioning {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11404,8 +11427,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11415,7 +11438,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11446,7 +11469,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11456,7 +11479,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -11467,8 +11490,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11478,8 +11501,8 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11515,7 +11538,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11525,15 +11548,15 @@ pub mod provisioning {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11542,17 +11565,17 @@ pub mod provisioning {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11588,8 +11611,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11599,7 +11622,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11630,7 +11653,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11640,7 +11663,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -11651,8 +11674,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11662,7 +11685,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11695,7 +11718,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11705,7 +11728,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -11716,8 +11739,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11727,7 +11750,7 @@ pub mod provisioning {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::provisioning::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11760,7 +11783,7 @@ pub mod provisioning {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11770,7 +11793,7 @@ pub mod provisioning {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -11781,8 +11804,8 @@ pub mod provisioning {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11794,7 +11817,7 @@ pub mod runtime_project_attachment_service {
     /// A builder for [RuntimeProjectAttachmentService][crate::client::RuntimeProjectAttachmentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::*;
     /// # use builder::runtime_project_attachment_service::ClientBuilder;
     /// # use client::RuntimeProjectAttachmentService;
@@ -11804,19 +11827,18 @@ pub mod runtime_project_attachment_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RuntimeProjectAttachmentService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RuntimeProjectAttachmentService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11827,7 +11849,7 @@ pub mod runtime_project_attachment_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RuntimeProjectAttachmentService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11840,7 +11862,7 @@ pub mod runtime_project_attachment_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11850,7 +11872,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::CreateRuntimeProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11883,7 +11905,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11893,7 +11915,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .create_runtime_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateRuntimeProjectAttachmentRequest::parent].
@@ -11942,8 +11964,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRuntimeProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRuntimeProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11953,7 +11975,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::GetRuntimeProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11986,7 +12008,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11996,7 +12018,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .get_runtime_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRuntimeProjectAttachmentRequest::name].
@@ -12009,8 +12031,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRuntimeProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRuntimeProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12020,8 +12042,8 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::ListRuntimeProjectAttachments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12057,7 +12079,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12067,15 +12089,15 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .list_runtime_project_attachments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListRuntimeProjectAttachmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12084,17 +12106,17 @@ pub mod runtime_project_attachment_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRuntimeProjectAttachmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12132,8 +12154,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuntimeProjectAttachments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuntimeProjectAttachments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12143,7 +12165,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::DeleteRuntimeProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12176,7 +12198,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12186,7 +12208,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .delete_runtime_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteRuntimeProjectAttachmentRequest::name].
@@ -12199,8 +12221,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRuntimeProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRuntimeProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12210,7 +12232,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::LookupRuntimeProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12243,7 +12265,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12253,7 +12275,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .lookup_runtime_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::LookupRuntimeProjectAttachmentRequest::name].
@@ -12266,8 +12288,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupRuntimeProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupRuntimeProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12277,8 +12299,8 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12312,7 +12334,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12322,15 +12344,15 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12339,17 +12361,17 @@ pub mod runtime_project_attachment_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12379,8 +12401,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12390,7 +12412,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12421,7 +12443,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12431,7 +12453,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -12442,8 +12464,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12453,8 +12475,8 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12490,7 +12512,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12500,15 +12522,15 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12517,17 +12539,17 @@ pub mod runtime_project_attachment_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12563,8 +12585,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12574,7 +12596,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12605,7 +12627,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12615,7 +12637,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -12626,8 +12648,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12637,7 +12659,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12670,7 +12692,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12680,7 +12702,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -12691,8 +12713,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12702,7 +12724,7 @@ pub mod runtime_project_attachment_service {
     /// # Example
     /// ```
     /// # use google_cloud_apihub_v1::builder::runtime_project_attachment_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apihub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12735,7 +12757,7 @@ pub mod runtime_project_attachment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12745,7 +12767,7 @@ pub mod runtime_project_attachment_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -12756,8 +12778,8 @@ pub mod runtime_project_attachment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/apihub/v1/src/client.rs b/src/generated/cloud/apihub/v1/src/client.rs
index b49280cfbf..4f1c475d1b 100644
--- a/src/generated/cloud/apihub/v1/src/client.rs
+++ b/src/generated/cloud/apihub/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::ApiHub;
 /// let client = ApiHub::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -66,13 +66,13 @@ impl ApiHub {
     /// Returns a builder for [ApiHub].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::ApiHub;
     /// let client = ApiHub::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_hub::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::api_hub::client::Factory)
+        crate::new_client_builder(super::builder::api_hub::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl ApiHub {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiHub>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiHub>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl ApiHub {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHub> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHub> {
         super::transport::ApiHub::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHub> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHub> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiHub::new)
@@ -598,7 +598,7 @@ impl ApiHub {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::ApiHubDependencies;
 /// let client = ApiHubDependencies::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -647,15 +647,13 @@ impl ApiHubDependencies {
     /// Returns a builder for [ApiHubDependencies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::ApiHubDependencies;
     /// let client = ApiHubDependencies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_hub_dependencies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::api_hub_dependencies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::api_hub_dependencies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -673,14 +671,14 @@ impl ApiHubDependencies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiHubDependencies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiHubDependencies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -690,13 +688,13 @@ impl ApiHubDependencies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubDependencies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubDependencies> {
         super::transport::ApiHubDependencies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubDependencies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubDependencies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiHubDependencies::new)
@@ -781,7 +779,7 @@ impl ApiHubDependencies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::ApiHubCollect;
 /// let client = ApiHubCollect::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -829,13 +827,13 @@ impl ApiHubCollect {
     /// Returns a builder for [ApiHubCollect].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::ApiHubCollect;
     /// let client = ApiHubCollect::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_hub_collect::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::api_hub_collect::client::Factory)
+        crate::new_client_builder(super::builder::api_hub_collect::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -853,14 +851,14 @@ impl ApiHubCollect {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiHubCollect>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiHubCollect>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -869,13 +867,13 @@ impl ApiHubCollect {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubCollect> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubCollect> {
         super::transport::ApiHubCollect::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubCollect> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubCollect> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiHubCollect::new)
@@ -939,7 +937,7 @@ impl ApiHubCollect {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::ApiHubCurate;
 /// let client = ApiHubCurate::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -986,13 +984,13 @@ impl ApiHubCurate {
     /// Returns a builder for [ApiHubCurate].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::ApiHubCurate;
     /// let client = ApiHubCurate::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_hub_curate::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::api_hub_curate::client::Factory)
+        crate::new_client_builder(super::builder::api_hub_curate::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1010,14 +1008,14 @@ impl ApiHubCurate {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiHubCurate>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiHubCurate>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1026,13 +1024,13 @@ impl ApiHubCurate {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubCurate> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubCurate> {
         super::transport::ApiHubCurate::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubCurate> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubCurate> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiHubCurate::new)
@@ -1121,7 +1119,7 @@ impl ApiHubCurate {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::ApiHubDiscovery;
 /// let client = ApiHubDiscovery::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -1168,15 +1166,13 @@ impl ApiHubDiscovery {
     /// Returns a builder for [ApiHubDiscovery].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::ApiHubDiscovery;
     /// let client = ApiHubDiscovery::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_hub_discovery::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::api_hub_discovery::client::Factory,
-        )
+        crate::new_client_builder(super::builder::api_hub_discovery::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1194,15 +1190,14 @@ impl ApiHubDiscovery {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiHubDiscovery>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiHubDiscovery>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1211,13 +1206,13 @@ impl ApiHubDiscovery {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubDiscovery> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubDiscovery> {
         super::transport::ApiHubDiscovery::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubDiscovery> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubDiscovery> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiHubDiscovery::new)
@@ -1297,7 +1292,7 @@ impl ApiHubDiscovery {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::HostProjectRegistrationService;
 /// let client = HostProjectRegistrationService::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -1343,13 +1338,13 @@ impl HostProjectRegistrationService {
     /// Returns a builder for [HostProjectRegistrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::HostProjectRegistrationService;
     /// let client = HostProjectRegistrationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::host_project_registration_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::host_project_registration_service::client::Factory,
         )
     }
@@ -1369,14 +1364,14 @@ impl HostProjectRegistrationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::HostProjectRegistrationService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1387,13 +1382,13 @@ impl HostProjectRegistrationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HostProjectRegistrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HostProjectRegistrationService> {
         super::transport::HostProjectRegistrationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HostProjectRegistrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HostProjectRegistrationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::HostProjectRegistrationService::new)
@@ -1481,7 +1476,7 @@ impl HostProjectRegistrationService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::LintingService;
 /// let client = LintingService::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -1527,13 +1522,13 @@ impl LintingService {
     /// Returns a builder for [LintingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::LintingService;
     /// let client = LintingService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::linting_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::linting_service::client::Factory)
+        crate::new_client_builder(super::builder::linting_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1551,14 +1546,14 @@ impl LintingService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::LintingService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::LintingService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1567,13 +1562,13 @@ impl LintingService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LintingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LintingService> {
         super::transport::LintingService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LintingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LintingService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::LintingService::new)
@@ -1646,7 +1641,7 @@ impl LintingService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::ApiHubPlugin;
 /// let client = ApiHubPlugin::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -1692,13 +1687,13 @@ impl ApiHubPlugin {
     /// Returns a builder for [ApiHubPlugin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::ApiHubPlugin;
     /// let client = ApiHubPlugin::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::api_hub_plugin::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::api_hub_plugin::client::Factory)
+        crate::new_client_builder(super::builder::api_hub_plugin::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1716,14 +1711,14 @@ impl ApiHubPlugin {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ApiHubPlugin>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ApiHubPlugin>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1732,13 +1727,13 @@ impl ApiHubPlugin {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubPlugin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubPlugin> {
         super::transport::ApiHubPlugin::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ApiHubPlugin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ApiHubPlugin> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ApiHubPlugin::new)
@@ -1951,7 +1946,7 @@ impl ApiHubPlugin {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::Provisioning;
 /// let client = Provisioning::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -1997,13 +1992,13 @@ impl Provisioning {
     /// Returns a builder for [Provisioning].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::Provisioning;
     /// let client = Provisioning::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::provisioning::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::provisioning::client::Factory)
+        crate::new_client_builder(super::builder::provisioning::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2021,14 +2016,14 @@ impl Provisioning {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Provisioning>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Provisioning>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2037,13 +2032,13 @@ impl Provisioning {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Provisioning> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Provisioning> {
         super::transport::Provisioning::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Provisioning> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Provisioning> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Provisioning::new)
@@ -2133,7 +2128,7 @@ impl Provisioning {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apihub_v1::client::RuntimeProjectAttachmentService;
 /// let client = RuntimeProjectAttachmentService::builder().build().await?;
 /// // use `client` to make requests to the API hub API.
@@ -2179,13 +2174,13 @@ impl RuntimeProjectAttachmentService {
     /// Returns a builder for [RuntimeProjectAttachmentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apihub_v1::client::RuntimeProjectAttachmentService;
     /// let client = RuntimeProjectAttachmentService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::runtime_project_attachment_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::runtime_project_attachment_service::client::Factory,
         )
     }
@@ -2205,14 +2200,14 @@ impl RuntimeProjectAttachmentService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RuntimeProjectAttachmentService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -2223,13 +2218,13 @@ impl RuntimeProjectAttachmentService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RuntimeProjectAttachmentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RuntimeProjectAttachmentService> {
         super::transport::RuntimeProjectAttachmentService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RuntimeProjectAttachmentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RuntimeProjectAttachmentService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RuntimeProjectAttachmentService::new)
diff --git a/src/generated/cloud/apihub/v1/src/lib.rs b/src/generated/cloud/apihub/v1/src/lib.rs
index b0edb3c249..53dd902573 100644
--- a/src/generated/cloud/apihub/v1/src/lib.rs
+++ b/src/generated/cloud/apihub/v1/src/lib.rs
@@ -53,8 +53,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -89,3 +89,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/apihub/v1/src/model.rs b/src/generated/cloud/apihub/v1/src/model.rs
index 3c2ac0cdcb..5682eacb45 100644
--- a/src/generated/cloud/apihub/v1/src/model.rs
+++ b/src/generated/cloud/apihub/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -584,7 +584,7 @@ impl wkt::message::Message for ListApisResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListApisResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListApisResponse {
     type PageItem = crate::model::Api;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1134,7 +1134,7 @@ impl wkt::message::Message for ListVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVersionsResponse {
     type PageItem = crate::model::Version;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1657,7 +1657,7 @@ impl wkt::message::Message for ListSpecsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSpecsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSpecsResponse {
     type PageItem = crate::model::Spec;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2217,7 +2217,7 @@ impl wkt::message::Message for ListApiOperationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListApiOperationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListApiOperationsResponse {
     type PageItem = crate::model::ApiOperation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2798,7 +2798,7 @@ impl wkt::message::Message for ListDeploymentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
     type PageItem = crate::model::Deployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3281,7 +3281,7 @@ impl wkt::message::Message for ListAttributesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAttributesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAttributesResponse {
     type PageItem = crate::model::Attribute;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3859,7 +3859,7 @@ impl wkt::message::Message for SearchResourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchResourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchResourcesResponse {
     type PageItem = crate::model::SearchResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4332,7 +4332,7 @@ impl wkt::message::Message for ListDependenciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDependenciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDependenciesResponse {
     type PageItem = crate::model::Dependency;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4759,7 +4759,7 @@ impl wkt::message::Message for ListExternalApisResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListExternalApisResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListExternalApisResponse {
     type PageItem = crate::model::ExternalApi;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17561,7 +17561,7 @@ impl wkt::message::Message for ListCurationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCurationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCurationsResponse {
     type PageItem = crate::model::Curation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -18463,7 +18463,9 @@ impl wkt::message::Message for ListDiscoveredApiObservationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDiscoveredApiObservationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListDiscoveredApiObservationsResponse
+{
     type PageItem = crate::model::DiscoveredApiObservation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -18611,7 +18613,9 @@ impl wkt::message::Message for ListDiscoveredApiOperationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDiscoveredApiOperationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListDiscoveredApiOperationsResponse
+{
     type PageItem = crate::model::DiscoveredApiOperation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -19019,7 +19023,9 @@ impl wkt::message::Message for ListHostProjectRegistrationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListHostProjectRegistrationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListHostProjectRegistrationsResponse
+{
     type PageItem = crate::model::HostProjectRegistration;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -22669,7 +22675,7 @@ impl wkt::message::Message for ListPluginsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPluginsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPluginsResponse {
     type PageItem = crate::model::Plugin;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23145,7 +23151,7 @@ impl wkt::message::Message for ListPluginInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPluginInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPluginInstancesResponse {
     type PageItem = crate::model::PluginInstance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -24051,7 +24057,9 @@ impl wkt::message::Message for ListRuntimeProjectAttachmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRuntimeProjectAttachmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListRuntimeProjectAttachmentsResponse
+{
     type PageItem = crate::model::RuntimeProjectAttachment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/apihub/v1/src/stub.rs b/src/generated/cloud/apihub/v1/src/stub.rs
index 6c33dd2e88..05fdb2102a 100644
--- a/src/generated/cloud/apihub/v1/src/stub.rs
+++ b/src/generated/cloud/apihub/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_api(
         &self,
         _req: crate::model::CreateApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Api>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Api>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -52,9 +52,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_api(
         &self,
         _req: crate::model::GetApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Api>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Api>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -62,9 +62,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_apis(
         &self,
         _req: crate::model::ListApisRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListApisResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListApisResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -73,9 +73,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_api(
         &self,
         _req: crate::model::UpdateApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Api>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Api>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -83,8 +83,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_api(
         &self,
         _req: crate::model::DeleteApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -92,10 +92,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_version(
         &self,
         _req: crate::model::CreateVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -103,10 +102,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_version(
         &self,
         _req: crate::model::GetVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -114,9 +112,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_versions(
         &self,
         _req: crate::model::ListVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -125,10 +123,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_version(
         &self,
         _req: crate::model::UpdateVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -136,8 +133,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_version(
         &self,
         _req: crate::model::DeleteVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -145,10 +142,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_spec(
         &self,
         _req: crate::model::CreateSpecRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Spec>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Spec>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -156,10 +152,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_spec(
         &self,
         _req: crate::model::GetSpecRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Spec>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Spec>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -167,9 +162,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_spec_contents(
         &self,
         _req: crate::model::GetSpecContentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SpecContents>>,
+        Output = crate::Result<crate::Response<crate::model::SpecContents>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +173,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_specs(
         &self,
         _req: crate::model::ListSpecsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSpecsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSpecsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,10 +184,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_spec(
         &self,
         _req: crate::model::UpdateSpecRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Spec>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Spec>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -200,8 +194,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_spec(
         &self,
         _req: crate::model::DeleteSpecRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -209,9 +203,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_api_operation(
         &self,
         _req: crate::model::CreateApiOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApiOperation>>,
+        Output = crate::Result<crate::Response<crate::model::ApiOperation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +214,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_api_operation(
         &self,
         _req: crate::model::GetApiOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApiOperation>>,
+        Output = crate::Result<crate::Response<crate::model::ApiOperation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +225,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_api_operations(
         &self,
         _req: crate::model::ListApiOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListApiOperationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListApiOperationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +236,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_api_operation(
         &self,
         _req: crate::model::UpdateApiOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApiOperation>>,
+        Output = crate::Result<crate::Response<crate::model::ApiOperation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,8 +247,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_api_operation(
         &self,
         _req: crate::model::DeleteApiOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -262,10 +256,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_definition(
         &self,
         _req: crate::model::GetDefinitionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Definition>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Definition>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -273,10 +266,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_deployment(
         &self,
         _req: crate::model::CreateDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -284,10 +276,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_deployment(
         &self,
         _req: crate::model::GetDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -295,9 +286,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_deployments(
         &self,
         _req: crate::model::ListDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -306,10 +297,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_deployment(
         &self,
         _req: crate::model::UpdateDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -317,8 +307,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_deployment(
         &self,
         _req: crate::model::DeleteDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -326,10 +316,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_attribute(
         &self,
         _req: crate::model::CreateAttributeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Attribute>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Attribute>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -337,10 +326,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_attribute(
         &self,
         _req: crate::model::GetAttributeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Attribute>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Attribute>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -348,10 +336,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_attribute(
         &self,
         _req: crate::model::UpdateAttributeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Attribute>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Attribute>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -359,8 +346,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_attribute(
         &self,
         _req: crate::model::DeleteAttributeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -368,9 +355,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_attributes(
         &self,
         _req: crate::model::ListAttributesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAttributesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAttributesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -379,9 +366,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn search_resources(
         &self,
         _req: crate::model::SearchResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchResourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -390,10 +377,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn create_external_api(
         &self,
         _req: crate::model::CreateExternalApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExternalApi>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ExternalApi>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -401,10 +387,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_external_api(
         &self,
         _req: crate::model::GetExternalApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExternalApi>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ExternalApi>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -412,10 +397,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn update_external_api(
         &self,
         _req: crate::model::UpdateExternalApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExternalApi>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ExternalApi>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -423,8 +407,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_external_api(
         &self,
         _req: crate::model::DeleteExternalApiRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -432,9 +416,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_external_apis(
         &self,
         _req: crate::model::ListExternalApisRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListExternalApisResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListExternalApisResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -443,10 +427,10 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -456,9 +440,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -467,10 +451,10 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -480,9 +464,9 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -491,8 +475,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -500,8 +484,8 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -522,10 +506,9 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn create_dependency(
         &self,
         _req: crate::model::CreateDependencyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dependency>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dependency>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -533,10 +516,9 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn get_dependency(
         &self,
         _req: crate::model::GetDependencyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dependency>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dependency>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -544,10 +526,9 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn update_dependency(
         &self,
         _req: crate::model::UpdateDependencyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dependency>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dependency>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -555,8 +536,8 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn delete_dependency(
         &self,
         _req: crate::model::DeleteDependencyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -564,9 +545,9 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn list_dependencies(
         &self,
         _req: crate::model::ListDependenciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDependenciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDependenciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -575,10 +556,10 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -588,9 +569,9 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -599,10 +580,10 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -612,9 +593,9 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -623,8 +604,8 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -632,8 +613,8 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -654,9 +635,9 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn collect_api_data(
         &self,
         _req: crate::model::CollectApiDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -665,10 +646,10 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -678,9 +659,9 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -689,10 +670,10 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -702,9 +683,9 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -713,8 +694,8 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -722,8 +703,8 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -733,9 +714,9 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -744,9 +725,9 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -766,10 +747,9 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn create_curation(
         &self,
         _req: crate::model::CreateCurationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Curation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Curation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -777,10 +757,9 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn get_curation(
         &self,
         _req: crate::model::GetCurationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Curation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Curation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -788,9 +767,9 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn list_curations(
         &self,
         _req: crate::model::ListCurationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCurationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCurationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -799,10 +778,9 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn update_curation(
         &self,
         _req: crate::model::UpdateCurationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Curation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Curation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -810,8 +788,8 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn delete_curation(
         &self,
         _req: crate::model::DeleteCurationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -819,10 +797,10 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -832,9 +810,9 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -843,10 +821,10 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -856,9 +834,9 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -867,8 +845,8 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -876,8 +854,8 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -898,10 +876,10 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn list_discovered_api_observations(
         &self,
         _req: crate::model::ListDiscoveredApiObservationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListDiscoveredApiObservationsResponse>,
+            crate::Response<crate::model::ListDiscoveredApiObservationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -911,9 +889,9 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn get_discovered_api_observation(
         &self,
         _req: crate::model::GetDiscoveredApiObservationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiscoveredApiObservation>>,
+        Output = crate::Result<crate::Response<crate::model::DiscoveredApiObservation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -922,11 +900,9 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn list_discovered_api_operations(
         &self,
         _req: crate::model::ListDiscoveredApiOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDiscoveredApiOperationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDiscoveredApiOperationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -935,9 +911,9 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn get_discovered_api_operation(
         &self,
         _req: crate::model::GetDiscoveredApiOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiscoveredApiOperation>>,
+        Output = crate::Result<crate::Response<crate::model::DiscoveredApiOperation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -946,10 +922,10 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -959,9 +935,9 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -970,10 +946,10 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -983,9 +959,9 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -994,8 +970,8 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1003,8 +979,8 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1025,9 +1001,9 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn create_host_project_registration(
         &self,
         _req: crate::model::CreateHostProjectRegistrationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HostProjectRegistration>>,
+        Output = crate::Result<crate::Response<crate::model::HostProjectRegistration>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1036,9 +1012,9 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn get_host_project_registration(
         &self,
         _req: crate::model::GetHostProjectRegistrationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HostProjectRegistration>>,
+        Output = crate::Result<crate::Response<crate::model::HostProjectRegistration>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1047,11 +1023,9 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn list_host_project_registrations(
         &self,
         _req: crate::model::ListHostProjectRegistrationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListHostProjectRegistrationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListHostProjectRegistrationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1060,10 +1034,10 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1073,9 +1047,9 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1084,10 +1058,10 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1097,9 +1071,9 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1108,8 +1082,8 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1117,8 +1091,8 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1139,10 +1113,9 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn get_style_guide(
         &self,
         _req: crate::model::GetStyleGuideRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StyleGuide>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::StyleGuide>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1150,10 +1123,9 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn update_style_guide(
         &self,
         _req: crate::model::UpdateStyleGuideRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StyleGuide>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::StyleGuide>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1161,9 +1133,9 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn get_style_guide_contents(
         &self,
         _req: crate::model::GetStyleGuideContentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StyleGuideContents>>,
+        Output = crate::Result<crate::Response<crate::model::StyleGuideContents>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1172,8 +1144,8 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn lint_spec(
         &self,
         _req: crate::model::LintSpecRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1181,10 +1153,10 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1194,9 +1166,9 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1205,10 +1177,10 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1218,9 +1190,9 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1229,8 +1201,8 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1238,8 +1210,8 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1260,10 +1232,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn get_plugin(
         &self,
         _req: crate::model::GetPluginRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Plugin>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Plugin>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1271,10 +1242,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn enable_plugin(
         &self,
         _req: crate::model::EnablePluginRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Plugin>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Plugin>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1282,10 +1252,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn disable_plugin(
         &self,
         _req: crate::model::DisablePluginRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Plugin>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Plugin>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1293,10 +1262,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn create_plugin(
         &self,
         _req: crate::model::CreatePluginRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Plugin>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Plugin>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1304,9 +1272,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn list_plugins(
         &self,
         _req: crate::model::ListPluginsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPluginsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPluginsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1315,9 +1283,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn delete_plugin(
         &self,
         _req: crate::model::DeletePluginRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1326,9 +1294,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn create_plugin_instance(
         &self,
         _req: crate::model::CreatePluginInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1337,9 +1305,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn execute_plugin_instance_action(
         &self,
         _req: crate::model::ExecutePluginInstanceActionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1348,9 +1316,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn get_plugin_instance(
         &self,
         _req: crate::model::GetPluginInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PluginInstance>>,
+        Output = crate::Result<crate::Response<crate::model::PluginInstance>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1359,9 +1327,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn list_plugin_instances(
         &self,
         _req: crate::model::ListPluginInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPluginInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPluginInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1370,9 +1338,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn enable_plugin_instance_action(
         &self,
         _req: crate::model::EnablePluginInstanceActionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1381,9 +1349,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn disable_plugin_instance_action(
         &self,
         _req: crate::model::DisablePluginInstanceActionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1392,9 +1360,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn update_plugin_instance(
         &self,
         _req: crate::model::UpdatePluginInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PluginInstance>>,
+        Output = crate::Result<crate::Response<crate::model::PluginInstance>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1403,9 +1371,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn delete_plugin_instance(
         &self,
         _req: crate::model::DeletePluginInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1414,10 +1382,10 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1427,9 +1395,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1438,10 +1406,10 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1451,9 +1419,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1462,8 +1430,8 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1471,8 +1439,8 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1482,9 +1450,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1493,9 +1461,9 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1515,9 +1483,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn create_api_hub_instance(
         &self,
         _req: crate::model::CreateApiHubInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1526,9 +1494,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn delete_api_hub_instance(
         &self,
         _req: crate::model::DeleteApiHubInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1537,9 +1505,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn get_api_hub_instance(
         &self,
         _req: crate::model::GetApiHubInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApiHubInstance>>,
+        Output = crate::Result<crate::Response<crate::model::ApiHubInstance>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1548,9 +1516,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn lookup_api_hub_instance(
         &self,
         _req: crate::model::LookupApiHubInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LookupApiHubInstanceResponse>>,
+        Output = crate::Result<crate::Response<crate::model::LookupApiHubInstanceResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1559,10 +1527,10 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1572,9 +1540,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1583,10 +1551,10 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1596,9 +1564,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1607,8 +1575,8 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1616,8 +1584,8 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1627,9 +1595,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1638,9 +1606,9 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1660,9 +1628,9 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn create_runtime_project_attachment(
         &self,
         _req: crate::model::CreateRuntimeProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RuntimeProjectAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::RuntimeProjectAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1671,9 +1639,9 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn get_runtime_project_attachment(
         &self,
         _req: crate::model::GetRuntimeProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RuntimeProjectAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::RuntimeProjectAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1682,10 +1650,10 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn list_runtime_project_attachments(
         &self,
         _req: crate::model::ListRuntimeProjectAttachmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListRuntimeProjectAttachmentsResponse>,
+            crate::Response<crate::model::ListRuntimeProjectAttachmentsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1695,8 +1663,8 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn delete_runtime_project_attachment(
         &self,
         _req: crate::model::DeleteRuntimeProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1704,10 +1672,10 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn lookup_runtime_project_attachment(
         &self,
         _req: crate::model::LookupRuntimeProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::LookupRuntimeProjectAttachmentResponse>,
+            crate::Response<crate::model::LookupRuntimeProjectAttachmentResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1717,10 +1685,10 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1730,9 +1698,9 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1741,10 +1709,10 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1754,9 +1722,9 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1765,8 +1733,8 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1774,8 +1742,8 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/apihub/v1/src/stub/dynamic.rs b/src/generated/cloud/apihub/v1/src/stub/dynamic.rs
index 60e6e7ca55..b3a420aa34 100644
--- a/src/generated/cloud/apihub/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/apihub/v1/src/stub/dynamic.rs
@@ -20,268 +20,266 @@ pub trait ApiHub: std::fmt::Debug + Send + Sync {
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>>;
 
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>>;
 
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApisResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApisResponse>>;
 
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>>;
 
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>>;
 
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_spec(
         &self,
         req: crate::model::CreateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spec>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spec>>;
 
     async fn get_spec(
         &self,
         req: crate::model::GetSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spec>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spec>>;
 
     async fn get_spec_contents(
         &self,
         req: crate::model::GetSpecContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SpecContents>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SpecContents>>;
 
     async fn list_specs(
         &self,
         req: crate::model::ListSpecsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSpecsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSpecsResponse>>;
 
     async fn update_spec(
         &self,
         req: crate::model::UpdateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spec>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spec>>;
 
     async fn delete_spec(
         &self,
         req: crate::model::DeleteSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_api_operation(
         &self,
         req: crate::model::CreateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiOperation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiOperation>>;
 
     async fn get_api_operation(
         &self,
         req: crate::model::GetApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiOperation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiOperation>>;
 
     async fn list_api_operations(
         &self,
         req: crate::model::ListApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApiOperationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApiOperationsResponse>>;
 
     async fn update_api_operation(
         &self,
         req: crate::model::UpdateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiOperation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiOperation>>;
 
     async fn delete_api_operation(
         &self,
         req: crate::model::DeleteApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_definition(
         &self,
         req: crate::model::GetDefinitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Definition>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Definition>>;
 
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>;
 
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_attribute(
         &self,
         req: crate::model::CreateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attribute>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attribute>>;
 
     async fn get_attribute(
         &self,
         req: crate::model::GetAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attribute>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attribute>>;
 
     async fn update_attribute(
         &self,
         req: crate::model::UpdateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attribute>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attribute>>;
 
     async fn delete_attribute(
         &self,
         req: crate::model::DeleteAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_attributes(
         &self,
         req: crate::model::ListAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAttributesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAttributesResponse>>;
 
     async fn search_resources(
         &self,
         req: crate::model::SearchResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchResourcesResponse>>;
 
     async fn create_external_api(
         &self,
         req: crate::model::CreateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalApi>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalApi>>;
 
     async fn get_external_api(
         &self,
         req: crate::model::GetExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalApi>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalApi>>;
 
     async fn update_external_api(
         &self,
         req: crate::model::UpdateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalApi>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalApi>>;
 
     async fn delete_external_api(
         &self,
         req: crate::model::DeleteExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_external_apis(
         &self,
         req: crate::model::ListExternalApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExternalApisResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExternalApisResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ApiHub] also implement [ApiHub].
@@ -291,8 +289,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>> {
         T::create_api(self, req, options).await
     }
 
@@ -300,8 +298,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>> {
         T::get_api(self, req, options).await
     }
 
@@ -309,8 +307,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApisResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApisResponse>> {
         T::list_apis(self, req, options).await
     }
 
@@ -318,8 +316,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Api>> {
         T::update_api(self, req, options).await
     }
 
@@ -327,8 +325,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_api(self, req, options).await
     }
 
@@ -336,8 +334,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::create_version(self, req, options).await
     }
 
@@ -345,8 +343,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::get_version(self, req, options).await
     }
 
@@ -354,8 +352,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>> {
         T::list_versions(self, req, options).await
     }
 
@@ -363,8 +361,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::update_version(self, req, options).await
     }
 
@@ -372,8 +370,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_version(self, req, options).await
     }
 
@@ -381,8 +379,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_spec(
         &self,
         req: crate::model::CreateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spec>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spec>> {
         T::create_spec(self, req, options).await
     }
 
@@ -390,8 +388,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_spec(
         &self,
         req: crate::model::GetSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spec>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spec>> {
         T::get_spec(self, req, options).await
     }
 
@@ -399,8 +397,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_spec_contents(
         &self,
         req: crate::model::GetSpecContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SpecContents>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SpecContents>> {
         T::get_spec_contents(self, req, options).await
     }
 
@@ -408,8 +406,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_specs(
         &self,
         req: crate::model::ListSpecsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSpecsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSpecsResponse>> {
         T::list_specs(self, req, options).await
     }
 
@@ -417,8 +415,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_spec(
         &self,
         req: crate::model::UpdateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spec>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spec>> {
         T::update_spec(self, req, options).await
     }
 
@@ -426,8 +424,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_spec(
         &self,
         req: crate::model::DeleteSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_spec(self, req, options).await
     }
 
@@ -435,8 +433,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_api_operation(
         &self,
         req: crate::model::CreateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiOperation>> {
         T::create_api_operation(self, req, options).await
     }
 
@@ -444,8 +442,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_api_operation(
         &self,
         req: crate::model::GetApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiOperation>> {
         T::get_api_operation(self, req, options).await
     }
 
@@ -453,8 +451,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_api_operations(
         &self,
         req: crate::model::ListApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApiOperationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApiOperationsResponse>> {
         T::list_api_operations(self, req, options).await
     }
 
@@ -462,8 +460,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_api_operation(
         &self,
         req: crate::model::UpdateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiOperation>> {
         T::update_api_operation(self, req, options).await
     }
 
@@ -471,8 +469,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_api_operation(
         &self,
         req: crate::model::DeleteApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_api_operation(self, req, options).await
     }
 
@@ -480,8 +478,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_definition(
         &self,
         req: crate::model::GetDefinitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Definition>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Definition>> {
         T::get_definition(self, req, options).await
     }
 
@@ -489,8 +487,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::create_deployment(self, req, options).await
     }
 
@@ -498,8 +496,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::get_deployment(self, req, options).await
     }
 
@@ -507,8 +505,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         T::list_deployments(self, req, options).await
     }
 
@@ -516,8 +514,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::update_deployment(self, req, options).await
     }
 
@@ -525,8 +523,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_deployment(self, req, options).await
     }
 
@@ -534,8 +532,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_attribute(
         &self,
         req: crate::model::CreateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attribute>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attribute>> {
         T::create_attribute(self, req, options).await
     }
 
@@ -543,8 +541,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_attribute(
         &self,
         req: crate::model::GetAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attribute>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attribute>> {
         T::get_attribute(self, req, options).await
     }
 
@@ -552,8 +550,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_attribute(
         &self,
         req: crate::model::UpdateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attribute>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attribute>> {
         T::update_attribute(self, req, options).await
     }
 
@@ -561,8 +559,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_attribute(
         &self,
         req: crate::model::DeleteAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_attribute(self, req, options).await
     }
 
@@ -570,8 +568,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_attributes(
         &self,
         req: crate::model::ListAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAttributesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAttributesResponse>> {
         T::list_attributes(self, req, options).await
     }
 
@@ -579,8 +577,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn search_resources(
         &self,
         req: crate::model::SearchResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchResourcesResponse>> {
         T::search_resources(self, req, options).await
     }
 
@@ -588,8 +586,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn create_external_api(
         &self,
         req: crate::model::CreateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalApi>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalApi>> {
         T::create_external_api(self, req, options).await
     }
 
@@ -597,8 +595,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_external_api(
         &self,
         req: crate::model::GetExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalApi>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalApi>> {
         T::get_external_api(self, req, options).await
     }
 
@@ -606,8 +604,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn update_external_api(
         &self,
         req: crate::model::UpdateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalApi>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalApi>> {
         T::update_external_api(self, req, options).await
     }
 
@@ -615,8 +613,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_external_api(
         &self,
         req: crate::model::DeleteExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_external_api(self, req, options).await
     }
 
@@ -624,8 +622,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_external_apis(
         &self,
         req: crate::model::ListExternalApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExternalApisResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExternalApisResponse>> {
         T::list_external_apis(self, req, options).await
     }
 
@@ -633,9 +631,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -643,8 +640,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -652,10 +649,9 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -663,8 +659,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -672,8 +668,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -681,8 +677,8 @@ impl<T: super::ApiHub> ApiHub for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -693,70 +689,68 @@ pub trait ApiHubDependencies: std::fmt::Debug + Send + Sync {
     async fn create_dependency(
         &self,
         req: crate::model::CreateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dependency>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dependency>>;
 
     async fn get_dependency(
         &self,
         req: crate::model::GetDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dependency>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dependency>>;
 
     async fn update_dependency(
         &self,
         req: crate::model::UpdateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dependency>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dependency>>;
 
     async fn delete_dependency(
         &self,
         req: crate::model::DeleteDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_dependencies(
         &self,
         req: crate::model::ListDependenciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDependenciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDependenciesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ApiHubDependencies] also implement [ApiHubDependencies].
@@ -766,8 +760,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn create_dependency(
         &self,
         req: crate::model::CreateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dependency>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dependency>> {
         T::create_dependency(self, req, options).await
     }
 
@@ -775,8 +769,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn get_dependency(
         &self,
         req: crate::model::GetDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dependency>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dependency>> {
         T::get_dependency(self, req, options).await
     }
 
@@ -784,8 +778,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn update_dependency(
         &self,
         req: crate::model::UpdateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dependency>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dependency>> {
         T::update_dependency(self, req, options).await
     }
 
@@ -793,8 +787,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn delete_dependency(
         &self,
         req: crate::model::DeleteDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_dependency(self, req, options).await
     }
 
@@ -802,8 +796,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn list_dependencies(
         &self,
         req: crate::model::ListDependenciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDependenciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDependenciesResponse>> {
         T::list_dependencies(self, req, options).await
     }
 
@@ -811,9 +805,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -821,8 +814,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -830,10 +823,9 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -841,8 +833,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -850,8 +842,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -859,8 +851,8 @@ impl<T: super::ApiHubDependencies> ApiHubDependencies for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -871,56 +863,54 @@ pub trait ApiHubCollect: std::fmt::Debug + Send + Sync {
     async fn collect_api_data(
         &self,
         req: crate::model::CollectApiDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ApiHubCollect] also implement [ApiHubCollect].
@@ -930,8 +920,8 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn collect_api_data(
         &self,
         req: crate::model::CollectApiDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::collect_api_data(self, req, options).await
     }
 
@@ -939,9 +929,8 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -949,8 +938,8 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -958,10 +947,9 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -969,8 +957,8 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -978,8 +966,8 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -987,22 +975,22 @@ impl<T: super::ApiHubCollect> ApiHubCollect for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1013,70 +1001,68 @@ pub trait ApiHubCurate: std::fmt::Debug + Send + Sync {
     async fn create_curation(
         &self,
         req: crate::model::CreateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Curation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Curation>>;
 
     async fn get_curation(
         &self,
         req: crate::model::GetCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Curation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Curation>>;
 
     async fn list_curations(
         &self,
         req: crate::model::ListCurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCurationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCurationsResponse>>;
 
     async fn update_curation(
         &self,
         req: crate::model::UpdateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Curation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Curation>>;
 
     async fn delete_curation(
         &self,
         req: crate::model::DeleteCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ApiHubCurate] also implement [ApiHubCurate].
@@ -1086,8 +1072,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn create_curation(
         &self,
         req: crate::model::CreateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Curation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Curation>> {
         T::create_curation(self, req, options).await
     }
 
@@ -1095,8 +1081,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn get_curation(
         &self,
         req: crate::model::GetCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Curation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Curation>> {
         T::get_curation(self, req, options).await
     }
 
@@ -1104,8 +1090,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn list_curations(
         &self,
         req: crate::model::ListCurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCurationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCurationsResponse>> {
         T::list_curations(self, req, options).await
     }
 
@@ -1113,8 +1099,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn update_curation(
         &self,
         req: crate::model::UpdateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Curation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Curation>> {
         T::update_curation(self, req, options).await
     }
 
@@ -1122,8 +1108,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn delete_curation(
         &self,
         req: crate::model::DeleteCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_curation(self, req, options).await
     }
 
@@ -1131,9 +1117,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1141,8 +1126,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1150,10 +1135,9 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1161,8 +1145,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1170,8 +1154,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1179,8 +1163,8 @@ impl<T: super::ApiHubCurate> ApiHubCurate for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1191,64 +1175,62 @@ pub trait ApiHubDiscovery: std::fmt::Debug + Send + Sync {
     async fn list_discovered_api_observations(
         &self,
         req: crate::model::ListDiscoveredApiObservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredApiObservationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredApiObservationsResponse>>;
 
     async fn get_discovered_api_observation(
         &self,
         req: crate::model::GetDiscoveredApiObservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredApiObservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredApiObservation>>;
 
     async fn list_discovered_api_operations(
         &self,
         req: crate::model::ListDiscoveredApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredApiOperationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredApiOperationsResponse>>;
 
     async fn get_discovered_api_operation(
         &self,
         req: crate::model::GetDiscoveredApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredApiOperation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredApiOperation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ApiHubDiscovery] also implement [ApiHubDiscovery].
@@ -1258,9 +1240,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn list_discovered_api_observations(
         &self,
         req: crate::model::ListDiscoveredApiObservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredApiObservationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredApiObservationsResponse>> {
         T::list_discovered_api_observations(self, req, options).await
     }
 
@@ -1268,8 +1249,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn get_discovered_api_observation(
         &self,
         req: crate::model::GetDiscoveredApiObservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredApiObservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredApiObservation>> {
         T::get_discovered_api_observation(self, req, options).await
     }
 
@@ -1277,9 +1258,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn list_discovered_api_operations(
         &self,
         req: crate::model::ListDiscoveredApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredApiOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredApiOperationsResponse>> {
         T::list_discovered_api_operations(self, req, options).await
     }
 
@@ -1287,8 +1267,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn get_discovered_api_operation(
         &self,
         req: crate::model::GetDiscoveredApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredApiOperation>> {
         T::get_discovered_api_operation(self, req, options).await
     }
 
@@ -1296,9 +1276,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1306,8 +1285,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1315,10 +1294,9 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1326,8 +1304,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1335,8 +1313,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1344,8 +1322,8 @@ impl<T: super::ApiHubDiscovery> ApiHubDiscovery for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1356,58 +1334,56 @@ pub trait HostProjectRegistrationService: std::fmt::Debug + Send + Sync {
     async fn create_host_project_registration(
         &self,
         req: crate::model::CreateHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HostProjectRegistration>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HostProjectRegistration>>;
 
     async fn get_host_project_registration(
         &self,
         req: crate::model::GetHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HostProjectRegistration>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HostProjectRegistration>>;
 
     async fn list_host_project_registrations(
         &self,
         req: crate::model::ListHostProjectRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHostProjectRegistrationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHostProjectRegistrationsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::HostProjectRegistrationService] also implement [HostProjectRegistrationService].
@@ -1417,8 +1393,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn create_host_project_registration(
         &self,
         req: crate::model::CreateHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HostProjectRegistration>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HostProjectRegistration>> {
         T::create_host_project_registration(self, req, options).await
     }
 
@@ -1426,8 +1402,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn get_host_project_registration(
         &self,
         req: crate::model::GetHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HostProjectRegistration>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HostProjectRegistration>> {
         T::get_host_project_registration(self, req, options).await
     }
 
@@ -1435,9 +1411,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn list_host_project_registrations(
         &self,
         req: crate::model::ListHostProjectRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHostProjectRegistrationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHostProjectRegistrationsResponse>> {
         T::list_host_project_registrations(self, req, options).await
     }
 
@@ -1445,9 +1420,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1455,8 +1429,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1464,10 +1438,9 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1475,8 +1448,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1484,8 +1457,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1493,8 +1466,8 @@ impl<T: super::HostProjectRegistrationService> HostProjectRegistrationService fo
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1505,64 +1478,62 @@ pub trait LintingService: std::fmt::Debug + Send + Sync {
     async fn get_style_guide(
         &self,
         req: crate::model::GetStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StyleGuide>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StyleGuide>>;
 
     async fn update_style_guide(
         &self,
         req: crate::model::UpdateStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StyleGuide>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StyleGuide>>;
 
     async fn get_style_guide_contents(
         &self,
         req: crate::model::GetStyleGuideContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StyleGuideContents>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StyleGuideContents>>;
 
     async fn lint_spec(
         &self,
         req: crate::model::LintSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::LintingService] also implement [LintingService].
@@ -1572,8 +1543,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn get_style_guide(
         &self,
         req: crate::model::GetStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StyleGuide>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StyleGuide>> {
         T::get_style_guide(self, req, options).await
     }
 
@@ -1581,8 +1552,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn update_style_guide(
         &self,
         req: crate::model::UpdateStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StyleGuide>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StyleGuide>> {
         T::update_style_guide(self, req, options).await
     }
 
@@ -1590,8 +1561,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn get_style_guide_contents(
         &self,
         req: crate::model::GetStyleGuideContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StyleGuideContents>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StyleGuideContents>> {
         T::get_style_guide_contents(self, req, options).await
     }
 
@@ -1599,8 +1570,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn lint_spec(
         &self,
         req: crate::model::LintSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::lint_spec(self, req, options).await
     }
 
@@ -1608,9 +1579,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1618,8 +1588,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1627,10 +1597,9 @@ impl<T: super::LintingService> LintingService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1638,8 +1607,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1647,8 +1616,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1656,8 +1625,8 @@ impl<T: super::LintingService> LintingService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1668,134 +1637,132 @@ pub trait ApiHubPlugin: std::fmt::Debug + Send + Sync {
     async fn get_plugin(
         &self,
         req: crate::model::GetPluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>>;
 
     async fn enable_plugin(
         &self,
         req: crate::model::EnablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>>;
 
     async fn disable_plugin(
         &self,
         req: crate::model::DisablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>>;
 
     async fn create_plugin(
         &self,
         req: crate::model::CreatePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>>;
 
     async fn list_plugins(
         &self,
         req: crate::model::ListPluginsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPluginsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPluginsResponse>>;
 
     async fn delete_plugin(
         &self,
         req: crate::model::DeletePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_plugin_instance(
         &self,
         req: crate::model::CreatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn execute_plugin_instance_action(
         &self,
         req: crate::model::ExecutePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_plugin_instance(
         &self,
         req: crate::model::GetPluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PluginInstance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PluginInstance>>;
 
     async fn list_plugin_instances(
         &self,
         req: crate::model::ListPluginInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPluginInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPluginInstancesResponse>>;
 
     async fn enable_plugin_instance_action(
         &self,
         req: crate::model::EnablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn disable_plugin_instance_action(
         &self,
         req: crate::model::DisablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_plugin_instance(
         &self,
         req: crate::model::UpdatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PluginInstance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PluginInstance>>;
 
     async fn delete_plugin_instance(
         &self,
         req: crate::model::DeletePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ApiHubPlugin] also implement [ApiHubPlugin].
@@ -1805,8 +1772,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn get_plugin(
         &self,
         req: crate::model::GetPluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>> {
         T::get_plugin(self, req, options).await
     }
 
@@ -1814,8 +1781,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn enable_plugin(
         &self,
         req: crate::model::EnablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>> {
         T::enable_plugin(self, req, options).await
     }
 
@@ -1823,8 +1790,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn disable_plugin(
         &self,
         req: crate::model::DisablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>> {
         T::disable_plugin(self, req, options).await
     }
 
@@ -1832,8 +1799,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn create_plugin(
         &self,
         req: crate::model::CreatePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Plugin>> {
         T::create_plugin(self, req, options).await
     }
 
@@ -1841,8 +1808,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn list_plugins(
         &self,
         req: crate::model::ListPluginsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPluginsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPluginsResponse>> {
         T::list_plugins(self, req, options).await
     }
 
@@ -1850,8 +1817,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn delete_plugin(
         &self,
         req: crate::model::DeletePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_plugin(self, req, options).await
     }
 
@@ -1859,8 +1826,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn create_plugin_instance(
         &self,
         req: crate::model::CreatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_plugin_instance(self, req, options).await
     }
 
@@ -1868,8 +1835,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn execute_plugin_instance_action(
         &self,
         req: crate::model::ExecutePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::execute_plugin_instance_action(self, req, options).await
     }
 
@@ -1877,8 +1844,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn get_plugin_instance(
         &self,
         req: crate::model::GetPluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PluginInstance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PluginInstance>> {
         T::get_plugin_instance(self, req, options).await
     }
 
@@ -1886,8 +1853,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn list_plugin_instances(
         &self,
         req: crate::model::ListPluginInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPluginInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPluginInstancesResponse>> {
         T::list_plugin_instances(self, req, options).await
     }
 
@@ -1895,8 +1862,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn enable_plugin_instance_action(
         &self,
         req: crate::model::EnablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::enable_plugin_instance_action(self, req, options).await
     }
 
@@ -1904,8 +1871,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn disable_plugin_instance_action(
         &self,
         req: crate::model::DisablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::disable_plugin_instance_action(self, req, options).await
     }
 
@@ -1913,8 +1880,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn update_plugin_instance(
         &self,
         req: crate::model::UpdatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PluginInstance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PluginInstance>> {
         T::update_plugin_instance(self, req, options).await
     }
 
@@ -1922,8 +1889,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn delete_plugin_instance(
         &self,
         req: crate::model::DeletePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_plugin_instance(self, req, options).await
     }
 
@@ -1931,9 +1898,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1941,8 +1907,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1950,10 +1916,9 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1961,8 +1926,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1970,8 +1935,8 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1979,22 +1944,22 @@ impl<T: super::ApiHubPlugin> ApiHubPlugin for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2005,74 +1970,72 @@ pub trait Provisioning: std::fmt::Debug + Send + Sync {
     async fn create_api_hub_instance(
         &self,
         req: crate::model::CreateApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_api_hub_instance(
         &self,
         req: crate::model::DeleteApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_api_hub_instance(
         &self,
         req: crate::model::GetApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiHubInstance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiHubInstance>>;
 
     async fn lookup_api_hub_instance(
         &self,
         req: crate::model::LookupApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupApiHubInstanceResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupApiHubInstanceResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Provisioning] also implement [Provisioning].
@@ -2082,8 +2045,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn create_api_hub_instance(
         &self,
         req: crate::model::CreateApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_api_hub_instance(self, req, options).await
     }
 
@@ -2091,8 +2054,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn delete_api_hub_instance(
         &self,
         req: crate::model::DeleteApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_api_hub_instance(self, req, options).await
     }
 
@@ -2100,8 +2063,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn get_api_hub_instance(
         &self,
         req: crate::model::GetApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApiHubInstance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApiHubInstance>> {
         T::get_api_hub_instance(self, req, options).await
     }
 
@@ -2109,8 +2072,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn lookup_api_hub_instance(
         &self,
         req: crate::model::LookupApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupApiHubInstanceResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupApiHubInstanceResponse>> {
         T::lookup_api_hub_instance(self, req, options).await
     }
 
@@ -2118,9 +2081,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2128,8 +2090,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2137,10 +2099,9 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2148,8 +2109,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2157,8 +2118,8 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2166,22 +2127,22 @@ impl<T: super::Provisioning> Provisioning for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2192,70 +2153,68 @@ pub trait RuntimeProjectAttachmentService: std::fmt::Debug + Send + Sync {
     async fn create_runtime_project_attachment(
         &self,
         req: crate::model::CreateRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuntimeProjectAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuntimeProjectAttachment>>;
 
     async fn get_runtime_project_attachment(
         &self,
         req: crate::model::GetRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuntimeProjectAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuntimeProjectAttachment>>;
 
     async fn list_runtime_project_attachments(
         &self,
         req: crate::model::ListRuntimeProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimeProjectAttachmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimeProjectAttachmentsResponse>>;
 
     async fn delete_runtime_project_attachment(
         &self,
         req: crate::model::DeleteRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn lookup_runtime_project_attachment(
         &self,
         req: crate::model::LookupRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupRuntimeProjectAttachmentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupRuntimeProjectAttachmentResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::RuntimeProjectAttachmentService] also implement [RuntimeProjectAttachmentService].
@@ -2265,8 +2224,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn create_runtime_project_attachment(
         &self,
         req: crate::model::CreateRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuntimeProjectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuntimeProjectAttachment>> {
         T::create_runtime_project_attachment(self, req, options).await
     }
 
@@ -2274,8 +2233,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn get_runtime_project_attachment(
         &self,
         req: crate::model::GetRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuntimeProjectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuntimeProjectAttachment>> {
         T::get_runtime_project_attachment(self, req, options).await
     }
 
@@ -2283,9 +2242,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn list_runtime_project_attachments(
         &self,
         req: crate::model::ListRuntimeProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimeProjectAttachmentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimeProjectAttachmentsResponse>> {
         T::list_runtime_project_attachments(self, req, options).await
     }
 
@@ -2293,8 +2251,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn delete_runtime_project_attachment(
         &self,
         req: crate::model::DeleteRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_runtime_project_attachment(self, req, options).await
     }
 
@@ -2302,9 +2260,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn lookup_runtime_project_attachment(
         &self,
         req: crate::model::LookupRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupRuntimeProjectAttachmentResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupRuntimeProjectAttachmentResponse>> {
         T::lookup_runtime_project_attachment(self, req, options).await
     }
 
@@ -2312,9 +2269,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2322,8 +2278,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2331,10 +2287,9 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2342,8 +2297,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2351,8 +2306,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2360,8 +2315,8 @@ impl<T: super::RuntimeProjectAttachmentService> RuntimeProjectAttachmentService
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/apihub/v1/src/tracing.rs b/src/generated/cloud/apihub/v1/src/tracing.rs
index 4d6e246a46..c259dc5af5 100644
--- a/src/generated/cloud/apihub/v1/src/tracing.rs
+++ b/src/generated/cloud/apihub/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         self.inner.create_api(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         self.inner.get_api(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApisResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApisResponse>> {
         self.inner.list_apis(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         self.inner.update_api(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_api(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.create_version(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.get_version(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         self.inner.list_versions(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.update_version(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_version(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn create_spec(
         &self,
         req: crate::model::CreateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spec>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spec>> {
         self.inner.create_spec(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_spec(
         &self,
         req: crate::model::GetSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spec>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spec>> {
         self.inner.get_spec(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn get_spec_contents(
         &self,
         req: crate::model::GetSpecContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SpecContents>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SpecContents>> {
         self.inner.get_spec_contents(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_specs(
         &self,
         req: crate::model::ListSpecsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSpecsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSpecsResponse>> {
         self.inner.list_specs(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn update_spec(
         &self,
         req: crate::model::UpdateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spec>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spec>> {
         self.inner.update_spec(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn delete_spec(
         &self,
         req: crate::model::DeleteSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_spec(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn create_api_operation(
         &self,
         req: crate::model::CreateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiOperation>> {
         self.inner.create_api_operation(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_api_operation(
         &self,
         req: crate::model::GetApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiOperation>> {
         self.inner.get_api_operation(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn list_api_operations(
         &self,
         req: crate::model::ListApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApiOperationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApiOperationsResponse>> {
         self.inner.list_api_operations(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn update_api_operation(
         &self,
         req: crate::model::UpdateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiOperation>> {
         self.inner.update_api_operation(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn delete_api_operation(
         &self,
         req: crate::model::DeleteApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_api_operation(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn get_definition(
         &self,
         req: crate::model::GetDefinitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Definition>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Definition>> {
         self.inner.get_definition(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.create_deployment(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.get_deployment(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         self.inner.list_deployments(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.update_deployment(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_deployment(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn create_attribute(
         &self,
         req: crate::model::CreateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attribute>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attribute>> {
         self.inner.create_attribute(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn get_attribute(
         &self,
         req: crate::model::GetAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attribute>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attribute>> {
         self.inner.get_attribute(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn update_attribute(
         &self,
         req: crate::model::UpdateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attribute>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attribute>> {
         self.inner.update_attribute(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn delete_attribute(
         &self,
         req: crate::model::DeleteAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_attribute(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn list_attributes(
         &self,
         req: crate::model::ListAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAttributesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAttributesResponse>> {
         self.inner.list_attributes(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn search_resources(
         &self,
         req: crate::model::SearchResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchResourcesResponse>> {
         self.inner.search_resources(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn create_external_api(
         &self,
         req: crate::model::CreateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalApi>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalApi>> {
         self.inner.create_external_api(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn get_external_api(
         &self,
         req: crate::model::GetExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalApi>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalApi>> {
         self.inner.get_external_api(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn update_external_api(
         &self,
         req: crate::model::UpdateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalApi>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalApi>> {
         self.inner.update_external_api(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn delete_external_api(
         &self,
         req: crate::model::DeleteExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_external_api(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn list_external_apis(
         &self,
         req: crate::model::ListExternalApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExternalApisResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExternalApisResponse>> {
         self.inner.list_external_apis(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -401,9 +401,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -411,8 +410,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -420,8 +419,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -429,8 +428,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -461,8 +460,8 @@ where
     async fn create_dependency(
         &self,
         req: crate::model::CreateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dependency>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dependency>> {
         self.inner.create_dependency(req, options).await
     }
 
@@ -470,8 +469,8 @@ where
     async fn get_dependency(
         &self,
         req: crate::model::GetDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dependency>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dependency>> {
         self.inner.get_dependency(req, options).await
     }
 
@@ -479,8 +478,8 @@ where
     async fn update_dependency(
         &self,
         req: crate::model::UpdateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dependency>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dependency>> {
         self.inner.update_dependency(req, options).await
     }
 
@@ -488,8 +487,8 @@ where
     async fn delete_dependency(
         &self,
         req: crate::model::DeleteDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_dependency(req, options).await
     }
 
@@ -497,8 +496,8 @@ where
     async fn list_dependencies(
         &self,
         req: crate::model::ListDependenciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDependenciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDependenciesResponse>> {
         self.inner.list_dependencies(req, options).await
     }
 
@@ -506,8 +505,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -515,8 +514,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -524,9 +523,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -534,8 +532,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -543,8 +541,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -552,8 +550,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -584,8 +582,8 @@ where
     async fn collect_api_data(
         &self,
         req: crate::model::CollectApiDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.collect_api_data(req, options).await
     }
 
@@ -593,8 +591,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -602,8 +600,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -611,9 +609,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -621,8 +618,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -630,8 +627,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -639,22 +636,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -685,8 +682,8 @@ where
     async fn create_curation(
         &self,
         req: crate::model::CreateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Curation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Curation>> {
         self.inner.create_curation(req, options).await
     }
 
@@ -694,8 +691,8 @@ where
     async fn get_curation(
         &self,
         req: crate::model::GetCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Curation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Curation>> {
         self.inner.get_curation(req, options).await
     }
 
@@ -703,8 +700,8 @@ where
     async fn list_curations(
         &self,
         req: crate::model::ListCurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCurationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCurationsResponse>> {
         self.inner.list_curations(req, options).await
     }
 
@@ -712,8 +709,8 @@ where
     async fn update_curation(
         &self,
         req: crate::model::UpdateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Curation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Curation>> {
         self.inner.update_curation(req, options).await
     }
 
@@ -721,8 +718,8 @@ where
     async fn delete_curation(
         &self,
         req: crate::model::DeleteCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_curation(req, options).await
     }
 
@@ -730,8 +727,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -739,8 +736,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -748,9 +745,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -758,8 +754,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -767,8 +763,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -776,8 +772,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -808,8 +804,8 @@ where
     async fn list_discovered_api_observations(
         &self,
         req: crate::model::ListDiscoveredApiObservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredApiObservationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredApiObservationsResponse>> {
         self.inner
             .list_discovered_api_observations(req, options)
             .await
@@ -819,8 +815,8 @@ where
     async fn get_discovered_api_observation(
         &self,
         req: crate::model::GetDiscoveredApiObservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredApiObservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredApiObservation>> {
         self.inner
             .get_discovered_api_observation(req, options)
             .await
@@ -830,8 +826,8 @@ where
     async fn list_discovered_api_operations(
         &self,
         req: crate::model::ListDiscoveredApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredApiOperationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredApiOperationsResponse>> {
         self.inner
             .list_discovered_api_operations(req, options)
             .await
@@ -841,8 +837,8 @@ where
     async fn get_discovered_api_operation(
         &self,
         req: crate::model::GetDiscoveredApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredApiOperation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredApiOperation>> {
         self.inner.get_discovered_api_operation(req, options).await
     }
 
@@ -850,8 +846,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -859,8 +855,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -868,9 +864,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -878,8 +873,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -887,8 +882,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -896,8 +891,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -928,8 +923,8 @@ where
     async fn create_host_project_registration(
         &self,
         req: crate::model::CreateHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HostProjectRegistration>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HostProjectRegistration>> {
         self.inner
             .create_host_project_registration(req, options)
             .await
@@ -939,8 +934,8 @@ where
     async fn get_host_project_registration(
         &self,
         req: crate::model::GetHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HostProjectRegistration>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HostProjectRegistration>> {
         self.inner.get_host_project_registration(req, options).await
     }
 
@@ -948,8 +943,8 @@ where
     async fn list_host_project_registrations(
         &self,
         req: crate::model::ListHostProjectRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHostProjectRegistrationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHostProjectRegistrationsResponse>> {
         self.inner
             .list_host_project_registrations(req, options)
             .await
@@ -959,8 +954,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -968,8 +963,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -977,9 +972,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -987,8 +981,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -996,8 +990,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1005,8 +999,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1037,8 +1031,8 @@ where
     async fn get_style_guide(
         &self,
         req: crate::model::GetStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StyleGuide>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StyleGuide>> {
         self.inner.get_style_guide(req, options).await
     }
 
@@ -1046,8 +1040,8 @@ where
     async fn update_style_guide(
         &self,
         req: crate::model::UpdateStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StyleGuide>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StyleGuide>> {
         self.inner.update_style_guide(req, options).await
     }
 
@@ -1055,8 +1049,8 @@ where
     async fn get_style_guide_contents(
         &self,
         req: crate::model::GetStyleGuideContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StyleGuideContents>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StyleGuideContents>> {
         self.inner.get_style_guide_contents(req, options).await
     }
 
@@ -1064,8 +1058,8 @@ where
     async fn lint_spec(
         &self,
         req: crate::model::LintSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.lint_spec(req, options).await
     }
 
@@ -1073,8 +1067,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1082,8 +1076,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1091,9 +1085,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1101,8 +1094,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1110,8 +1103,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1119,8 +1112,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1151,8 +1144,8 @@ where
     async fn get_plugin(
         &self,
         req: crate::model::GetPluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         self.inner.get_plugin(req, options).await
     }
 
@@ -1160,8 +1153,8 @@ where
     async fn enable_plugin(
         &self,
         req: crate::model::EnablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         self.inner.enable_plugin(req, options).await
     }
 
@@ -1169,8 +1162,8 @@ where
     async fn disable_plugin(
         &self,
         req: crate::model::DisablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         self.inner.disable_plugin(req, options).await
     }
 
@@ -1178,8 +1171,8 @@ where
     async fn create_plugin(
         &self,
         req: crate::model::CreatePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         self.inner.create_plugin(req, options).await
     }
 
@@ -1187,8 +1180,8 @@ where
     async fn list_plugins(
         &self,
         req: crate::model::ListPluginsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPluginsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPluginsResponse>> {
         self.inner.list_plugins(req, options).await
     }
 
@@ -1196,8 +1189,8 @@ where
     async fn delete_plugin(
         &self,
         req: crate::model::DeletePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_plugin(req, options).await
     }
 
@@ -1205,8 +1198,8 @@ where
     async fn create_plugin_instance(
         &self,
         req: crate::model::CreatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_plugin_instance(req, options).await
     }
 
@@ -1214,8 +1207,8 @@ where
     async fn execute_plugin_instance_action(
         &self,
         req: crate::model::ExecutePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .execute_plugin_instance_action(req, options)
             .await
@@ -1225,8 +1218,8 @@ where
     async fn get_plugin_instance(
         &self,
         req: crate::model::GetPluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PluginInstance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PluginInstance>> {
         self.inner.get_plugin_instance(req, options).await
     }
 
@@ -1234,8 +1227,8 @@ where
     async fn list_plugin_instances(
         &self,
         req: crate::model::ListPluginInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPluginInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPluginInstancesResponse>> {
         self.inner.list_plugin_instances(req, options).await
     }
 
@@ -1243,8 +1236,8 @@ where
     async fn enable_plugin_instance_action(
         &self,
         req: crate::model::EnablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.enable_plugin_instance_action(req, options).await
     }
 
@@ -1252,8 +1245,8 @@ where
     async fn disable_plugin_instance_action(
         &self,
         req: crate::model::DisablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .disable_plugin_instance_action(req, options)
             .await
@@ -1263,8 +1256,8 @@ where
     async fn update_plugin_instance(
         &self,
         req: crate::model::UpdatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PluginInstance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PluginInstance>> {
         self.inner.update_plugin_instance(req, options).await
     }
 
@@ -1272,8 +1265,8 @@ where
     async fn delete_plugin_instance(
         &self,
         req: crate::model::DeletePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_plugin_instance(req, options).await
     }
 
@@ -1281,8 +1274,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1290,8 +1283,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1299,9 +1292,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1309,8 +1301,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1318,8 +1310,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1327,22 +1319,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1373,8 +1365,8 @@ where
     async fn create_api_hub_instance(
         &self,
         req: crate::model::CreateApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_api_hub_instance(req, options).await
     }
 
@@ -1382,8 +1374,8 @@ where
     async fn delete_api_hub_instance(
         &self,
         req: crate::model::DeleteApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_api_hub_instance(req, options).await
     }
 
@@ -1391,8 +1383,8 @@ where
     async fn get_api_hub_instance(
         &self,
         req: crate::model::GetApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiHubInstance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiHubInstance>> {
         self.inner.get_api_hub_instance(req, options).await
     }
 
@@ -1400,8 +1392,8 @@ where
     async fn lookup_api_hub_instance(
         &self,
         req: crate::model::LookupApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupApiHubInstanceResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupApiHubInstanceResponse>> {
         self.inner.lookup_api_hub_instance(req, options).await
     }
 
@@ -1409,8 +1401,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1418,8 +1410,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1427,9 +1419,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1437,8 +1428,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1446,8 +1437,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1455,22 +1446,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1501,8 +1492,8 @@ where
     async fn create_runtime_project_attachment(
         &self,
         req: crate::model::CreateRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuntimeProjectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuntimeProjectAttachment>> {
         self.inner
             .create_runtime_project_attachment(req, options)
             .await
@@ -1512,8 +1503,8 @@ where
     async fn get_runtime_project_attachment(
         &self,
         req: crate::model::GetRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuntimeProjectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuntimeProjectAttachment>> {
         self.inner
             .get_runtime_project_attachment(req, options)
             .await
@@ -1523,8 +1514,8 @@ where
     async fn list_runtime_project_attachments(
         &self,
         req: crate::model::ListRuntimeProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimeProjectAttachmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimeProjectAttachmentsResponse>> {
         self.inner
             .list_runtime_project_attachments(req, options)
             .await
@@ -1534,8 +1525,8 @@ where
     async fn delete_runtime_project_attachment(
         &self,
         req: crate::model::DeleteRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .delete_runtime_project_attachment(req, options)
             .await
@@ -1545,8 +1536,8 @@ where
     async fn lookup_runtime_project_attachment(
         &self,
         req: crate::model::LookupRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupRuntimeProjectAttachmentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupRuntimeProjectAttachmentResponse>> {
         self.inner
             .lookup_runtime_project_attachment(req, options)
             .await
@@ -1556,8 +1547,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1565,8 +1556,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1574,9 +1565,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1584,8 +1574,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1593,8 +1583,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1602,8 +1592,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/apihub/v1/src/transport.rs b/src/generated/cloud/apihub/v1/src/transport.rs
index 97126f6b94..f216607686 100644
--- a/src/generated/cloud/apihub/v1/src/transport.rs
+++ b/src/generated/cloud/apihub/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ApiHub](super::stub::ApiHub) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ApiHub {
 }
 
 impl ApiHub {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn create_api(
         &self,
         req: crate::model::CreateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_api(
         &self,
         req: crate::model::GetApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -151,9 +151,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -168,13 +168,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_apis(
         &self,
         req: crate::model::ListApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApisResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApisResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_api(
         &self,
         req: crate::model::UpdateApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Api>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Api>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296,9 +296,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313,13 +313,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_api(
         &self,
         req: crate::model::DeleteApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -372,24 +372,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431,9 +432,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,13 +449,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -499,9 +500,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -516,13 +517,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -566,9 +567,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -583,13 +584,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -652,9 +653,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -669,13 +670,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -721,9 +722,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -732,24 +733,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_spec(
         &self,
         req: crate::model::CreateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spec>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spec>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -795,9 +797,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -812,13 +814,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_spec(
         &self,
         req: crate::model::GetSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spec>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spec>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -867,9 +869,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -884,13 +886,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_spec_contents(
         &self,
         req: crate::model::GetSpecContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SpecContents>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SpecContents>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -939,9 +941,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -956,13 +958,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_specs(
         &self,
         req: crate::model::ListSpecsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSpecsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSpecsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1010,9 +1012,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1027,13 +1029,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_spec(
         &self,
         req: crate::model::UpdateSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spec>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spec>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1100,9 +1102,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1117,13 +1119,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_spec(
         &self,
         req: crate::model::DeleteSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1172,9 +1174,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1183,24 +1185,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_api_operation(
         &self,
         req: crate::model::CreateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiOperation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiOperation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1246,9 +1249,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1263,13 +1266,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_api_operation(
         &self,
         req: crate::model::GetApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiOperation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiOperation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1318,9 +1321,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1335,13 +1338,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_api_operations(
         &self,
         req: crate::model::ListApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApiOperationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApiOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1389,9 +1392,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1406,13 +1409,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_api_operation(
         &self,
         req: crate::model::UpdateApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiOperation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiOperation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1479,9 +1482,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1496,13 +1499,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_api_operation(
         &self,
         req: crate::model::DeleteApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1551,9 +1554,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1562,24 +1565,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_definition(
         &self,
         req: crate::model::GetDefinitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Definition>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Definition>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1628,9 +1632,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1645,13 +1649,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1689,9 +1693,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1706,13 +1710,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1753,9 +1757,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1770,13 +1774,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1816,9 +1820,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1833,13 +1837,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1898,9 +1902,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1915,13 +1919,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1962,9 +1966,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1973,24 +1977,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_attribute(
         &self,
         req: crate::model::CreateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attribute>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attribute>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2028,9 +2033,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2045,13 +2050,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_attribute(
         &self,
         req: crate::model::GetAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attribute>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attribute>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2092,9 +2097,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2109,13 +2114,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_attribute(
         &self,
         req: crate::model::UpdateAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attribute>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attribute>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2174,9 +2179,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2191,13 +2196,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_attribute(
         &self,
         req: crate::model::DeleteAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2238,9 +2243,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2249,24 +2254,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_attributes(
         &self,
         req: crate::model::ListAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAttributesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAttributesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2306,9 +2312,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2323,13 +2329,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn search_resources(
         &self,
         req: crate::model::SearchResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2366,9 +2372,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2383,13 +2389,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn create_external_api(
         &self,
         req: crate::model::CreateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalApi>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalApi>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2427,9 +2433,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2444,13 +2450,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_external_api(
         &self,
         req: crate::model::GetExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalApi>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalApi>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2491,9 +2497,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2508,13 +2514,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn update_external_api(
         &self,
         req: crate::model::UpdateExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalApi>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalApi>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2573,9 +2579,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2590,13 +2596,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_external_api(
         &self,
         req: crate::model::DeleteExternalApiRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2637,9 +2643,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2648,24 +2654,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_external_apis(
         &self,
         req: crate::model::ListExternalApisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExternalApisResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExternalApisResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2704,9 +2711,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2721,13 +2728,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2757,9 +2764,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2774,13 +2781,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2817,9 +2824,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2834,14 +2841,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2883,9 +2889,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2900,13 +2906,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2947,9 +2953,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2964,13 +2970,13 @@ impl super::stub::ApiHub for ApiHub {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3011,9 +3017,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3022,24 +3028,25 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3080,9 +3087,9 @@ impl super::stub::ApiHub for ApiHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3091,12 +3098,13 @@ impl super::stub::ApiHub for ApiHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -3115,7 +3123,7 @@ impl std::fmt::Debug for ApiHubDependencies {
 }
 
 impl ApiHubDependencies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3125,13 +3133,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn create_dependency(
         &self,
         req: crate::model::CreateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dependency>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dependency>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3169,9 +3177,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3186,13 +3194,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn get_dependency(
         &self,
         req: crate::model::GetDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dependency>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dependency>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3233,9 +3241,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3250,13 +3258,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn update_dependency(
         &self,
         req: crate::model::UpdateDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dependency>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dependency>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3315,9 +3323,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3332,13 +3340,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn delete_dependency(
         &self,
         req: crate::model::DeleteDependencyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3379,9 +3387,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3390,24 +3398,25 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_dependencies(
         &self,
         req: crate::model::ListDependenciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDependenciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDependenciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3447,9 +3456,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3464,13 +3473,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3500,9 +3509,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3517,13 +3526,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3560,9 +3569,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3577,14 +3586,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3626,9 +3634,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3643,13 +3651,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3690,9 +3698,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3707,13 +3715,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3754,9 +3762,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3765,24 +3773,25 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3823,9 +3832,9 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3834,12 +3843,13 @@ impl super::stub::ApiHubDependencies for ApiHubDependencies {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -3858,7 +3868,7 @@ impl std::fmt::Debug for ApiHubCollect {
 }
 
 impl ApiHubCollect {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3868,13 +3878,13 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
     async fn collect_api_data(
         &self,
         req: crate::model::CollectApiDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3911,9 +3921,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3928,13 +3938,13 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3964,9 +3974,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3981,13 +3991,13 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4024,9 +4034,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4041,14 +4051,13 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4090,9 +4099,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4107,13 +4116,13 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4154,9 +4163,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4171,13 +4180,13 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4218,9 +4227,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4229,24 +4238,25 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4287,9 +4297,9 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4298,25 +4308,26 @@ impl super::stub::ApiHubCollect for ApiHubCollect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4336,7 +4347,7 @@ impl std::fmt::Debug for ApiHubCurate {
 }
 
 impl ApiHubCurate {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -4346,13 +4357,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn create_curation(
         &self,
         req: crate::model::CreateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Curation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Curation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4390,9 +4401,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4407,13 +4418,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn get_curation(
         &self,
         req: crate::model::GetCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Curation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Curation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4454,9 +4465,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4471,13 +4482,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn list_curations(
         &self,
         req: crate::model::ListCurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCurationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCurationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4517,9 +4528,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4534,13 +4545,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn update_curation(
         &self,
         req: crate::model::UpdateCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Curation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Curation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4599,9 +4610,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4616,13 +4627,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn delete_curation(
         &self,
         req: crate::model::DeleteCurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4663,9 +4674,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4674,24 +4685,25 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4721,9 +4733,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4738,13 +4750,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4781,9 +4793,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4798,14 +4810,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4847,9 +4858,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4864,13 +4875,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4911,9 +4922,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4928,13 +4939,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4975,9 +4986,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4986,24 +4997,25 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5044,9 +5056,9 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5055,12 +5067,13 @@ impl super::stub::ApiHubCurate for ApiHubCurate {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -5079,7 +5092,7 @@ impl std::fmt::Debug for ApiHubDiscovery {
 }
 
 impl ApiHubDiscovery {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5089,13 +5102,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn list_discovered_api_observations(
         &self,
         req: crate::model::ListDiscoveredApiObservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredApiObservationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredApiObservationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5134,9 +5147,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5151,13 +5164,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn get_discovered_api_observation(
         &self,
         req: crate::model::GetDiscoveredApiObservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredApiObservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredApiObservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5198,9 +5211,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5215,13 +5228,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn list_discovered_api_operations(
         &self,
         req: crate::model::ListDiscoveredApiOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredApiOperationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredApiOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5264,9 +5277,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5281,13 +5294,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn get_discovered_api_operation(
         &self,
         req: crate::model::GetDiscoveredApiOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredApiOperation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredApiOperation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -5310,9 +5323,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     "projects/*/locations/*/discoveredApiObservations/*/discoveredApiOperations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5327,13 +5340,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5363,9 +5376,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5380,13 +5393,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5423,9 +5436,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5440,14 +5453,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5489,9 +5501,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5506,13 +5518,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5553,9 +5565,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5570,13 +5582,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5617,9 +5629,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5628,24 +5640,25 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5686,9 +5699,9 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5697,12 +5710,13 @@ impl super::stub::ApiHubDiscovery for ApiHubDiscovery {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -5721,7 +5735,7 @@ impl std::fmt::Debug for HostProjectRegistrationService {
 }
 
 impl HostProjectRegistrationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5731,13 +5745,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn create_host_project_registration(
         &self,
         req: crate::model::CreateHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HostProjectRegistration>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HostProjectRegistration>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5778,9 +5792,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5795,13 +5809,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn get_host_project_registration(
         &self,
         req: crate::model::GetHostProjectRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HostProjectRegistration>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HostProjectRegistration>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5842,9 +5856,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5859,13 +5873,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn list_host_project_registrations(
         &self,
         req: crate::model::ListHostProjectRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHostProjectRegistrationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHostProjectRegistrationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5906,9 +5920,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5923,13 +5937,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5959,9 +5973,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5976,13 +5990,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6019,9 +6033,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6036,14 +6050,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6085,9 +6098,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6102,13 +6115,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6149,9 +6162,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6166,13 +6179,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6213,9 +6226,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6224,24 +6237,25 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6282,9 +6296,9 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6293,12 +6307,13 @@ impl super::stub::HostProjectRegistrationService for HostProjectRegistrationServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -6317,7 +6332,7 @@ impl std::fmt::Debug for LintingService {
 }
 
 impl LintingService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -6327,13 +6342,13 @@ impl super::stub::LintingService for LintingService {
     async fn get_style_guide(
         &self,
         req: crate::model::GetStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StyleGuide>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StyleGuide>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6376,9 +6391,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6393,13 +6408,13 @@ impl super::stub::LintingService for LintingService {
     async fn update_style_guide(
         &self,
         req: crate::model::UpdateStyleGuideRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StyleGuide>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StyleGuide>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6460,9 +6475,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6477,13 +6492,13 @@ impl super::stub::LintingService for LintingService {
     async fn get_style_guide_contents(
         &self,
         req: crate::model::GetStyleGuideContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StyleGuideContents>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StyleGuideContents>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6526,9 +6541,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6543,13 +6558,13 @@ impl super::stub::LintingService for LintingService {
     async fn lint_spec(
         &self,
         req: crate::model::LintSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6598,9 +6613,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6609,24 +6624,25 @@ impl super::stub::LintingService for LintingService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6656,9 +6672,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6673,13 +6689,13 @@ impl super::stub::LintingService for LintingService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6716,9 +6732,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6733,14 +6749,13 @@ impl super::stub::LintingService for LintingService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6782,9 +6797,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6799,13 +6814,13 @@ impl super::stub::LintingService for LintingService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6846,9 +6861,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6863,13 +6878,13 @@ impl super::stub::LintingService for LintingService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6910,9 +6925,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6921,24 +6936,25 @@ impl super::stub::LintingService for LintingService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6979,9 +6995,9 @@ impl super::stub::LintingService for LintingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6990,12 +7006,13 @@ impl super::stub::LintingService for LintingService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -7014,7 +7031,7 @@ impl std::fmt::Debug for ApiHubPlugin {
 }
 
 impl ApiHubPlugin {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -7024,13 +7041,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn get_plugin(
         &self,
         req: crate::model::GetPluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7071,9 +7088,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7088,13 +7105,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn enable_plugin(
         &self,
         req: crate::model::EnablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7135,9 +7152,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7152,13 +7169,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn disable_plugin(
         &self,
         req: crate::model::DisablePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7199,9 +7216,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7216,13 +7233,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn create_plugin(
         &self,
         req: crate::model::CreatePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Plugin>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Plugin>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7260,9 +7277,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7277,13 +7294,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn list_plugins(
         &self,
         req: crate::model::ListPluginsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPluginsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPluginsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7323,9 +7340,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7340,13 +7357,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn delete_plugin(
         &self,
         req: crate::model::DeletePluginRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7387,9 +7404,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7404,13 +7421,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn create_plugin_instance(
         &self,
         req: crate::model::CreatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7452,9 +7469,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7469,13 +7486,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn execute_plugin_instance_action(
         &self,
         req: crate::model::ExecutePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7520,9 +7537,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7537,13 +7554,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn get_plugin_instance(
         &self,
         req: crate::model::GetPluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PluginInstance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PluginInstance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7588,9 +7605,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7605,13 +7622,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn list_plugin_instances(
         &self,
         req: crate::model::ListPluginInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPluginInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPluginInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7655,9 +7672,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7672,13 +7689,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn enable_plugin_instance_action(
         &self,
         req: crate::model::EnablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7723,9 +7740,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7740,13 +7757,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn disable_plugin_instance_action(
         &self,
         req: crate::model::DisablePluginInstanceActionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7791,9 +7808,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7808,13 +7825,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn update_plugin_instance(
         &self,
         req: crate::model::UpdatePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PluginInstance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PluginInstance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7877,9 +7894,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7894,13 +7911,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn delete_plugin_instance(
         &self,
         req: crate::model::DeletePluginInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7945,9 +7962,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7962,13 +7979,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7998,9 +8015,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8015,13 +8032,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8058,9 +8075,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8075,14 +8092,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8124,9 +8140,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8141,13 +8157,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8188,9 +8204,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8205,13 +8221,13 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8252,9 +8268,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8263,24 +8279,25 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8321,9 +8338,9 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8332,25 +8349,26 @@ impl super::stub::ApiHubPlugin for ApiHubPlugin {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8370,7 +8388,7 @@ impl std::fmt::Debug for Provisioning {
 }
 
 impl Provisioning {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8380,13 +8398,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn create_api_hub_instance(
         &self,
         req: crate::model::CreateApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8424,9 +8442,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8441,13 +8459,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn delete_api_hub_instance(
         &self,
         req: crate::model::DeleteApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8488,9 +8506,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8505,13 +8523,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn get_api_hub_instance(
         &self,
         req: crate::model::GetApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApiHubInstance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApiHubInstance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8552,9 +8570,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8569,13 +8587,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn lookup_api_hub_instance(
         &self,
         req: crate::model::LookupApiHubInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupApiHubInstanceResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupApiHubInstanceResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8612,9 +8630,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8629,13 +8647,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8665,9 +8683,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8682,13 +8700,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8725,9 +8743,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8742,14 +8760,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8791,9 +8808,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8808,13 +8825,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8855,9 +8872,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8872,13 +8889,13 @@ impl super::stub::Provisioning for Provisioning {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8919,9 +8936,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8930,24 +8947,25 @@ impl super::stub::Provisioning for Provisioning {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8988,9 +9006,9 @@ impl super::stub::Provisioning for Provisioning {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8999,25 +9017,26 @@ impl super::stub::Provisioning for Provisioning {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9037,7 +9056,7 @@ impl std::fmt::Debug for RuntimeProjectAttachmentService {
 }
 
 impl RuntimeProjectAttachmentService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -9047,13 +9066,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn create_runtime_project_attachment(
         &self,
         req: crate::model::CreateRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuntimeProjectAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuntimeProjectAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9094,9 +9113,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9111,13 +9130,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn get_runtime_project_attachment(
         &self,
         req: crate::model::GetRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuntimeProjectAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuntimeProjectAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9158,9 +9177,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9175,13 +9194,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn list_runtime_project_attachments(
         &self,
         req: crate::model::ListRuntimeProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimeProjectAttachmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimeProjectAttachmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9222,9 +9241,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9239,13 +9258,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn delete_runtime_project_attachment(
         &self,
         req: crate::model::DeleteRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9286,9 +9305,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9297,24 +9316,25 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn lookup_runtime_project_attachment(
         &self,
         req: crate::model::LookupRuntimeProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupRuntimeProjectAttachmentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupRuntimeProjectAttachmentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9351,9 +9371,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9368,13 +9388,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9404,9 +9424,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9421,13 +9441,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9464,9 +9484,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9481,14 +9501,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9530,9 +9549,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9547,13 +9566,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9594,9 +9613,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9611,13 +9630,13 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9658,9 +9677,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9669,24 +9688,25 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9727,9 +9747,9 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9738,11 +9758,12 @@ impl super::stub::RuntimeProjectAttachmentService for RuntimeProjectAttachmentSe
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/apiregistry/v1/Cargo.toml b/src/generated/cloud/apiregistry/v1/Cargo.toml
index b88afde00c..82b1f8dff3 100644
--- a/src/generated/cloud/apiregistry/v1/Cargo.toml
+++ b/src/generated/cloud/apiregistry/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-location.workspace = true
 lazy_static.workspace           = true
 serde.workspace                 = true
diff --git a/src/generated/cloud/apiregistry/v1/src/builder.rs b/src/generated/cloud/apiregistry/v1/src/builder.rs
index 19d24996df..0974d7e0ed 100644
--- a/src/generated/cloud/apiregistry/v1/src/builder.rs
+++ b/src/generated/cloud/apiregistry/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_api_registry {
     /// A builder for [CloudApiRegistry][crate::client::CloudApiRegistry].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apiregistry_v1::*;
     /// # use builder::cloud_api_registry::ClientBuilder;
     /// # use client::CloudApiRegistry;
@@ -30,19 +30,18 @@ pub mod cloud_api_registry {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudApiRegistry;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudApiRegistry;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_api_registry {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudApiRegistry>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_api_registry {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod cloud_api_registry {
     /// # Example
     /// ```
     /// # use google_cloud_apiregistry_v1::builder::cloud_api_registry::GetMcpServer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apiregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod cloud_api_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod cloud_api_registry {
             (*self.0.stub)
                 .get_mcp_server(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMcpServerRequest::name].
@@ -127,8 +126,8 @@ pub mod cloud_api_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMcpServer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMcpServer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -138,8 +137,8 @@ pub mod cloud_api_registry {
     /// # Example
     /// ```
     /// # use google_cloud_apiregistry_v1::builder::cloud_api_registry::ListMcpServers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apiregistry_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -170,7 +169,7 @@ pub mod cloud_api_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -180,14 +179,16 @@ pub mod cloud_api_registry {
             (*self.0.stub)
                 .list_mcp_servers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMcpServersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMcpServersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -195,15 +196,17 @@ pub mod cloud_api_registry {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMcpServersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMcpServersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -241,8 +244,8 @@ pub mod cloud_api_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMcpServers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMcpServers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +255,7 @@ pub mod cloud_api_registry {
     /// # Example
     /// ```
     /// # use google_cloud_apiregistry_v1::builder::cloud_api_registry::GetMcpTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apiregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -280,7 +283,7 @@ pub mod cloud_api_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -290,7 +293,7 @@ pub mod cloud_api_registry {
             (*self.0.stub)
                 .get_mcp_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMcpToolRequest::name].
@@ -303,8 +306,8 @@ pub mod cloud_api_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMcpTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMcpTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -314,8 +317,8 @@ pub mod cloud_api_registry {
     /// # Example
     /// ```
     /// # use google_cloud_apiregistry_v1::builder::cloud_api_registry::ListMcpTools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apiregistry_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -346,7 +349,7 @@ pub mod cloud_api_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -356,13 +359,13 @@ pub mod cloud_api_registry {
             (*self.0.stub)
                 .list_mcp_tools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMcpToolsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListMcpToolsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -371,15 +374,17 @@ pub mod cloud_api_registry {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMcpToolsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMcpToolsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -417,8 +422,8 @@ pub mod cloud_api_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMcpTools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMcpTools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -428,8 +433,8 @@ pub mod cloud_api_registry {
     /// # Example
     /// ```
     /// # use google_cloud_apiregistry_v1::builder::cloud_api_registry::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apiregistry_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -463,7 +468,7 @@ pub mod cloud_api_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -473,15 +478,15 @@ pub mod cloud_api_registry {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -490,17 +495,17 @@ pub mod cloud_api_registry {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -530,8 +535,8 @@ pub mod cloud_api_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -541,7 +546,7 @@ pub mod cloud_api_registry {
     /// # Example
     /// ```
     /// # use google_cloud_apiregistry_v1::builder::cloud_api_registry::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apiregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -572,7 +577,7 @@ pub mod cloud_api_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -582,7 +587,7 @@ pub mod cloud_api_registry {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -593,8 +598,8 @@ pub mod cloud_api_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/apiregistry/v1/src/client.rs b/src/generated/cloud/apiregistry/v1/src/client.rs
index 5a8e62cbba..79227a8572 100644
--- a/src/generated/cloud/apiregistry/v1/src/client.rs
+++ b/src/generated/cloud/apiregistry/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apiregistry_v1::client::CloudApiRegistry;
 /// let client = CloudApiRegistry::builder().build().await?;
 /// // use `client` to make requests to the Cloud API Registry API.
@@ -67,15 +67,13 @@ impl CloudApiRegistry {
     /// Returns a builder for [CloudApiRegistry].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apiregistry_v1::client::CloudApiRegistry;
     /// let client = CloudApiRegistry::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_api_registry::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cloud_api_registry::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cloud_api_registry::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -93,14 +91,14 @@ impl CloudApiRegistry {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudApiRegistry>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudApiRegistry>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -110,13 +108,13 @@ impl CloudApiRegistry {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudApiRegistry> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudApiRegistry> {
         super::transport::CloudApiRegistry::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudApiRegistry> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudApiRegistry> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudApiRegistry::new)
diff --git a/src/generated/cloud/apiregistry/v1/src/lib.rs b/src/generated/cloud/apiregistry/v1/src/lib.rs
index f77d8bc472..cd53a5963e 100644
--- a/src/generated/cloud/apiregistry/v1/src/lib.rs
+++ b/src/generated/cloud/apiregistry/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/apiregistry/v1/src/model.rs b/src/generated/cloud/apiregistry/v1/src/model.rs
index d88ca206b3..c3ae2deb20 100644
--- a/src/generated/cloud/apiregistry/v1/src/model.rs
+++ b/src/generated/cloud/apiregistry/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate lazy_static;
 extern crate serde;
@@ -613,7 +613,7 @@ impl wkt::message::Message for ListMcpServersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMcpServersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMcpServersResponse {
     type PageItem = crate::model::McpServer;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -841,7 +841,7 @@ impl wkt::message::Message for ListMcpToolsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMcpToolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMcpToolsResponse {
     type PageItem = crate::model::McpTool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/apiregistry/v1/src/stub.rs b/src/generated/cloud/apiregistry/v1/src/stub.rs
index 42634422e2..aa396dd147 100644
--- a/src/generated/cloud/apiregistry/v1/src/stub.rs
+++ b/src/generated/cloud/apiregistry/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     fn get_mcp_server(
         &self,
         _req: crate::model::GetMcpServerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::McpServer>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::McpServer>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     fn list_mcp_servers(
         &self,
         _req: crate::model::ListMcpServersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMcpServersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMcpServersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +63,9 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     fn get_mcp_tool(
         &self,
         _req: crate::model::GetMcpToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::McpTool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::McpTool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +73,9 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     fn list_mcp_tools(
         &self,
         _req: crate::model::ListMcpToolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMcpToolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMcpToolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +84,10 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -99,9 +97,9 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/apiregistry/v1/src/stub/dynamic.rs b/src/generated/cloud/apiregistry/v1/src/stub/dynamic.rs
index 76fd3e50f8..faa6c2a366 100644
--- a/src/generated/cloud/apiregistry/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/apiregistry/v1/src/stub/dynamic.rs
@@ -20,38 +20,38 @@ pub trait CloudApiRegistry: std::fmt::Debug + Send + Sync {
     async fn get_mcp_server(
         &self,
         req: crate::model::GetMcpServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::McpServer>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::McpServer>>;
 
     async fn list_mcp_servers(
         &self,
         req: crate::model::ListMcpServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMcpServersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMcpServersResponse>>;
 
     async fn get_mcp_tool(
         &self,
         req: crate::model::GetMcpToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::McpTool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::McpTool>>;
 
     async fn list_mcp_tools(
         &self,
         req: crate::model::ListMcpToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMcpToolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMcpToolsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 }
 
 /// All implementations of [super::CloudApiRegistry] also implement [CloudApiRegistry].
@@ -61,8 +61,8 @@ impl<T: super::CloudApiRegistry> CloudApiRegistry for T {
     async fn get_mcp_server(
         &self,
         req: crate::model::GetMcpServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::McpServer>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::McpServer>> {
         T::get_mcp_server(self, req, options).await
     }
 
@@ -70,8 +70,8 @@ impl<T: super::CloudApiRegistry> CloudApiRegistry for T {
     async fn list_mcp_servers(
         &self,
         req: crate::model::ListMcpServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMcpServersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMcpServersResponse>> {
         T::list_mcp_servers(self, req, options).await
     }
 
@@ -79,8 +79,8 @@ impl<T: super::CloudApiRegistry> CloudApiRegistry for T {
     async fn get_mcp_tool(
         &self,
         req: crate::model::GetMcpToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::McpTool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::McpTool>> {
         T::get_mcp_tool(self, req, options).await
     }
 
@@ -88,8 +88,8 @@ impl<T: super::CloudApiRegistry> CloudApiRegistry for T {
     async fn list_mcp_tools(
         &self,
         req: crate::model::ListMcpToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMcpToolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMcpToolsResponse>> {
         T::list_mcp_tools(self, req, options).await
     }
 
@@ -97,9 +97,8 @@ impl<T: super::CloudApiRegistry> CloudApiRegistry for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -107,8 +106,8 @@ impl<T: super::CloudApiRegistry> CloudApiRegistry for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/apiregistry/v1/src/tracing.rs b/src/generated/cloud/apiregistry/v1/src/tracing.rs
index 3785578bf7..cc9be88a00 100644
--- a/src/generated/cloud/apiregistry/v1/src/tracing.rs
+++ b/src/generated/cloud/apiregistry/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_mcp_server(
         &self,
         req: crate::model::GetMcpServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::McpServer>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::McpServer>> {
         self.inner.get_mcp_server(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_mcp_servers(
         &self,
         req: crate::model::ListMcpServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMcpServersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMcpServersResponse>> {
         self.inner.list_mcp_servers(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_mcp_tool(
         &self,
         req: crate::model::GetMcpToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::McpTool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::McpTool>> {
         self.inner.get_mcp_tool(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_mcp_tools(
         &self,
         req: crate::model::ListMcpToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMcpToolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMcpToolsResponse>> {
         self.inner.list_mcp_tools(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/apiregistry/v1/src/transport.rs b/src/generated/cloud/apiregistry/v1/src/transport.rs
index 89068ad191..b60e30872e 100644
--- a/src/generated/cloud/apiregistry/v1/src/transport.rs
+++ b/src/generated/cloud/apiregistry/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudApiRegistry](super::stub::CloudApiRegistry) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudApiRegistry {
 }
 
 impl CloudApiRegistry {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
     async fn get_mcp_server(
         &self,
         req: crate::model::GetMcpServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::McpServer>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::McpServer>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
     async fn list_mcp_servers(
         &self,
         req: crate::model::ListMcpServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMcpServersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMcpServersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
     async fn get_mcp_tool(
         &self,
         req: crate::model::GetMcpToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::McpTool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::McpTool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -222,9 +222,9 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -239,13 +239,13 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
     async fn list_mcp_tools(
         &self,
         req: crate::model::ListMcpToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMcpToolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMcpToolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -290,9 +290,9 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -307,13 +307,13 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -343,9 +343,9 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -360,13 +360,13 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -403,9 +403,9 @@ impl super::stub::CloudApiRegistry for CloudApiRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/apphub/v1/Cargo.toml b/src/generated/cloud/apphub/v1/Cargo.toml
index 55689d87ec..d7161bcef4 100644
--- a/src/generated/cloud/apphub/v1/Cargo.toml
+++ b/src/generated/cloud/apphub/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/apphub/v1/src/builder.rs b/src/generated/cloud/apphub/v1/src/builder.rs
index b048ce2ee5..c06963cdf6 100644
--- a/src/generated/cloud/apphub/v1/src/builder.rs
+++ b/src/generated/cloud/apphub/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod app_hub {
     /// A builder for [AppHub][crate::client::AppHub].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apphub_v1::*;
     /// # use builder::app_hub::ClientBuilder;
     /// # use client::AppHub;
@@ -30,19 +30,18 @@ pub mod app_hub {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AppHub;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AppHub;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod app_hub {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AppHub>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod app_hub {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::LookupServiceProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105,7 +104,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115,7 +114,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .lookup_service_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::LookupServiceProjectAttachmentRequest::name].
@@ -128,8 +127,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupServiceProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupServiceProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -139,8 +138,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListServiceProjectAttachments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -174,7 +173,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -184,15 +183,15 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_service_project_attachments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListServiceProjectAttachmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -201,17 +200,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceProjectAttachmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -249,8 +248,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceProjectAttachments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceProjectAttachments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +259,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::CreateServiceProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -292,7 +291,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +306,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .create_service_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service_project_attachment`.
@@ -326,7 +325,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -405,8 +404,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateServiceProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateServiceProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -416,7 +415,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetServiceProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -447,7 +446,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -457,7 +456,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_service_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceProjectAttachmentRequest::name].
@@ -470,8 +469,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -481,7 +480,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::DeleteServiceProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -513,7 +512,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -528,7 +527,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .delete_service_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service_project_attachment`.
@@ -540,7 +539,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -583,8 +582,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteServiceProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteServiceProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -594,7 +593,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::DetachServiceProjectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -625,7 +624,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -635,7 +634,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .detach_service_project_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DetachServiceProjectAttachmentRequest::name].
@@ -648,8 +647,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachServiceProjectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachServiceProjectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -659,8 +658,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListDiscoveredServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -692,7 +691,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -702,15 +701,15 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_discovered_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDiscoveredServicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -719,17 +718,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDiscoveredServicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -767,8 +766,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDiscoveredServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDiscoveredServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -778,7 +777,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetDiscoveredService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -807,7 +806,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -817,7 +816,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_discovered_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDiscoveredServiceRequest::name].
@@ -830,8 +829,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDiscoveredService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDiscoveredService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -841,7 +840,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::LookupDiscoveredService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -872,7 +871,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -882,7 +881,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .lookup_discovered_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::LookupDiscoveredServiceRequest::parent].
@@ -903,8 +902,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupDiscoveredService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupDiscoveredService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -914,8 +913,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -944,7 +943,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -954,13 +953,13 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServicesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListServicesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -969,15 +968,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListServicesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListServicesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1015,8 +1016,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1026,7 +1027,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::CreateService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1053,7 +1054,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1068,7 +1069,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .create_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service`.
@@ -1085,7 +1086,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1158,8 +1159,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1169,7 +1170,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1195,7 +1196,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1205,7 +1206,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceRequest::name].
@@ -1218,8 +1219,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1229,7 +1230,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::UpdateService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1256,7 +1257,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1271,7 +1272,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .update_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_service`.
@@ -1288,7 +1289,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1367,8 +1368,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1378,7 +1379,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::DeleteService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1405,7 +1406,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1420,7 +1421,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .delete_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service`.
@@ -1432,7 +1433,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1475,8 +1476,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1486,8 +1487,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListDiscoveredWorkloads;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1521,7 +1522,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1531,15 +1532,15 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_discovered_workloads(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDiscoveredWorkloadsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1548,17 +1549,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDiscoveredWorkloadsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1596,8 +1597,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDiscoveredWorkloads {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDiscoveredWorkloads {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1607,7 +1608,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetDiscoveredWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1636,7 +1637,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1646,7 +1647,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_discovered_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDiscoveredWorkloadRequest::name].
@@ -1659,8 +1660,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDiscoveredWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDiscoveredWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1670,7 +1671,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::LookupDiscoveredWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1701,7 +1702,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1711,7 +1712,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .lookup_discovered_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::LookupDiscoveredWorkloadRequest::parent].
@@ -1732,8 +1733,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupDiscoveredWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupDiscoveredWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1743,8 +1744,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListWorkloads;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1773,7 +1774,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1783,13 +1784,13 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_workloads(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWorkloadsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListWorkloadsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1798,15 +1799,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListWorkloadsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListWorkloadsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1844,8 +1847,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkloads {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkloads {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1855,7 +1858,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::CreateWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1882,7 +1885,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1897,7 +1900,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .create_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_workload`.
@@ -1914,7 +1917,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1987,8 +1990,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1998,7 +2001,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2024,7 +2027,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2034,7 +2037,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkloadRequest::name].
@@ -2047,8 +2050,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2058,7 +2061,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::UpdateWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2085,7 +2088,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2100,7 +2103,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .update_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_workload`.
@@ -2117,7 +2120,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2196,8 +2199,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2207,7 +2210,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::DeleteWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2234,7 +2237,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2249,7 +2252,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .delete_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_workload`.
@@ -2261,7 +2264,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2304,8 +2307,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2315,8 +2318,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListApplications;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2348,7 +2351,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2358,14 +2361,16 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_applications(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListApplicationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListApplicationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2373,15 +2378,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListApplicationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListApplicationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2419,8 +2426,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListApplications {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListApplications {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2430,7 +2437,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::CreateApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2460,7 +2467,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2475,7 +2482,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .create_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_application`.
@@ -2492,7 +2499,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2565,8 +2572,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2576,7 +2583,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2602,7 +2609,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2612,7 +2619,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetApplicationRequest::name].
@@ -2625,8 +2632,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2636,7 +2643,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::UpdateApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2666,7 +2673,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2681,7 +2688,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .update_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_application`.
@@ -2698,7 +2705,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2777,8 +2784,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2788,7 +2795,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::DeleteApplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2818,7 +2825,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2833,7 +2840,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .delete_application(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_application`.
@@ -2845,7 +2852,7 @@ pub mod app_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2888,8 +2895,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteApplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteApplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2899,8 +2906,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2932,7 +2939,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2942,15 +2949,15 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2959,17 +2966,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2999,8 +3006,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3010,7 +3017,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3039,7 +3046,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3049,7 +3056,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3060,8 +3067,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3071,7 +3078,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3100,7 +3107,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3110,7 +3117,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -3163,8 +3170,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3174,7 +3181,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3203,7 +3210,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3213,7 +3220,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -3244,8 +3251,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3255,7 +3262,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3286,7 +3293,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3296,7 +3303,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -3322,8 +3329,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3333,8 +3340,8 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3368,7 +3375,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3378,15 +3385,15 @@ pub mod app_hub {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3395,17 +3402,17 @@ pub mod app_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3441,8 +3448,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3452,7 +3459,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3481,7 +3488,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3491,7 +3498,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3502,8 +3509,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3513,7 +3520,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3544,7 +3551,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3554,7 +3561,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3565,8 +3572,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3576,7 +3583,7 @@ pub mod app_hub {
     /// # Example
     /// ```
     /// # use google_cloud_apphub_v1::builder::app_hub::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_apphub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3607,7 +3614,7 @@ pub mod app_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3617,7 +3624,7 @@ pub mod app_hub {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3628,8 +3635,8 @@ pub mod app_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/apphub/v1/src/client.rs b/src/generated/cloud/apphub/v1/src/client.rs
index 643f4aebdd..6e7cd3b014 100644
--- a/src/generated/cloud/apphub/v1/src/client.rs
+++ b/src/generated/cloud/apphub/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_apphub_v1::client::AppHub;
 /// let client = AppHub::builder().build().await?;
 /// // use `client` to make requests to the App Hub API.
@@ -66,13 +66,13 @@ impl AppHub {
     /// Returns a builder for [AppHub].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_apphub_v1::client::AppHub;
     /// let client = AppHub::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::app_hub::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::app_hub::client::Factory)
+        crate::new_client_builder(super::builder::app_hub::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl AppHub {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AppHub>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AppHub>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl AppHub {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppHub> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppHub> {
         super::transport::AppHub::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppHub> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppHub> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AppHub::new)
diff --git a/src/generated/cloud/apphub/v1/src/lib.rs b/src/generated/cloud/apphub/v1/src/lib.rs
index ba37e8ebae..2c8a8f2e97 100644
--- a/src/generated/cloud/apphub/v1/src/lib.rs
+++ b/src/generated/cloud/apphub/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/apphub/v1/src/model.rs b/src/generated/cloud/apphub/v1/src/model.rs
index ec71fcbb58..09a73efa6b 100644
--- a/src/generated/cloud/apphub/v1/src/model.rs
+++ b/src/generated/cloud/apphub/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -305,7 +305,9 @@ impl wkt::message::Message for ListServiceProjectAttachmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceProjectAttachmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListServiceProjectAttachmentsResponse
+{
     type PageItem = crate::model::ServiceProjectAttachment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -768,7 +770,7 @@ impl wkt::message::Message for ListServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServicesResponse {
     type PageItem = crate::model::Service;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -957,7 +959,7 @@ impl wkt::message::Message for ListDiscoveredServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDiscoveredServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDiscoveredServicesResponse {
     type PageItem = crate::model::DiscoveredService;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1631,7 +1633,7 @@ impl wkt::message::Message for ListApplicationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListApplicationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListApplicationsResponse {
     type PageItem = crate::model::Application;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2162,7 +2164,7 @@ impl wkt::message::Message for ListWorkloadsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkloadsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkloadsResponse {
     type PageItem = crate::model::Workload;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2351,7 +2353,7 @@ impl wkt::message::Message for ListDiscoveredWorkloadsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDiscoveredWorkloadsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDiscoveredWorkloadsResponse {
     type PageItem = crate::model::DiscoveredWorkload;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/apphub/v1/src/stub.rs b/src/generated/cloud/apphub/v1/src/stub.rs
index d6fba65bf6..9ef88fc21a 100644
--- a/src/generated/cloud/apphub/v1/src/stub.rs
+++ b/src/generated/cloud/apphub/v1/src/stub.rs
@@ -42,10 +42,10 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn lookup_service_project_attachment(
         &self,
         _req: crate::model::LookupServiceProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::LookupServiceProjectAttachmentResponse>,
+            crate::Response<crate::model::LookupServiceProjectAttachmentResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -55,10 +55,10 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_service_project_attachments(
         &self,
         _req: crate::model::ListServiceProjectAttachmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListServiceProjectAttachmentsResponse>,
+            crate::Response<crate::model::ListServiceProjectAttachmentsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -68,9 +68,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn create_service_project_attachment(
         &self,
         _req: crate::model::CreateServiceProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -79,9 +79,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_service_project_attachment(
         &self,
         _req: crate::model::GetServiceProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceProjectAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceProjectAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -90,9 +90,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn delete_service_project_attachment(
         &self,
         _req: crate::model::DeleteServiceProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -101,10 +101,10 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn detach_service_project_attachment(
         &self,
         _req: crate::model::DetachServiceProjectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::DetachServiceProjectAttachmentResponse>,
+            crate::Response<crate::model::DetachServiceProjectAttachmentResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -114,11 +114,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_discovered_services(
         &self,
         _req: crate::model::ListDiscoveredServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDiscoveredServicesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDiscoveredServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -127,9 +125,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_discovered_service(
         &self,
         _req: crate::model::GetDiscoveredServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiscoveredService>>,
+        Output = crate::Result<crate::Response<crate::model::DiscoveredService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -138,11 +136,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn lookup_discovered_service(
         &self,
         _req: crate::model::LookupDiscoveredServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::LookupDiscoveredServiceResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::LookupDiscoveredServiceResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -151,9 +147,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_services(
         &self,
         _req: crate::model::ListServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -162,9 +158,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn create_service(
         &self,
         _req: crate::model::CreateServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -173,10 +169,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_service(
         &self,
         _req: crate::model::GetServiceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Service>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Service>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -184,9 +179,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn update_service(
         &self,
         _req: crate::model::UpdateServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -195,9 +190,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn delete_service(
         &self,
         _req: crate::model::DeleteServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -206,11 +201,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_discovered_workloads(
         &self,
         _req: crate::model::ListDiscoveredWorkloadsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDiscoveredWorkloadsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDiscoveredWorkloadsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -219,9 +212,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_discovered_workload(
         &self,
         _req: crate::model::GetDiscoveredWorkloadRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiscoveredWorkload>>,
+        Output = crate::Result<crate::Response<crate::model::DiscoveredWorkload>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -230,11 +223,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn lookup_discovered_workload(
         &self,
         _req: crate::model::LookupDiscoveredWorkloadRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::LookupDiscoveredWorkloadResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::LookupDiscoveredWorkloadResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -243,9 +234,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_workloads(
         &self,
         _req: crate::model::ListWorkloadsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWorkloadsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -254,9 +245,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn create_workload(
         &self,
         _req: crate::model::CreateWorkloadRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -265,10 +256,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_workload(
         &self,
         _req: crate::model::GetWorkloadRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Workload>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Workload>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -276,9 +266,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn update_workload(
         &self,
         _req: crate::model::UpdateWorkloadRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -287,9 +277,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn delete_workload(
         &self,
         _req: crate::model::DeleteWorkloadRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -298,9 +288,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_applications(
         &self,
         _req: crate::model::ListApplicationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListApplicationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListApplicationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -309,9 +299,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn create_application(
         &self,
         _req: crate::model::CreateApplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -320,10 +310,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_application(
         &self,
         _req: crate::model::GetApplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Application>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Application>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -331,9 +320,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn update_application(
         &self,
         _req: crate::model::UpdateApplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -342,9 +331,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn delete_application(
         &self,
         _req: crate::model::DeleteApplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -353,10 +342,10 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -366,9 +355,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -377,9 +366,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -388,9 +377,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -399,10 +388,10 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -412,10 +401,10 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -425,9 +414,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -436,8 +425,8 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -445,8 +434,8 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -456,9 +445,9 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -467,8 +456,8 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/apphub/v1/src/stub/dynamic.rs b/src/generated/cloud/apphub/v1/src/stub/dynamic.rs
index 81521237bf..4af9a0ed26 100644
--- a/src/generated/cloud/apphub/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/apphub/v1/src/stub/dynamic.rs
@@ -20,232 +20,228 @@ pub trait AppHub: std::fmt::Debug + Send + Sync {
     async fn lookup_service_project_attachment(
         &self,
         req: crate::model::LookupServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupServiceProjectAttachmentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupServiceProjectAttachmentResponse>>;
 
     async fn list_service_project_attachments(
         &self,
         req: crate::model::ListServiceProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceProjectAttachmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceProjectAttachmentsResponse>>;
 
     async fn create_service_project_attachment(
         &self,
         req: crate::model::CreateServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_service_project_attachment(
         &self,
         req: crate::model::GetServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceProjectAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceProjectAttachment>>;
 
     async fn delete_service_project_attachment(
         &self,
         req: crate::model::DeleteServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn detach_service_project_attachment(
         &self,
         req: crate::model::DetachServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DetachServiceProjectAttachmentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DetachServiceProjectAttachmentResponse>>;
 
     async fn list_discovered_services(
         &self,
         req: crate::model::ListDiscoveredServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredServicesResponse>>;
 
     async fn get_discovered_service(
         &self,
         req: crate::model::GetDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredService>>;
 
     async fn lookup_discovered_service(
         &self,
         req: crate::model::LookupDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupDiscoveredServiceResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupDiscoveredServiceResponse>>;
 
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>>;
 
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>>;
 
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_discovered_workloads(
         &self,
         req: crate::model::ListDiscoveredWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredWorkloadsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredWorkloadsResponse>>;
 
     async fn get_discovered_workload(
         &self,
         req: crate::model::GetDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredWorkload>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredWorkload>>;
 
     async fn lookup_discovered_workload(
         &self,
         req: crate::model::LookupDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupDiscoveredWorkloadResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupDiscoveredWorkloadResponse>>;
 
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkloadsResponse>>;
 
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>>;
 
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_applications(
         &self,
         req: crate::model::ListApplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApplicationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApplicationsResponse>>;
 
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Application>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Application>>;
 
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_application(
         &self,
         req: crate::model::DeleteApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AppHub] also implement [AppHub].
@@ -255,9 +251,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn lookup_service_project_attachment(
         &self,
         req: crate::model::LookupServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupServiceProjectAttachmentResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupServiceProjectAttachmentResponse>> {
         T::lookup_service_project_attachment(self, req, options).await
     }
 
@@ -265,9 +260,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_service_project_attachments(
         &self,
         req: crate::model::ListServiceProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceProjectAttachmentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceProjectAttachmentsResponse>> {
         T::list_service_project_attachments(self, req, options).await
     }
 
@@ -275,8 +269,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn create_service_project_attachment(
         &self,
         req: crate::model::CreateServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service_project_attachment(self, req, options).await
     }
 
@@ -284,8 +278,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_service_project_attachment(
         &self,
         req: crate::model::GetServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceProjectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceProjectAttachment>> {
         T::get_service_project_attachment(self, req, options).await
     }
 
@@ -293,8 +287,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn delete_service_project_attachment(
         &self,
         req: crate::model::DeleteServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service_project_attachment(self, req, options).await
     }
 
@@ -302,9 +296,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn detach_service_project_attachment(
         &self,
         req: crate::model::DetachServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DetachServiceProjectAttachmentResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DetachServiceProjectAttachmentResponse>> {
         T::detach_service_project_attachment(self, req, options).await
     }
 
@@ -312,8 +305,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_discovered_services(
         &self,
         req: crate::model::ListDiscoveredServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredServicesResponse>> {
         T::list_discovered_services(self, req, options).await
     }
 
@@ -321,8 +314,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_discovered_service(
         &self,
         req: crate::model::GetDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredService>> {
         T::get_discovered_service(self, req, options).await
     }
 
@@ -330,8 +323,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn lookup_discovered_service(
         &self,
         req: crate::model::LookupDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupDiscoveredServiceResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupDiscoveredServiceResponse>> {
         T::lookup_discovered_service(self, req, options).await
     }
 
@@ -339,8 +332,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>> {
         T::list_services(self, req, options).await
     }
 
@@ -348,8 +341,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service(self, req, options).await
     }
 
@@ -357,8 +350,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>> {
         T::get_service(self, req, options).await
     }
 
@@ -366,8 +359,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_service(self, req, options).await
     }
 
@@ -375,8 +368,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service(self, req, options).await
     }
 
@@ -384,8 +377,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_discovered_workloads(
         &self,
         req: crate::model::ListDiscoveredWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDiscoveredWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDiscoveredWorkloadsResponse>> {
         T::list_discovered_workloads(self, req, options).await
     }
 
@@ -393,8 +386,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_discovered_workload(
         &self,
         req: crate::model::GetDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoveredWorkload>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoveredWorkload>> {
         T::get_discovered_workload(self, req, options).await
     }
 
@@ -402,9 +395,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn lookup_discovered_workload(
         &self,
         req: crate::model::LookupDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupDiscoveredWorkloadResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupDiscoveredWorkloadResponse>> {
         T::lookup_discovered_workload(self, req, options).await
     }
 
@@ -412,8 +404,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         T::list_workloads(self, req, options).await
     }
 
@@ -421,8 +413,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_workload(self, req, options).await
     }
 
@@ -430,8 +422,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>> {
         T::get_workload(self, req, options).await
     }
 
@@ -439,8 +431,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_workload(self, req, options).await
     }
 
@@ -448,8 +440,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_workload(self, req, options).await
     }
 
@@ -457,8 +449,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_applications(
         &self,
         req: crate::model::ListApplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListApplicationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListApplicationsResponse>> {
         T::list_applications(self, req, options).await
     }
 
@@ -466,8 +458,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_application(self, req, options).await
     }
 
@@ -475,8 +467,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Application>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Application>> {
         T::get_application(self, req, options).await
     }
 
@@ -484,8 +476,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_application(self, req, options).await
     }
 
@@ -493,8 +485,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn delete_application(
         &self,
         req: crate::model::DeleteApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_application(self, req, options).await
     }
 
@@ -502,9 +494,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -512,8 +503,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -521,8 +512,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -530,8 +521,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -539,10 +530,9 @@ impl<T: super::AppHub> AppHub for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -550,10 +540,9 @@ impl<T: super::AppHub> AppHub for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -561,8 +550,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -570,8 +559,8 @@ impl<T: super::AppHub> AppHub for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -579,22 +568,22 @@ impl<T: super::AppHub> AppHub for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/apphub/v1/src/tracing.rs b/src/generated/cloud/apphub/v1/src/tracing.rs
index 0ae2704e0a..697079e7cf 100644
--- a/src/generated/cloud/apphub/v1/src/tracing.rs
+++ b/src/generated/cloud/apphub/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn lookup_service_project_attachment(
         &self,
         req: crate::model::LookupServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupServiceProjectAttachmentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupServiceProjectAttachmentResponse>> {
         self.inner
             .lookup_service_project_attachment(req, options)
             .await
@@ -52,8 +52,8 @@ where
     async fn list_service_project_attachments(
         &self,
         req: crate::model::ListServiceProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceProjectAttachmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceProjectAttachmentsResponse>> {
         self.inner
             .list_service_project_attachments(req, options)
             .await
@@ -63,8 +63,8 @@ where
     async fn create_service_project_attachment(
         &self,
         req: crate::model::CreateServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_service_project_attachment(req, options)
             .await
@@ -74,8 +74,8 @@ where
     async fn get_service_project_attachment(
         &self,
         req: crate::model::GetServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceProjectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceProjectAttachment>> {
         self.inner
             .get_service_project_attachment(req, options)
             .await
@@ -85,8 +85,8 @@ where
     async fn delete_service_project_attachment(
         &self,
         req: crate::model::DeleteServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_service_project_attachment(req, options)
             .await
@@ -96,8 +96,8 @@ where
     async fn detach_service_project_attachment(
         &self,
         req: crate::model::DetachServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DetachServiceProjectAttachmentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DetachServiceProjectAttachmentResponse>> {
         self.inner
             .detach_service_project_attachment(req, options)
             .await
@@ -107,8 +107,8 @@ where
     async fn list_discovered_services(
         &self,
         req: crate::model::ListDiscoveredServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredServicesResponse>> {
         self.inner.list_discovered_services(req, options).await
     }
 
@@ -116,8 +116,8 @@ where
     async fn get_discovered_service(
         &self,
         req: crate::model::GetDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredService>> {
         self.inner.get_discovered_service(req, options).await
     }
 
@@ -125,8 +125,8 @@ where
     async fn lookup_discovered_service(
         &self,
         req: crate::model::LookupDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupDiscoveredServiceResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupDiscoveredServiceResponse>> {
         self.inner.lookup_discovered_service(req, options).await
     }
 
@@ -134,8 +134,8 @@ where
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         self.inner.list_services(req, options).await
     }
 
@@ -143,8 +143,8 @@ where
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_service(req, options).await
     }
 
@@ -152,8 +152,8 @@ where
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         self.inner.get_service(req, options).await
     }
 
@@ -161,8 +161,8 @@ where
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_service(req, options).await
     }
 
@@ -170,8 +170,8 @@ where
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_service(req, options).await
     }
 
@@ -179,8 +179,8 @@ where
     async fn list_discovered_workloads(
         &self,
         req: crate::model::ListDiscoveredWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredWorkloadsResponse>> {
         self.inner.list_discovered_workloads(req, options).await
     }
 
@@ -188,8 +188,8 @@ where
     async fn get_discovered_workload(
         &self,
         req: crate::model::GetDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredWorkload>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredWorkload>> {
         self.inner.get_discovered_workload(req, options).await
     }
 
@@ -197,8 +197,8 @@ where
     async fn lookup_discovered_workload(
         &self,
         req: crate::model::LookupDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupDiscoveredWorkloadResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupDiscoveredWorkloadResponse>> {
         self.inner.lookup_discovered_workload(req, options).await
     }
 
@@ -206,8 +206,8 @@ where
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         self.inner.list_workloads(req, options).await
     }
 
@@ -215,8 +215,8 @@ where
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_workload(req, options).await
     }
 
@@ -224,8 +224,8 @@ where
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         self.inner.get_workload(req, options).await
     }
 
@@ -233,8 +233,8 @@ where
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_workload(req, options).await
     }
 
@@ -242,8 +242,8 @@ where
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_workload(req, options).await
     }
 
@@ -251,8 +251,8 @@ where
     async fn list_applications(
         &self,
         req: crate::model::ListApplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApplicationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApplicationsResponse>> {
         self.inner.list_applications(req, options).await
     }
 
@@ -260,8 +260,8 @@ where
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_application(req, options).await
     }
 
@@ -269,8 +269,8 @@ where
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Application>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Application>> {
         self.inner.get_application(req, options).await
     }
 
@@ -278,8 +278,8 @@ where
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_application(req, options).await
     }
 
@@ -287,8 +287,8 @@ where
     async fn delete_application(
         &self,
         req: crate::model::DeleteApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_application(req, options).await
     }
 
@@ -296,8 +296,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -305,8 +305,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -314,8 +314,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -323,8 +323,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -332,9 +332,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -342,9 +341,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -352,8 +350,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -361,8 +359,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -370,22 +368,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/apphub/v1/src/transport.rs b/src/generated/cloud/apphub/v1/src/transport.rs
index 5c317ed027..127ad85538 100644
--- a/src/generated/cloud/apphub/v1/src/transport.rs
+++ b/src/generated/cloud/apphub/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AppHub](super::stub::AppHub) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AppHub {
 }
 
 impl AppHub {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AppHub for AppHub {
     async fn lookup_service_project_attachment(
         &self,
         req: crate::model::LookupServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupServiceProjectAttachmentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupServiceProjectAttachmentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -86,9 +86,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103,13 +103,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_service_project_attachments(
         &self,
         req: crate::model::ListServiceProjectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceProjectAttachmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceProjectAttachmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::AppHub for AppHub {
     async fn create_service_project_attachment(
         &self,
         req: crate::model::CreateServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_service_project_attachment(
         &self,
         req: crate::model::GetServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceProjectAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceProjectAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -279,9 +279,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296,13 +296,13 @@ impl super::stub::AppHub for AppHub {
     async fn delete_service_project_attachment(
         &self,
         req: crate::model::DeleteServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -344,9 +344,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -361,13 +361,13 @@ impl super::stub::AppHub for AppHub {
     async fn detach_service_project_attachment(
         &self,
         req: crate::model::DetachServiceProjectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DetachServiceProjectAttachmentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DetachServiceProjectAttachmentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -404,9 +404,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -421,13 +421,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_discovered_services(
         &self,
         req: crate::model::ListDiscoveredServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -468,9 +468,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -485,13 +485,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_discovered_service(
         &self,
         req: crate::model::GetDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -532,9 +532,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -549,13 +549,13 @@ impl super::stub::AppHub for AppHub {
     async fn lookup_discovered_service(
         &self,
         req: crate::model::LookupDiscoveredServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupDiscoveredServiceResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupDiscoveredServiceResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -593,9 +593,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -610,13 +610,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -661,9 +661,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -678,13 +678,13 @@ impl super::stub::AppHub for AppHub {
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -727,9 +727,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -744,13 +744,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -795,9 +795,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -812,13 +812,13 @@ impl super::stub::AppHub for AppHub {
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -882,9 +882,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -899,13 +899,13 @@ impl super::stub::AppHub for AppHub {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -951,9 +951,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -968,13 +968,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_discovered_workloads(
         &self,
         req: crate::model::ListDiscoveredWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDiscoveredWorkloadsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDiscoveredWorkloadsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1015,9 +1015,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1032,13 +1032,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_discovered_workload(
         &self,
         req: crate::model::GetDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoveredWorkload>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoveredWorkload>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1079,9 +1079,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1096,13 +1096,13 @@ impl super::stub::AppHub for AppHub {
     async fn lookup_discovered_workload(
         &self,
         req: crate::model::LookupDiscoveredWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupDiscoveredWorkloadResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupDiscoveredWorkloadResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1140,9 +1140,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1157,13 +1157,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1208,9 +1208,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1225,13 +1225,13 @@ impl super::stub::AppHub for AppHub {
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1274,9 +1274,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1291,13 +1291,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1342,9 +1342,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1359,13 +1359,13 @@ impl super::stub::AppHub for AppHub {
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1429,9 +1429,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1446,13 +1446,13 @@ impl super::stub::AppHub for AppHub {
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1498,9 +1498,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1515,13 +1515,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_applications(
         &self,
         req: crate::model::ListApplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListApplicationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListApplicationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1562,9 +1562,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1579,13 +1579,13 @@ impl super::stub::AppHub for AppHub {
     async fn create_application(
         &self,
         req: crate::model::CreateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1624,9 +1624,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1641,13 +1641,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_application(
         &self,
         req: crate::model::GetApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Application>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Application>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1688,9 +1688,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1705,13 +1705,13 @@ impl super::stub::AppHub for AppHub {
     async fn update_application(
         &self,
         req: crate::model::UpdateApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1771,9 +1771,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1788,13 +1788,13 @@ impl super::stub::AppHub for AppHub {
     async fn delete_application(
         &self,
         req: crate::model::DeleteApplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1836,9 +1836,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1853,13 +1853,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1889,9 +1889,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1906,13 +1906,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1949,9 +1949,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1966,13 +1966,13 @@ impl super::stub::AppHub for AppHub {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2013,9 +2013,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2030,13 +2030,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2089,9 +2089,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2106,14 +2106,13 @@ impl super::stub::AppHub for AppHub {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2154,9 +2153,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2171,14 +2170,13 @@ impl super::stub::AppHub for AppHub {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2220,9 +2218,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2237,13 +2235,13 @@ impl super::stub::AppHub for AppHub {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2284,9 +2282,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2301,13 +2299,13 @@ impl super::stub::AppHub for AppHub {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2348,9 +2346,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2359,24 +2357,25 @@ impl super::stub::AppHub for AppHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2417,9 +2416,9 @@ impl super::stub::AppHub for AppHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2428,25 +2427,26 @@ impl super::stub::AppHub for AppHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/asset/v1/Cargo.toml b/src/generated/cloud/asset/v1/Cargo.toml
index 1b693313d2..362c925fed 100644
--- a/src/generated/cloud/asset/v1/Cargo.toml
+++ b/src/generated/cloud/asset/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace                                   = true
 bytes.workspace                                         = true
-gax.workspace                                           = true
 gaxi                                                    = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace                              = true
 google-cloud-iam-v1.workspace                           = true
 google-cloud-identity-accesscontextmanager-v1.workspace = true
 google-cloud-longrunning.workspace                      = true
diff --git a/src/generated/cloud/asset/v1/src/builder.rs b/src/generated/cloud/asset/v1/src/builder.rs
index 827e2d6fd1..ea9151e548 100644
--- a/src/generated/cloud/asset/v1/src/builder.rs
+++ b/src/generated/cloud/asset/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod asset_service {
     /// A builder for [AssetService][crate::client::AssetService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_asset_v1::*;
     /// # use builder::asset_service::ClientBuilder;
     /// # use client::AssetService;
@@ -30,19 +30,18 @@ pub mod asset_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AssetService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AssetService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod asset_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AssetService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod asset_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::ExportAssets;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -105,7 +104,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120,7 +119,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .export_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_assets`.
@@ -139,7 +138,7 @@ pub mod asset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -244,8 +243,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -255,8 +254,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::ListAssets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -287,7 +286,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -297,13 +296,13 @@ pub mod asset_service {
             (*self.0.stub)
                 .list_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAssetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAssetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -312,15 +311,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAssetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAssetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -392,8 +393,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -403,7 +404,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::BatchGetAssetsHistory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -434,7 +435,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -444,7 +445,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .batch_get_assets_history(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchGetAssetsHistoryRequest::parent].
@@ -503,8 +504,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchGetAssetsHistory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchGetAssetsHistory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -514,7 +515,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::CreateFeed;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -542,7 +543,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -552,7 +553,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .create_feed(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateFeedRequest::parent].
@@ -595,8 +596,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeed {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeed {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -606,7 +607,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::GetFeed;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -634,7 +635,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -644,7 +645,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .get_feed(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeedRequest::name].
@@ -657,8 +658,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeed {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeed {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -668,7 +669,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::ListFeeds;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -696,7 +697,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -706,7 +707,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .list_feeds(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListFeedsRequest::parent].
@@ -719,8 +720,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeeds {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeeds {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -730,7 +731,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::UpdateFeed;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -758,7 +759,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -768,7 +769,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .update_feed(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feed][crate::model::UpdateFeedRequest::feed].
@@ -817,8 +818,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeed {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeed {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -828,7 +829,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::DeleteFeed;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -856,7 +857,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -866,7 +867,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .delete_feed(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteFeedRequest::name].
@@ -879,8 +880,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeed {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeed {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -890,8 +891,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::SearchAllResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -925,7 +926,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -935,14 +936,16 @@ pub mod asset_service {
             (*self.0.stub)
                 .search_all_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchAllResourcesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchAllResourcesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -950,17 +953,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchAllResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1027,8 +1030,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchAllResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchAllResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1038,8 +1041,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::SearchAllIamPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1073,7 +1076,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1083,14 +1086,16 @@ pub mod asset_service {
             (*self.0.stub)
                 .search_all_iam_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchAllIamPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchAllIamPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1098,17 +1103,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchAllIamPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1157,8 +1162,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchAllIamPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchAllIamPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1168,7 +1173,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::AnalyzeIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1199,7 +1204,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1209,7 +1214,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .analyze_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [analysis_query][crate::model::AnalyzeIamPolicyRequest::analysis_query].
@@ -1260,8 +1265,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1271,7 +1276,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::AnalyzeIamPolicyLongrunning;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1305,7 +1310,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1320,7 +1325,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .analyze_iam_policy_longrunning(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `analyze_iam_policy_longrunning`.
@@ -1339,7 +1344,7 @@ pub mod asset_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1418,8 +1423,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeIamPolicyLongrunning {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeIamPolicyLongrunning {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1429,7 +1434,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::AnalyzeMove;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1457,7 +1462,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1467,7 +1472,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .analyze_move(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][crate::model::AnalyzeMoveRequest::resource].
@@ -1497,8 +1502,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeMove {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeMove {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1508,7 +1513,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::QueryAssets;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1536,7 +1541,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1546,7 +1551,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .query_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::QueryAssetsRequest::parent].
@@ -1682,8 +1687,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1693,7 +1698,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::CreateSavedQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1724,7 +1729,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1734,7 +1739,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .create_saved_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSavedQueryRequest::parent].
@@ -1777,8 +1782,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSavedQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSavedQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1788,7 +1793,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::GetSavedQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1816,7 +1821,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1826,7 +1831,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .get_saved_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSavedQueryRequest::name].
@@ -1839,8 +1844,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSavedQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSavedQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1850,8 +1855,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::ListSavedQueries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1885,7 +1890,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1895,14 +1900,16 @@ pub mod asset_service {
             (*self.0.stub)
                 .list_saved_queries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSavedQueriesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSavedQueriesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1910,15 +1917,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSavedQueriesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSavedQueriesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1950,8 +1959,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSavedQueries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSavedQueries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1961,7 +1970,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::UpdateSavedQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1992,7 +2001,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2002,7 +2011,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .update_saved_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [saved_query][crate::model::UpdateSavedQueryRequest::saved_query].
@@ -2051,8 +2060,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSavedQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSavedQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2062,7 +2071,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::DeleteSavedQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2093,7 +2102,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2103,7 +2112,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .delete_saved_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSavedQueryRequest::name].
@@ -2116,8 +2125,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSavedQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSavedQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2127,7 +2136,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::BatchGetEffectiveIamPolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2160,7 +2169,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2170,7 +2179,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .batch_get_effective_iam_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [scope][crate::model::BatchGetEffectiveIamPoliciesRequest::scope].
@@ -2196,8 +2205,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchGetEffectiveIamPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchGetEffectiveIamPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2207,8 +2216,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::AnalyzeOrgPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2242,7 +2251,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2252,14 +2261,16 @@ pub mod asset_service {
             (*self.0.stub)
                 .analyze_org_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AnalyzeOrgPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::AnalyzeOrgPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2267,17 +2278,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::AnalyzeOrgPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2329,8 +2340,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeOrgPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeOrgPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2340,8 +2351,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::AnalyzeOrgPolicyGovernedContainers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2377,7 +2388,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2389,15 +2400,15 @@ pub mod asset_service {
             (*self.0.stub)
                 .analyze_org_policy_governed_containers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::AnalyzeOrgPolicyGovernedContainersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2406,17 +2417,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::AnalyzeOrgPolicyGovernedContainersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2468,8 +2479,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeOrgPolicyGovernedContainers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeOrgPolicyGovernedContainers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2479,8 +2490,8 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::AnalyzeOrgPolicyGovernedAssets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2516,7 +2527,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2526,15 +2537,15 @@ pub mod asset_service {
             (*self.0.stub)
                 .analyze_org_policy_governed_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::AnalyzeOrgPolicyGovernedAssetsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2543,17 +2554,17 @@ pub mod asset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::AnalyzeOrgPolicyGovernedAssetsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2605,8 +2616,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeOrgPolicyGovernedAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeOrgPolicyGovernedAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2616,7 +2627,7 @@ pub mod asset_service {
     /// # Example
     /// ```
     /// # use google_cloud_asset_v1::builder::asset_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_asset_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2647,7 +2658,7 @@ pub mod asset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2657,7 +2668,7 @@ pub mod asset_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2668,8 +2679,8 @@ pub mod asset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/asset/v1/src/client.rs b/src/generated/cloud/asset/v1/src/client.rs
index d053d3909f..29c1d2ca14 100644
--- a/src/generated/cloud/asset/v1/src/client.rs
+++ b/src/generated/cloud/asset/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_asset_v1::client::AssetService;
 /// let client = AssetService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Asset API.
@@ -66,13 +66,13 @@ impl AssetService {
     /// Returns a builder for [AssetService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_asset_v1::client::AssetService;
     /// let client = AssetService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::asset_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::asset_service::client::Factory)
+        crate::new_client_builder(super::builder::asset_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl AssetService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AssetService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AssetService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl AssetService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AssetService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AssetService> {
         super::transport::AssetService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AssetService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AssetService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AssetService::new)
diff --git a/src/generated/cloud/asset/v1/src/lib.rs b/src/generated/cloud/asset/v1/src/lib.rs
index 5bb21b1c1d..beb22a09f3 100644
--- a/src/generated/cloud/asset/v1/src/lib.rs
+++ b/src/generated/cloud/asset/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/asset/v1/src/model.rs b/src/generated/cloud/asset/v1/src/model.rs
index 5674718677..a114403c14 100644
--- a/src/generated/cloud/asset/v1/src/model.rs
+++ b/src/generated/cloud/asset/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_identity_accesscontextmanager_v1;
 extern crate google_cloud_longrunning;
@@ -784,7 +784,7 @@ impl wkt::message::Message for ListAssetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAssetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAssetsResponse {
     type PageItem = crate::model::Asset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2853,7 +2853,7 @@ impl wkt::message::Message for SearchAllResourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchAllResourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchAllResourcesResponse {
     type PageItem = crate::model::ResourceSearchResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3128,7 +3128,7 @@ impl wkt::message::Message for SearchAllIamPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchAllIamPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchAllIamPoliciesResponse {
     type PageItem = crate::model::IamPolicySearchResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5444,7 +5444,7 @@ impl wkt::message::Message for ListSavedQueriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSavedQueriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSavedQueriesResponse {
     type PageItem = crate::model::SavedQuery;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9301,7 +9301,7 @@ impl wkt::message::Message for AnalyzeOrgPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AnalyzeOrgPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for AnalyzeOrgPoliciesResponse {
     type PageItem = crate::model::analyze_org_policies_response::OrgPolicyResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9718,7 +9718,9 @@ impl wkt::message::Message for AnalyzeOrgPolicyGovernedContainersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AnalyzeOrgPolicyGovernedContainersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for AnalyzeOrgPolicyGovernedContainersResponse
+{
     type PageItem =
         crate::model::analyze_org_policy_governed_containers_response::GovernedContainer;
 
@@ -10221,7 +10223,9 @@ impl wkt::message::Message for AnalyzeOrgPolicyGovernedAssetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AnalyzeOrgPolicyGovernedAssetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for AnalyzeOrgPolicyGovernedAssetsResponse
+{
     type PageItem = crate::model::analyze_org_policy_governed_assets_response::GovernedAsset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/asset/v1/src/stub.rs b/src/generated/cloud/asset/v1/src/stub.rs
index c4f9944b95..e28987732b 100644
--- a/src/generated/cloud/asset/v1/src/stub.rs
+++ b/src/generated/cloud/asset/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn export_assets(
         &self,
         _req: crate::model::ExportAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn list_assets(
         &self,
         _req: crate::model::ListAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAssetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAssetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,11 +64,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn batch_get_assets_history(
         &self,
         _req: crate::model::BatchGetAssetsHistoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::BatchGetAssetsHistoryResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::BatchGetAssetsHistoryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,10 +75,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn create_feed(
         &self,
         _req: crate::model::CreateFeedRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feed>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feed>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -88,10 +85,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn get_feed(
         &self,
         _req: crate::model::GetFeedRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feed>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feed>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -99,9 +95,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn list_feeds(
         &self,
         _req: crate::model::ListFeedsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeedsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeedsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,10 +106,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn update_feed(
         &self,
         _req: crate::model::UpdateFeedRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feed>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feed>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -121,8 +116,8 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn delete_feed(
         &self,
         _req: crate::model::DeleteFeedRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -130,9 +125,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn search_all_resources(
         &self,
         _req: crate::model::SearchAllResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchAllResourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchAllResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +136,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn search_all_iam_policies(
         &self,
         _req: crate::model::SearchAllIamPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchAllIamPoliciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchAllIamPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +147,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn analyze_iam_policy(
         &self,
         _req: crate::model::AnalyzeIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalyzeIamPolicyResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnalyzeIamPolicyResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +158,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn analyze_iam_policy_longrunning(
         &self,
         _req: crate::model::AnalyzeIamPolicyLongrunningRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +169,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn analyze_move(
         &self,
         _req: crate::model::AnalyzeMoveRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalyzeMoveResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnalyzeMoveResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,9 +180,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn query_assets(
         &self,
         _req: crate::model::QueryAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryAssetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::QueryAssetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -196,10 +191,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn create_saved_query(
         &self,
         _req: crate::model::CreateSavedQueryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SavedQuery>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SavedQuery>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -207,10 +201,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn get_saved_query(
         &self,
         _req: crate::model::GetSavedQueryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SavedQuery>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SavedQuery>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -218,9 +211,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn list_saved_queries(
         &self,
         _req: crate::model::ListSavedQueriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSavedQueriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSavedQueriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -229,10 +222,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn update_saved_query(
         &self,
         _req: crate::model::UpdateSavedQueryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SavedQuery>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SavedQuery>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -240,8 +232,8 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn delete_saved_query(
         &self,
         _req: crate::model::DeleteSavedQueryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -249,11 +241,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn batch_get_effective_iam_policies(
         &self,
         _req: crate::model::BatchGetEffectiveIamPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -262,9 +252,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn analyze_org_policies(
         &self,
         _req: crate::model::AnalyzeOrgPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalyzeOrgPoliciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnalyzeOrgPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -273,10 +263,10 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn analyze_org_policy_governed_containers(
         &self,
         _req: crate::model::AnalyzeOrgPolicyGovernedContainersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>,
+            crate::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -286,10 +276,10 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn analyze_org_policy_governed_assets(
         &self,
         _req: crate::model::AnalyzeOrgPolicyGovernedAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>,
+            crate::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -299,9 +289,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -312,9 +302,9 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -323,8 +313,8 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/asset/v1/src/stub/dynamic.rs b/src/generated/cloud/asset/v1/src/stub/dynamic.rs
index 1566fc6220..07c929d392 100644
--- a/src/generated/cloud/asset/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/asset/v1/src/stub/dynamic.rs
@@ -20,158 +20,156 @@ pub trait AssetService: std::fmt::Debug + Send + Sync {
     async fn export_assets(
         &self,
         req: crate::model::ExportAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssetsResponse>>;
 
     async fn batch_get_assets_history(
         &self,
         req: crate::model::BatchGetAssetsHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetAssetsHistoryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetAssetsHistoryResponse>>;
 
     async fn create_feed(
         &self,
         req: crate::model::CreateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feed>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feed>>;
 
     async fn get_feed(
         &self,
         req: crate::model::GetFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feed>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feed>>;
 
     async fn list_feeds(
         &self,
         req: crate::model::ListFeedsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeedsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeedsResponse>>;
 
     async fn update_feed(
         &self,
         req: crate::model::UpdateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feed>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feed>>;
 
     async fn delete_feed(
         &self,
         req: crate::model::DeleteFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn search_all_resources(
         &self,
         req: crate::model::SearchAllResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAllResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAllResourcesResponse>>;
 
     async fn search_all_iam_policies(
         &self,
         req: crate::model::SearchAllIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAllIamPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAllIamPoliciesResponse>>;
 
     async fn analyze_iam_policy(
         &self,
         req: crate::model::AnalyzeIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeIamPolicyResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeIamPolicyResponse>>;
 
     async fn analyze_iam_policy_longrunning(
         &self,
         req: crate::model::AnalyzeIamPolicyLongrunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn analyze_move(
         &self,
         req: crate::model::AnalyzeMoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeMoveResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeMoveResponse>>;
 
     async fn query_assets(
         &self,
         req: crate::model::QueryAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryAssetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryAssetsResponse>>;
 
     async fn create_saved_query(
         &self,
         req: crate::model::CreateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SavedQuery>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SavedQuery>>;
 
     async fn get_saved_query(
         &self,
         req: crate::model::GetSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SavedQuery>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SavedQuery>>;
 
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSavedQueriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSavedQueriesResponse>>;
 
     async fn update_saved_query(
         &self,
         req: crate::model::UpdateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SavedQuery>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SavedQuery>>;
 
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn batch_get_effective_iam_policies(
         &self,
         req: crate::model::BatchGetEffectiveIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>>;
 
     async fn analyze_org_policies(
         &self,
         req: crate::model::AnalyzeOrgPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeOrgPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeOrgPoliciesResponse>>;
 
     async fn analyze_org_policy_governed_containers(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedContainersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>>;
 
     async fn analyze_org_policy_governed_assets(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AssetService] also implement [AssetService].
@@ -181,8 +179,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn export_assets(
         &self,
         req: crate::model::ExportAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_assets(self, req, options).await
     }
 
@@ -190,8 +188,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssetsResponse>> {
         T::list_assets(self, req, options).await
     }
 
@@ -199,8 +197,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn batch_get_assets_history(
         &self,
         req: crate::model::BatchGetAssetsHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetAssetsHistoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetAssetsHistoryResponse>> {
         T::batch_get_assets_history(self, req, options).await
     }
 
@@ -208,8 +206,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn create_feed(
         &self,
         req: crate::model::CreateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feed>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feed>> {
         T::create_feed(self, req, options).await
     }
 
@@ -217,8 +215,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn get_feed(
         &self,
         req: crate::model::GetFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feed>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feed>> {
         T::get_feed(self, req, options).await
     }
 
@@ -226,8 +224,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn list_feeds(
         &self,
         req: crate::model::ListFeedsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeedsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeedsResponse>> {
         T::list_feeds(self, req, options).await
     }
 
@@ -235,8 +233,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn update_feed(
         &self,
         req: crate::model::UpdateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feed>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feed>> {
         T::update_feed(self, req, options).await
     }
 
@@ -244,8 +242,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn delete_feed(
         &self,
         req: crate::model::DeleteFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_feed(self, req, options).await
     }
 
@@ -253,8 +251,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn search_all_resources(
         &self,
         req: crate::model::SearchAllResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAllResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAllResourcesResponse>> {
         T::search_all_resources(self, req, options).await
     }
 
@@ -262,8 +260,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn search_all_iam_policies(
         &self,
         req: crate::model::SearchAllIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAllIamPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAllIamPoliciesResponse>> {
         T::search_all_iam_policies(self, req, options).await
     }
 
@@ -271,8 +269,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn analyze_iam_policy(
         &self,
         req: crate::model::AnalyzeIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeIamPolicyResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeIamPolicyResponse>> {
         T::analyze_iam_policy(self, req, options).await
     }
 
@@ -280,8 +278,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn analyze_iam_policy_longrunning(
         &self,
         req: crate::model::AnalyzeIamPolicyLongrunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::analyze_iam_policy_longrunning(self, req, options).await
     }
 
@@ -289,8 +287,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn analyze_move(
         &self,
         req: crate::model::AnalyzeMoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeMoveResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeMoveResponse>> {
         T::analyze_move(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn query_assets(
         &self,
         req: crate::model::QueryAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryAssetsResponse>> {
         T::query_assets(self, req, options).await
     }
 
@@ -307,8 +305,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn create_saved_query(
         &self,
         req: crate::model::CreateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SavedQuery>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SavedQuery>> {
         T::create_saved_query(self, req, options).await
     }
 
@@ -316,8 +314,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn get_saved_query(
         &self,
         req: crate::model::GetSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SavedQuery>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SavedQuery>> {
         T::get_saved_query(self, req, options).await
     }
 
@@ -325,8 +323,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSavedQueriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSavedQueriesResponse>> {
         T::list_saved_queries(self, req, options).await
     }
 
@@ -334,8 +332,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn update_saved_query(
         &self,
         req: crate::model::UpdateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SavedQuery>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SavedQuery>> {
         T::update_saved_query(self, req, options).await
     }
 
@@ -343,8 +341,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_saved_query(self, req, options).await
     }
 
@@ -352,9 +350,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn batch_get_effective_iam_policies(
         &self,
         req: crate::model::BatchGetEffectiveIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>> {
         T::batch_get_effective_iam_policies(self, req, options).await
     }
 
@@ -362,8 +359,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn analyze_org_policies(
         &self,
         req: crate::model::AnalyzeOrgPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeOrgPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeOrgPoliciesResponse>> {
         T::analyze_org_policies(self, req, options).await
     }
 
@@ -371,10 +368,9 @@ impl<T: super::AssetService> AssetService for T {
     async fn analyze_org_policy_governed_containers(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedContainersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>>
+    {
         T::analyze_org_policy_governed_containers(self, req, options).await
     }
 
@@ -382,9 +378,8 @@ impl<T: super::AssetService> AssetService for T {
     async fn analyze_org_policy_governed_assets(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>> {
         T::analyze_org_policy_governed_assets(self, req, options).await
     }
 
@@ -392,22 +387,22 @@ impl<T: super::AssetService> AssetService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/asset/v1/src/tracing.rs b/src/generated/cloud/asset/v1/src/tracing.rs
index 50b65a5d7b..ae103e2f72 100644
--- a/src/generated/cloud/asset/v1/src/tracing.rs
+++ b/src/generated/cloud/asset/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn export_assets(
         &self,
         req: crate::model::ExportAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_assets(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssetsResponse>> {
         self.inner.list_assets(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn batch_get_assets_history(
         &self,
         req: crate::model::BatchGetAssetsHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetAssetsHistoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetAssetsHistoryResponse>> {
         self.inner.batch_get_assets_history(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn create_feed(
         &self,
         req: crate::model::CreateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feed>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feed>> {
         self.inner.create_feed(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_feed(
         &self,
         req: crate::model::GetFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feed>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feed>> {
         self.inner.get_feed(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_feeds(
         &self,
         req: crate::model::ListFeedsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeedsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeedsResponse>> {
         self.inner.list_feeds(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn update_feed(
         &self,
         req: crate::model::UpdateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feed>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feed>> {
         self.inner.update_feed(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn delete_feed(
         &self,
         req: crate::model::DeleteFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_feed(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn search_all_resources(
         &self,
         req: crate::model::SearchAllResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAllResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAllResourcesResponse>> {
         self.inner.search_all_resources(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn search_all_iam_policies(
         &self,
         req: crate::model::SearchAllIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAllIamPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAllIamPoliciesResponse>> {
         self.inner.search_all_iam_policies(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn analyze_iam_policy(
         &self,
         req: crate::model::AnalyzeIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeIamPolicyResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeIamPolicyResponse>> {
         self.inner.analyze_iam_policy(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn analyze_iam_policy_longrunning(
         &self,
         req: crate::model::AnalyzeIamPolicyLongrunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .analyze_iam_policy_longrunning(req, options)
             .await
@@ -151,8 +151,8 @@ where
     async fn analyze_move(
         &self,
         req: crate::model::AnalyzeMoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeMoveResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeMoveResponse>> {
         self.inner.analyze_move(req, options).await
     }
 
@@ -160,8 +160,8 @@ where
     async fn query_assets(
         &self,
         req: crate::model::QueryAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryAssetsResponse>> {
         self.inner.query_assets(req, options).await
     }
 
@@ -169,8 +169,8 @@ where
     async fn create_saved_query(
         &self,
         req: crate::model::CreateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SavedQuery>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SavedQuery>> {
         self.inner.create_saved_query(req, options).await
     }
 
@@ -178,8 +178,8 @@ where
     async fn get_saved_query(
         &self,
         req: crate::model::GetSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SavedQuery>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SavedQuery>> {
         self.inner.get_saved_query(req, options).await
     }
 
@@ -187,8 +187,8 @@ where
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSavedQueriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSavedQueriesResponse>> {
         self.inner.list_saved_queries(req, options).await
     }
 
@@ -196,8 +196,8 @@ where
     async fn update_saved_query(
         &self,
         req: crate::model::UpdateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SavedQuery>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SavedQuery>> {
         self.inner.update_saved_query(req, options).await
     }
 
@@ -205,8 +205,8 @@ where
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_saved_query(req, options).await
     }
 
@@ -214,8 +214,8 @@ where
     async fn batch_get_effective_iam_policies(
         &self,
         req: crate::model::BatchGetEffectiveIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>> {
         self.inner
             .batch_get_effective_iam_policies(req, options)
             .await
@@ -225,8 +225,8 @@ where
     async fn analyze_org_policies(
         &self,
         req: crate::model::AnalyzeOrgPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeOrgPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeOrgPoliciesResponse>> {
         self.inner.analyze_org_policies(req, options).await
     }
 
@@ -234,9 +234,8 @@ where
     async fn analyze_org_policy_governed_containers(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedContainersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>> {
         self.inner
             .analyze_org_policy_governed_containers(req, options)
             .await
@@ -246,8 +245,8 @@ where
     async fn analyze_org_policy_governed_assets(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>> {
         self.inner
             .analyze_org_policy_governed_assets(req, options)
             .await
@@ -257,22 +256,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/asset/v1/src/transport.rs b/src/generated/cloud/asset/v1/src/transport.rs
index 5c8f02d35c..ecc8bb4acd 100644
--- a/src/generated/cloud/asset/v1/src/transport.rs
+++ b/src/generated/cloud/asset/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AssetService](super::stub::AssetService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AssetService {
 }
 
 impl AssetService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AssetService for AssetService {
     async fn export_assets(
         &self,
         req: crate::model::ExportAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -84,9 +84,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -101,13 +101,13 @@ impl super::stub::AssetService for AssetService {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -164,9 +164,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -181,13 +181,13 @@ impl super::stub::AssetService for AssetService {
     async fn batch_get_assets_history(
         &self,
         req: crate::model::BatchGetAssetsHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetAssetsHistoryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetAssetsHistoryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -242,9 +242,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -259,13 +259,13 @@ impl super::stub::AssetService for AssetService {
     async fn create_feed(
         &self,
         req: crate::model::CreateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feed>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feed>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -300,9 +300,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -317,13 +317,13 @@ impl super::stub::AssetService for AssetService {
     async fn get_feed(
         &self,
         req: crate::model::GetFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feed>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feed>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -362,9 +362,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -379,13 +379,13 @@ impl super::stub::AssetService for AssetService {
     async fn list_feeds(
         &self,
         req: crate::model::ListFeedsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeedsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeedsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -420,9 +420,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -437,13 +437,13 @@ impl super::stub::AssetService for AssetService {
     async fn update_feed(
         &self,
         req: crate::model::UpdateFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feed>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feed>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -488,9 +488,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -505,13 +505,13 @@ impl super::stub::AssetService for AssetService {
     async fn delete_feed(
         &self,
         req: crate::model::DeleteFeedRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -550,9 +550,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -561,24 +561,25 @@ impl super::stub::AssetService for AssetService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn search_all_resources(
         &self,
         req: crate::model::SearchAllResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAllResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAllResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -633,9 +634,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -650,13 +651,13 @@ impl super::stub::AssetService for AssetService {
     async fn search_all_iam_policies(
         &self,
         req: crate::model::SearchAllIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAllIamPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAllIamPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -699,9 +700,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -716,13 +717,13 @@ impl super::stub::AssetService for AssetService {
     async fn analyze_iam_policy(
         &self,
         req: crate::model::AnalyzeIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeIamPolicyResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeIamPolicyResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -787,9 +788,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -804,13 +805,13 @@ impl super::stub::AssetService for AssetService {
     async fn analyze_iam_policy_longrunning(
         &self,
         req: crate::model::AnalyzeIamPolicyLongrunningRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -851,9 +852,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -868,13 +869,13 @@ impl super::stub::AssetService for AssetService {
     async fn analyze_move(
         &self,
         req: crate::model::AnalyzeMoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeMoveResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeMoveResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -911,9 +912,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -928,13 +929,13 @@ impl super::stub::AssetService for AssetService {
     async fn query_assets(
         &self,
         req: crate::model::QueryAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryAssetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryAssetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -969,9 +970,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -986,13 +987,13 @@ impl super::stub::AssetService for AssetService {
     async fn create_saved_query(
         &self,
         req: crate::model::CreateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SavedQuery>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SavedQuery>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1028,9 +1029,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1045,13 +1046,13 @@ impl super::stub::AssetService for AssetService {
     async fn get_saved_query(
         &self,
         req: crate::model::GetSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SavedQuery>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SavedQuery>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1090,9 +1091,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1107,13 +1108,13 @@ impl super::stub::AssetService for AssetService {
     async fn list_saved_queries(
         &self,
         req: crate::model::ListSavedQueriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSavedQueriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSavedQueriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1151,9 +1152,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1168,13 +1169,13 @@ impl super::stub::AssetService for AssetService {
     async fn update_saved_query(
         &self,
         req: crate::model::UpdateSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SavedQuery>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SavedQuery>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1231,9 +1232,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1248,13 +1249,13 @@ impl super::stub::AssetService for AssetService {
     async fn delete_saved_query(
         &self,
         req: crate::model::DeleteSavedQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1293,9 +1294,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1304,24 +1305,25 @@ impl super::stub::AssetService for AssetService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn batch_get_effective_iam_policies(
         &self,
         req: crate::model::BatchGetEffectiveIamPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetEffectiveIamPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1360,9 +1362,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1377,13 +1379,13 @@ impl super::stub::AssetService for AssetService {
     async fn analyze_org_policies(
         &self,
         req: crate::model::AnalyzeOrgPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeOrgPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeOrgPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1425,9 +1427,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1442,14 +1444,13 @@ impl super::stub::AssetService for AssetService {
     async fn analyze_org_policy_governed_containers(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedContainersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedContainersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1491,9 +1492,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1508,13 +1509,13 @@ impl super::stub::AssetService for AssetService {
     async fn analyze_org_policy_governed_assets(
         &self,
         req: crate::model::AnalyzeOrgPolicyGovernedAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeOrgPolicyGovernedAssetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1556,9 +1557,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1573,13 +1574,13 @@ impl super::stub::AssetService for AssetService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1620,9 +1621,9 @@ impl super::stub::AssetService for AssetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1636,15 +1637,15 @@ impl super::stub::AssetService for AssetService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/assuredworkloads/v1/Cargo.toml b/src/generated/cloud/assuredworkloads/v1/Cargo.toml
index 31a841db14..ffaf3ea7cc 100644
--- a/src/generated/cloud/assuredworkloads/v1/Cargo.toml
+++ b/src/generated/cloud/assuredworkloads/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/assuredworkloads/v1/src/builder.rs b/src/generated/cloud/assuredworkloads/v1/src/builder.rs
index 1dfb3caef0..6a24c22fc3 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/builder.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod assured_workloads_service {
     /// A builder for [AssuredWorkloadsService][crate::client::AssuredWorkloadsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_assuredworkloads_v1::*;
     /// # use builder::assured_workloads_service::ClientBuilder;
     /// # use client::AssuredWorkloadsService;
@@ -30,19 +30,18 @@ pub mod assured_workloads_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AssuredWorkloadsService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AssuredWorkloadsService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod assured_workloads_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AssuredWorkloadsService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod assured_workloads_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::CreateWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -105,7 +104,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120,7 +119,7 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .create_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_workload`.
@@ -139,7 +138,7 @@ pub mod assured_workloads_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -204,8 +203,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -215,7 +214,7 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::UpdateWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -243,7 +242,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -253,7 +252,7 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .update_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workload][crate::model::UpdateWorkloadRequest::workload].
@@ -302,8 +301,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -313,7 +312,7 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::RestrictAllowedResources;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -346,7 +345,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -356,7 +355,7 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .restrict_allowed_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RestrictAllowedResourcesRequest::name].
@@ -382,8 +381,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestrictAllowedResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestrictAllowedResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -393,7 +392,7 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::DeleteWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -421,7 +420,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -431,7 +430,7 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .delete_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWorkloadRequest::name].
@@ -450,8 +449,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -461,7 +460,7 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::GetWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -489,7 +488,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -499,7 +498,7 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .get_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkloadRequest::name].
@@ -512,8 +511,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -523,8 +522,8 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::ListWorkloads;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -555,7 +554,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -565,13 +564,13 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .list_workloads(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWorkloadsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListWorkloadsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -580,15 +579,17 @@ pub mod assured_workloads_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListWorkloadsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListWorkloadsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -620,8 +621,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkloads {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkloads {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -631,8 +632,8 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -668,7 +669,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -678,15 +679,15 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -695,17 +696,17 @@ pub mod assured_workloads_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -741,8 +742,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -752,7 +753,7 @@ pub mod assured_workloads_service {
     /// # Example
     /// ```
     /// # use google_cloud_assuredworkloads_v1::builder::assured_workloads_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_assuredworkloads_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -783,7 +784,7 @@ pub mod assured_workloads_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -793,7 +794,7 @@ pub mod assured_workloads_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -804,8 +805,8 @@ pub mod assured_workloads_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/assuredworkloads/v1/src/client.rs b/src/generated/cloud/assuredworkloads/v1/src/client.rs
index 6b7c4286d8..0773c04fa5 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/client.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_assuredworkloads_v1::client::AssuredWorkloadsService;
 /// let client = AssuredWorkloadsService::builder().build().await?;
 /// // use `client` to make requests to the Assured Workloads API.
@@ -66,15 +66,13 @@ impl AssuredWorkloadsService {
     /// Returns a builder for [AssuredWorkloadsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_assuredworkloads_v1::client::AssuredWorkloadsService;
     /// let client = AssuredWorkloadsService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::assured_workloads_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::assured_workloads_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::assured_workloads_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,16 +90,15 @@ impl AssuredWorkloadsService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::AssuredWorkloadsService>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AssuredWorkloadsService>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -110,13 +107,13 @@ impl AssuredWorkloadsService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AssuredWorkloadsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AssuredWorkloadsService> {
         super::transport::AssuredWorkloadsService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AssuredWorkloadsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AssuredWorkloadsService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AssuredWorkloadsService::new)
diff --git a/src/generated/cloud/assuredworkloads/v1/src/lib.rs b/src/generated/cloud/assuredworkloads/v1/src/lib.rs
index cac144ae65..ed19b7d4d7 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/lib.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/lib.rs
@@ -53,8 +53,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -89,3 +89,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/assuredworkloads/v1/src/model.rs b/src/generated/cloud/assuredworkloads/v1/src/model.rs
index 871632ec0d..1a75109342 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/model.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -451,7 +451,7 @@ impl wkt::message::Message for ListWorkloadsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkloadsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkloadsResponse {
     type PageItem = crate::model::Workload;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2838,7 +2838,7 @@ impl wkt::message::Message for ListViolationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListViolationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListViolationsResponse {
     type PageItem = crate::model::Violation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/assuredworkloads/v1/src/stub.rs b/src/generated/cloud/assuredworkloads/v1/src/stub.rs
index 26c88a8b8d..9e8f0eba8c 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/stub.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn create_workload(
         &self,
         _req: crate::model::CreateWorkloadRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn update_workload(
         &self,
         _req: crate::model::UpdateWorkloadRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Workload>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Workload>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,11 +63,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn restrict_allowed_resources(
         &self,
         _req: crate::model::RestrictAllowedResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RestrictAllowedResourcesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RestrictAllowedResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,8 +74,8 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn delete_workload(
         &self,
         _req: crate::model::DeleteWorkloadRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,10 +83,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn get_workload(
         &self,
         _req: crate::model::GetWorkloadRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Workload>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Workload>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +93,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn list_workloads(
         &self,
         _req: crate::model::ListWorkloadsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWorkloadsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +104,10 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -121,9 +117,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +130,9 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -145,8 +141,8 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/assuredworkloads/v1/src/stub/dynamic.rs b/src/generated/cloud/assuredworkloads/v1/src/stub/dynamic.rs
index 1c8d315d9a..ec25e0e86e 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/stub/dynamic.rs
@@ -20,62 +20,60 @@ pub trait AssuredWorkloadsService: std::fmt::Debug + Send + Sync {
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>>;
 
     async fn restrict_allowed_resources(
         &self,
         req: crate::model::RestrictAllowedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestrictAllowedResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestrictAllowedResourcesResponse>>;
 
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>>;
 
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkloadsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AssuredWorkloadsService] also implement [AssuredWorkloadsService].
@@ -85,8 +83,8 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_workload(self, req, options).await
     }
 
@@ -94,8 +92,8 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>> {
         T::update_workload(self, req, options).await
     }
 
@@ -103,9 +101,8 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn restrict_allowed_resources(
         &self,
         req: crate::model::RestrictAllowedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestrictAllowedResourcesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestrictAllowedResourcesResponse>> {
         T::restrict_allowed_resources(self, req, options).await
     }
 
@@ -113,8 +110,8 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_workload(self, req, options).await
     }
 
@@ -122,8 +119,8 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>> {
         T::get_workload(self, req, options).await
     }
 
@@ -131,8 +128,8 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         T::list_workloads(self, req, options).await
     }
 
@@ -140,10 +137,9 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -151,22 +147,22 @@ impl<T: super::AssuredWorkloadsService> AssuredWorkloadsService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/assuredworkloads/v1/src/tracing.rs b/src/generated/cloud/assuredworkloads/v1/src/tracing.rs
index de22a4b719..e1f6078504 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/tracing.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_workload(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         self.inner.update_workload(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn restrict_allowed_resources(
         &self,
         req: crate::model::RestrictAllowedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestrictAllowedResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestrictAllowedResourcesResponse>> {
         self.inner.restrict_allowed_resources(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_workload(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         self.inner.get_workload(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         self.inner.list_workloads(req, options).await
     }
 
@@ -95,9 +95,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -105,22 +104,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/assuredworkloads/v1/src/transport.rs b/src/generated/cloud/assuredworkloads/v1/src/transport.rs
index 5dc34bf6b2..c0a5ac6445 100644
--- a/src/generated/cloud/assuredworkloads/v1/src/transport.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AssuredWorkloadsService](super::stub::AssuredWorkloadsService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AssuredWorkloadsService {
 }
 
 impl AssuredWorkloadsService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn create_workload(
         &self,
         req: crate::model::CreateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn update_workload(
         &self,
         req: crate::model::UpdateWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -169,9 +169,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -186,13 +186,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn restrict_allowed_resources(
         &self,
         req: crate::model::RestrictAllowedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestrictAllowedResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestrictAllowedResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -233,9 +233,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -250,13 +250,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn delete_workload(
         &self,
         req: crate::model::DeleteWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -298,9 +298,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -309,24 +309,25 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -367,9 +368,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -384,13 +385,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430,9 +431,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -447,14 +448,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -496,9 +496,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -513,13 +513,13 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -560,9 +560,9 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -576,15 +576,15 @@ impl super::stub::AssuredWorkloadsService for AssuredWorkloadsService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/auditmanager/v1/Cargo.toml b/src/generated/cloud/auditmanager/v1/Cargo.toml
index 8fff60441b..efebd2d7e5 100644
--- a/src/generated/cloud/auditmanager/v1/Cargo.toml
+++ b/src/generated/cloud/auditmanager/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/auditmanager/v1/src/builder.rs b/src/generated/cloud/auditmanager/v1/src/builder.rs
index 768699a5f6..545a6d4de6 100644
--- a/src/generated/cloud/auditmanager/v1/src/builder.rs
+++ b/src/generated/cloud/auditmanager/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod audit_manager {
     /// A builder for [AuditManager][crate::client::AuditManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_auditmanager_v1::*;
     /// # use builder::audit_manager::ClientBuilder;
     /// # use client::AuditManager;
@@ -30,19 +30,18 @@ pub mod audit_manager {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AuditManager;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AuditManager;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod audit_manager {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AuditManager>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod audit_manager {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::EnrollResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .enroll_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [scope][crate::model::EnrollResourceRequest::scope].
@@ -140,8 +139,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnrollResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnrollResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -151,7 +150,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::GenerateAuditScopeReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -184,7 +183,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -194,7 +193,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .generate_audit_scope_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [scope][crate::model::GenerateAuditScopeReportRequest::scope].
@@ -236,8 +235,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAuditScopeReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAuditScopeReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -247,7 +246,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::GenerateAuditReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -279,7 +278,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -294,7 +293,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .generate_audit_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `generate_audit_report`.
@@ -311,7 +310,7 @@ pub mod audit_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -401,8 +400,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAuditReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAuditReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -412,8 +411,8 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::ListAuditReports;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -447,7 +446,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -457,14 +456,16 @@ pub mod audit_manager {
             (*self.0.stub)
                 .list_audit_reports(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAuditReportsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAuditReportsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -472,15 +473,17 @@ pub mod audit_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAuditReportsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAuditReportsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -506,8 +509,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAuditReports {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAuditReports {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -517,7 +520,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::GetAuditReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -545,7 +548,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -555,7 +558,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .get_audit_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAuditReportRequest::name].
@@ -568,8 +571,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAuditReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAuditReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -579,7 +582,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::GetResourceEnrollmentStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -612,7 +615,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -622,7 +625,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .get_resource_enrollment_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetResourceEnrollmentStatusRequest::name].
@@ -635,8 +638,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetResourceEnrollmentStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetResourceEnrollmentStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -646,8 +649,8 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::ListResourceEnrollmentStatuses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -683,7 +686,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -693,15 +696,15 @@ pub mod audit_manager {
             (*self.0.stub)
                 .list_resource_enrollment_statuses(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListResourceEnrollmentStatusesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -710,17 +713,17 @@ pub mod audit_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListResourceEnrollmentStatusesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -746,8 +749,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResourceEnrollmentStatuses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResourceEnrollmentStatuses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -757,8 +760,8 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::ListControls;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -789,7 +792,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -799,13 +802,13 @@ pub mod audit_manager {
             (*self.0.stub)
                 .list_controls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListControlsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListControlsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -814,15 +817,17 @@ pub mod audit_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListControlsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListControlsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -848,8 +853,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListControls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListControls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -859,8 +864,8 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -894,7 +899,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -904,15 +909,15 @@ pub mod audit_manager {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -921,17 +926,17 @@ pub mod audit_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -961,8 +966,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -972,7 +977,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1003,7 +1008,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1013,7 +1018,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1024,8 +1029,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1035,8 +1040,8 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1072,7 +1077,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1082,15 +1087,15 @@ pub mod audit_manager {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1099,17 +1104,17 @@ pub mod audit_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1145,8 +1150,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1156,7 +1161,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1187,7 +1192,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1197,7 +1202,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1208,8 +1213,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1219,7 +1224,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1252,7 +1257,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1262,7 +1267,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1273,8 +1278,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1284,7 +1289,7 @@ pub mod audit_manager {
     /// # Example
     /// ```
     /// # use google_cloud_auditmanager_v1::builder::audit_manager::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_auditmanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1317,7 +1322,7 @@ pub mod audit_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1327,7 +1332,7 @@ pub mod audit_manager {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1338,8 +1343,8 @@ pub mod audit_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/auditmanager/v1/src/client.rs b/src/generated/cloud/auditmanager/v1/src/client.rs
index d5d25192fb..fd02079d94 100644
--- a/src/generated/cloud/auditmanager/v1/src/client.rs
+++ b/src/generated/cloud/auditmanager/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_auditmanager_v1::client::AuditManager;
 /// let client = AuditManager::builder().build().await?;
 /// // use `client` to make requests to the Audit Manager API.
@@ -66,13 +66,13 @@ impl AuditManager {
     /// Returns a builder for [AuditManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_auditmanager_v1::client::AuditManager;
     /// let client = AuditManager::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::audit_manager::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::audit_manager::client::Factory)
+        crate::new_client_builder(super::builder::audit_manager::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl AuditManager {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AuditManager>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AuditManager>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl AuditManager {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AuditManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AuditManager> {
         super::transport::AuditManager::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AuditManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AuditManager> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AuditManager::new)
diff --git a/src/generated/cloud/auditmanager/v1/src/lib.rs b/src/generated/cloud/auditmanager/v1/src/lib.rs
index 11aaf277d1..aeb9af6d20 100644
--- a/src/generated/cloud/auditmanager/v1/src/lib.rs
+++ b/src/generated/cloud/auditmanager/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/auditmanager/v1/src/model.rs b/src/generated/cloud/auditmanager/v1/src/model.rs
index fdda0a8ccc..2ac4787e2a 100644
--- a/src/generated/cloud/auditmanager/v1/src/model.rs
+++ b/src/generated/cloud/auditmanager/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -890,7 +890,9 @@ impl wkt::message::Message for ListResourceEnrollmentStatusesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourceEnrollmentStatusesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListResourceEnrollmentStatusesResponse
+{
     type PageItem = crate::model::ResourceEnrollmentStatus;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1028,7 +1030,7 @@ impl wkt::message::Message for ListAuditReportsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAuditReportsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAuditReportsResponse {
     type PageItem = crate::model::AuditReport;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1204,7 +1206,7 @@ impl wkt::message::Message for ListControlsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListControlsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListControlsResponse {
     type PageItem = crate::model::Control;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/auditmanager/v1/src/stub.rs b/src/generated/cloud/auditmanager/v1/src/stub.rs
index 46e0d67f65..faffcd7ded 100644
--- a/src/generated/cloud/auditmanager/v1/src/stub.rs
+++ b/src/generated/cloud/auditmanager/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn enroll_resource(
         &self,
         _req: crate::model::EnrollResourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Enrollment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Enrollment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn generate_audit_scope_report(
         &self,
         _req: crate::model::GenerateAuditScopeReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuditScopeReport>>,
+        Output = crate::Result<crate::Response<crate::model::AuditScopeReport>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +63,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn generate_audit_report(
         &self,
         _req: crate::model::GenerateAuditReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn list_audit_reports(
         &self,
         _req: crate::model::ListAuditReportsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAuditReportsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAuditReportsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +85,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn get_audit_report(
         &self,
         _req: crate::model::GetAuditReportRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuditReport>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AuditReport>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +95,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn get_resource_enrollment_status(
         &self,
         _req: crate::model::GetResourceEnrollmentStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceEnrollmentStatus>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceEnrollmentStatus>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +106,10 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn list_resource_enrollment_statuses(
         &self,
         _req: crate::model::ListResourceEnrollmentStatusesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListResourceEnrollmentStatusesResponse>,
+            crate::Response<crate::model::ListResourceEnrollmentStatusesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -121,9 +119,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn list_controls(
         &self,
         _req: crate::model::ListControlsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListControlsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListControlsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,10 +130,10 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -145,9 +143,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,10 +154,10 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -169,9 +167,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -180,8 +178,8 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -189,8 +187,8 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -200,9 +198,9 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -211,8 +209,8 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/auditmanager/v1/src/stub/dynamic.rs b/src/generated/cloud/auditmanager/v1/src/stub/dynamic.rs
index b0bf2d96bd..052f00150c 100644
--- a/src/generated/cloud/auditmanager/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/auditmanager/v1/src/stub/dynamic.rs
@@ -20,98 +20,96 @@ pub trait AuditManager: std::fmt::Debug + Send + Sync {
     async fn enroll_resource(
         &self,
         req: crate::model::EnrollResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Enrollment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Enrollment>>;
 
     async fn generate_audit_scope_report(
         &self,
         req: crate::model::GenerateAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuditScopeReport>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuditScopeReport>>;
 
     async fn generate_audit_report(
         &self,
         req: crate::model::GenerateAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_audit_reports(
         &self,
         req: crate::model::ListAuditReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuditReportsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuditReportsResponse>>;
 
     async fn get_audit_report(
         &self,
         req: crate::model::GetAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuditReport>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuditReport>>;
 
     async fn get_resource_enrollment_status(
         &self,
         req: crate::model::GetResourceEnrollmentStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceEnrollmentStatus>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceEnrollmentStatus>>;
 
     async fn list_resource_enrollment_statuses(
         &self,
         req: crate::model::ListResourceEnrollmentStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceEnrollmentStatusesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceEnrollmentStatusesResponse>>;
 
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListControlsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListControlsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AuditManager] also implement [AuditManager].
@@ -121,8 +119,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn enroll_resource(
         &self,
         req: crate::model::EnrollResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Enrollment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Enrollment>> {
         T::enroll_resource(self, req, options).await
     }
 
@@ -130,8 +128,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn generate_audit_scope_report(
         &self,
         req: crate::model::GenerateAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuditScopeReport>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuditScopeReport>> {
         T::generate_audit_scope_report(self, req, options).await
     }
 
@@ -139,8 +137,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn generate_audit_report(
         &self,
         req: crate::model::GenerateAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::generate_audit_report(self, req, options).await
     }
 
@@ -148,8 +146,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn list_audit_reports(
         &self,
         req: crate::model::ListAuditReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAuditReportsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAuditReportsResponse>> {
         T::list_audit_reports(self, req, options).await
     }
 
@@ -157,8 +155,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn get_audit_report(
         &self,
         req: crate::model::GetAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuditReport>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuditReport>> {
         T::get_audit_report(self, req, options).await
     }
 
@@ -166,8 +164,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn get_resource_enrollment_status(
         &self,
         req: crate::model::GetResourceEnrollmentStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceEnrollmentStatus>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceEnrollmentStatus>> {
         T::get_resource_enrollment_status(self, req, options).await
     }
 
@@ -175,9 +173,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn list_resource_enrollment_statuses(
         &self,
         req: crate::model::ListResourceEnrollmentStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceEnrollmentStatusesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceEnrollmentStatusesResponse>> {
         T::list_resource_enrollment_statuses(self, req, options).await
     }
 
@@ -185,8 +182,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListControlsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListControlsResponse>> {
         T::list_controls(self, req, options).await
     }
 
@@ -194,9 +191,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -204,8 +200,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -213,10 +209,9 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -224,8 +219,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -233,8 +228,8 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -242,22 +237,22 @@ impl<T: super::AuditManager> AuditManager for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/auditmanager/v1/src/tracing.rs b/src/generated/cloud/auditmanager/v1/src/tracing.rs
index 36af81f8b5..7bd7301af2 100644
--- a/src/generated/cloud/auditmanager/v1/src/tracing.rs
+++ b/src/generated/cloud/auditmanager/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn enroll_resource(
         &self,
         req: crate::model::EnrollResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Enrollment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Enrollment>> {
         self.inner.enroll_resource(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn generate_audit_scope_report(
         &self,
         req: crate::model::GenerateAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuditScopeReport>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuditScopeReport>> {
         self.inner.generate_audit_scope_report(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn generate_audit_report(
         &self,
         req: crate::model::GenerateAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.generate_audit_report(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_audit_reports(
         &self,
         req: crate::model::ListAuditReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuditReportsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuditReportsResponse>> {
         self.inner.list_audit_reports(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_audit_report(
         &self,
         req: crate::model::GetAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuditReport>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuditReport>> {
         self.inner.get_audit_report(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_resource_enrollment_status(
         &self,
         req: crate::model::GetResourceEnrollmentStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceEnrollmentStatus>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceEnrollmentStatus>> {
         self.inner
             .get_resource_enrollment_status(req, options)
             .await
@@ -97,8 +97,8 @@ where
     async fn list_resource_enrollment_statuses(
         &self,
         req: crate::model::ListResourceEnrollmentStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceEnrollmentStatusesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceEnrollmentStatusesResponse>> {
         self.inner
             .list_resource_enrollment_statuses(req, options)
             .await
@@ -108,8 +108,8 @@ where
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListControlsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListControlsResponse>> {
         self.inner.list_controls(req, options).await
     }
 
@@ -117,8 +117,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -126,8 +126,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -135,9 +135,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -145,8 +144,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -154,8 +153,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -163,22 +162,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/auditmanager/v1/src/transport.rs b/src/generated/cloud/auditmanager/v1/src/transport.rs
index bbd35544e8..a144848cd4 100644
--- a/src/generated/cloud/auditmanager/v1/src/transport.rs
+++ b/src/generated/cloud/auditmanager/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AuditManager](super::stub::AuditManager) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AuditManager {
 }
 
 impl AuditManager {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn enroll_resource(
         &self,
         req: crate::model::EnrollResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Enrollment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Enrollment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -152,9 +152,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -169,13 +169,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn generate_audit_scope_report(
         &self,
         req: crate::model::GenerateAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuditScopeReport>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuditScopeReport>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -245,9 +245,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -262,13 +262,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn generate_audit_report(
         &self,
         req: crate::model::GenerateAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -338,9 +338,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -355,13 +355,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn list_audit_reports(
         &self,
         req: crate::model::ListAuditReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAuditReportsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAuditReportsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -470,9 +470,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -487,13 +487,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn get_audit_report(
         &self,
         req: crate::model::GetAuditReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuditReport>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuditReport>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -571,9 +571,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -588,13 +588,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn get_resource_enrollment_status(
         &self,
         req: crate::model::GetResourceEnrollmentStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceEnrollmentStatus>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceEnrollmentStatus>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -709,9 +709,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -726,13 +726,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn list_resource_enrollment_statuses(
         &self,
         req: crate::model::ListResourceEnrollmentStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceEnrollmentStatusesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceEnrollmentStatusesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -806,9 +806,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -823,13 +823,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListControlsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListControlsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -950,9 +950,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -967,13 +967,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1003,9 +1003,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1020,13 +1020,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1063,9 +1063,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1080,14 +1080,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1167,9 +1166,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1184,13 +1183,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1268,9 +1267,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1285,13 +1284,13 @@ impl super::stub::AuditManager for AuditManager {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1369,9 +1368,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1380,24 +1379,25 @@ impl super::stub::AuditManager for AuditManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1475,9 +1475,9 @@ impl super::stub::AuditManager for AuditManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1486,25 +1486,26 @@ impl super::stub::AuditManager for AuditManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/backupdr/v1/Cargo.toml b/src/generated/cloud/backupdr/v1/Cargo.toml
index a2c5e85957..bd8a06447c 100644
--- a/src/generated/cloud/backupdr/v1/Cargo.toml
+++ b/src/generated/cloud/backupdr/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/backupdr/v1/src/builder.rs b/src/generated/cloud/backupdr/v1/src/builder.rs
index 6def60ea95..81b24fc764 100644
--- a/src/generated/cloud/backupdr/v1/src/builder.rs
+++ b/src/generated/cloud/backupdr/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod backup_dr {
     /// A builder for [BackupDR][crate::client::BackupDR].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_backupdr_v1::*;
     /// # use builder::backup_dr::ClientBuilder;
     /// # use client::BackupDR;
@@ -30,19 +30,18 @@ pub mod backup_dr {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BackupDR;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BackupDR;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod backup_dr {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BackupDR>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod backup_dr {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListManagementServers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -107,7 +106,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,14 +116,16 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_management_servers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListManagementServersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListManagementServersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -132,17 +133,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListManagementServersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -204,8 +205,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListManagementServers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListManagementServers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -215,7 +216,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetManagementServer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -244,7 +245,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -254,7 +255,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_management_server(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetManagementServerRequest::name].
@@ -267,8 +268,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetManagementServer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetManagementServer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -278,7 +279,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::CreateManagementServer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -308,7 +309,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -323,7 +324,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .create_management_server(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_management_server`.
@@ -340,7 +341,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -413,8 +414,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateManagementServer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateManagementServer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -424,7 +425,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::DeleteManagementServer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -454,7 +455,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -469,7 +470,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .delete_management_server(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_management_server`.
@@ -481,7 +482,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -524,8 +525,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteManagementServer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteManagementServer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -535,7 +536,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::CreateBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -565,7 +566,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -580,7 +581,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .create_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_vault`.
@@ -597,7 +598,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -676,8 +677,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -687,8 +688,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListBackupVaults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -720,7 +721,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -730,14 +731,16 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_backup_vaults(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupVaultsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupVaultsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -745,15 +748,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupVaultsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupVaultsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -797,8 +802,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupVaults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupVaults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -808,8 +813,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::FetchUsableBackupVaults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -843,7 +848,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -853,15 +858,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .fetch_usable_backup_vaults(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchUsableBackupVaultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -870,17 +875,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchUsableBackupVaultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -918,8 +923,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchUsableBackupVaults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchUsableBackupVaults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -929,7 +934,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -955,7 +960,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -965,7 +970,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupVaultRequest::name].
@@ -984,8 +989,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -995,7 +1000,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::UpdateBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1025,7 +1030,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1040,7 +1045,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .update_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_vault`.
@@ -1057,7 +1062,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1154,8 +1159,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1165,7 +1170,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::DeleteBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1195,7 +1200,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1210,7 +1215,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .delete_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_vault`.
@@ -1222,7 +1227,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1295,8 +1300,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1306,8 +1311,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListDataSources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1336,7 +1341,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1346,14 +1351,16 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_data_sources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataSourcesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataSourcesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1361,15 +1368,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataSourcesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataSourcesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1407,8 +1416,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataSources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataSources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1418,7 +1427,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetDataSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1444,7 +1453,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1454,7 +1463,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_data_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataSourceRequest::name].
@@ -1467,8 +1476,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1478,7 +1487,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::UpdateDataSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1508,7 +1517,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1523,7 +1532,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .update_data_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_data_source`.
@@ -1540,7 +1549,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1625,8 +1634,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1636,8 +1645,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1666,7 +1675,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1676,13 +1685,13 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1691,15 +1700,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1743,8 +1754,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1754,8 +1765,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::FetchBackupsForResourceType;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1789,7 +1800,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1799,15 +1810,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .fetch_backups_for_resource_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchBackupsForResourceTypeResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1816,17 +1827,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchBackupsForResourceTypeResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1878,8 +1889,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchBackupsForResourceType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchBackupsForResourceType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1889,7 +1900,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1915,7 +1926,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1925,7 +1936,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -1944,8 +1955,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1955,7 +1966,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::UpdateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1982,7 +1993,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1997,7 +2008,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .update_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup`.
@@ -2014,7 +2025,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2093,8 +2104,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2104,7 +2115,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2131,7 +2142,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2146,7 +2157,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -2163,7 +2174,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2206,8 +2217,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2217,7 +2228,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::RestoreBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2244,7 +2255,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2259,7 +2270,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .restore_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_backup`.
@@ -2278,7 +2289,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2445,8 +2456,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2456,7 +2467,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::CreateBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2486,7 +2497,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2501,7 +2512,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .create_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_plan`.
@@ -2518,7 +2529,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2591,8 +2602,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2602,7 +2613,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::UpdateBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2632,7 +2643,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2647,7 +2658,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .update_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_plan`.
@@ -2664,7 +2675,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2743,8 +2754,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2754,7 +2765,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2780,7 +2791,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2790,7 +2801,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupPlanRequest::name].
@@ -2803,8 +2814,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2814,8 +2825,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListBackupPlans;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2844,7 +2855,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2854,14 +2865,16 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_backup_plans(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupPlansResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupPlansResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2869,15 +2882,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupPlansResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupPlansResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2915,8 +2930,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupPlans {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupPlans {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2926,7 +2941,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::DeleteBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2956,7 +2971,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2971,7 +2986,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .delete_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_plan`.
@@ -2983,7 +2998,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3026,8 +3041,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3037,7 +3052,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetBackupPlanRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3066,7 +3081,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3076,7 +3091,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_backup_plan_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupPlanRevisionRequest::name].
@@ -3089,8 +3104,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupPlanRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupPlanRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3100,8 +3115,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListBackupPlanRevisions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3135,7 +3150,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3145,15 +3160,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_backup_plan_revisions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListBackupPlanRevisionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3162,17 +3177,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBackupPlanRevisionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3198,8 +3213,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupPlanRevisions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupPlanRevisions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3209,7 +3224,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::CreateBackupPlanAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3241,7 +3256,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3256,7 +3271,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .create_backup_plan_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_plan_association`.
@@ -3275,7 +3290,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3351,8 +3366,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupPlanAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupPlanAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3362,7 +3377,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::UpdateBackupPlanAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3394,7 +3409,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3409,7 +3424,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .update_backup_plan_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_plan_association`.
@@ -3428,7 +3443,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3507,8 +3522,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupPlanAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupPlanAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3518,7 +3533,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetBackupPlanAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3549,7 +3564,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3559,7 +3574,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_backup_plan_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupPlanAssociationRequest::name].
@@ -3572,8 +3587,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupPlanAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupPlanAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3583,8 +3598,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListBackupPlanAssociations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3618,7 +3633,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3628,15 +3643,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_backup_plan_associations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListBackupPlanAssociationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3645,17 +3660,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBackupPlanAssociationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3687,8 +3702,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupPlanAssociations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupPlanAssociations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3698,8 +3713,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::FetchBackupPlanAssociationsForResourceType;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3735,7 +3750,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3747,15 +3762,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .fetch_backup_plan_associations_for_resource_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchBackupPlanAssociationsForResourceTypeResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3764,17 +3779,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchBackupPlanAssociationsForResourceTypeResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3820,8 +3835,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchBackupPlanAssociationsForResourceType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchBackupPlanAssociationsForResourceType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3831,7 +3846,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::DeleteBackupPlanAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3863,7 +3878,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3878,7 +3893,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .delete_backup_plan_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_plan_association`.
@@ -3890,7 +3905,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3933,8 +3948,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupPlanAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupPlanAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3944,7 +3959,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::TriggerBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3971,7 +3986,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3986,7 +4001,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .trigger_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `trigger_backup`.
@@ -4005,7 +4020,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4056,8 +4071,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TriggerBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TriggerBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4067,7 +4082,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetDataSourceReference;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4096,7 +4111,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4106,7 +4121,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_data_source_reference(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataSourceReferenceRequest::name].
@@ -4119,8 +4134,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataSourceReference {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataSourceReference {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4130,8 +4145,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListDataSourceReferences;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4165,7 +4180,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4175,15 +4190,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_data_source_references(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDataSourceReferencesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4192,17 +4207,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataSourceReferencesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4240,8 +4255,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataSourceReferences {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataSourceReferences {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4251,8 +4266,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::FetchDataSourceReferencesForResourceType;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4288,7 +4303,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4300,15 +4315,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .fetch_data_source_references_for_resource_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchDataSourceReferencesForResourceTypeResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4317,17 +4332,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchDataSourceReferencesForResourceTypeResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4373,8 +4388,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchDataSourceReferencesForResourceType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchDataSourceReferencesForResourceType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4384,7 +4399,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::InitializeService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4414,7 +4429,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4429,7 +4444,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .initialize_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `initialize_service`.
@@ -4448,7 +4463,7 @@ pub mod backup_dr {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4531,8 +4546,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InitializeService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InitializeService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4542,8 +4557,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4575,7 +4590,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4585,15 +4600,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4602,17 +4617,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4642,8 +4657,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4653,7 +4668,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4682,7 +4697,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4692,7 +4707,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4703,8 +4718,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4714,7 +4729,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4743,7 +4758,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4753,7 +4768,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4806,8 +4821,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4817,7 +4832,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4846,7 +4861,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4856,7 +4871,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4887,8 +4902,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4898,7 +4913,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4929,7 +4944,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4939,7 +4954,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4965,8 +4980,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4976,8 +4991,8 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5011,7 +5026,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5021,15 +5036,15 @@ pub mod backup_dr {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5038,17 +5053,17 @@ pub mod backup_dr {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5084,8 +5099,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5095,7 +5110,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5124,7 +5139,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5134,7 +5149,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5145,8 +5160,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5156,7 +5171,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5187,7 +5202,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5197,7 +5212,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5208,8 +5223,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5219,7 +5234,7 @@ pub mod backup_dr {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5250,7 +5265,7 @@ pub mod backup_dr {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5260,7 +5275,7 @@ pub mod backup_dr {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5271,8 +5286,8 @@ pub mod backup_dr {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5284,7 +5299,7 @@ pub mod backup_dr_protection_summary {
     /// A builder for [BackupDrProtectionSummary][crate::client::BackupDrProtectionSummary].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_backupdr_v1::*;
     /// # use builder::backup_dr_protection_summary::ClientBuilder;
     /// # use client::BackupDrProtectionSummary;
@@ -5294,19 +5309,18 @@ pub mod backup_dr_protection_summary {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BackupDrProtectionSummary;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BackupDrProtectionSummary;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5317,7 +5331,7 @@ pub mod backup_dr_protection_summary {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BackupDrProtectionSummary>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5330,7 +5344,7 @@ pub mod backup_dr_protection_summary {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5340,8 +5354,8 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::ListResourceBackupConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5377,7 +5391,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5387,15 +5401,15 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .list_resource_backup_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListResourceBackupConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5404,17 +5418,17 @@ pub mod backup_dr_protection_summary {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListResourceBackupConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5452,8 +5466,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResourceBackupConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResourceBackupConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5463,8 +5477,8 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5498,7 +5512,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5508,15 +5522,15 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5525,17 +5539,17 @@ pub mod backup_dr_protection_summary {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5565,8 +5579,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5576,7 +5590,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5607,7 +5621,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5617,7 +5631,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5628,8 +5642,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5639,7 +5653,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5670,7 +5684,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5680,7 +5694,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -5733,8 +5747,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5744,7 +5758,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5775,7 +5789,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5785,7 +5799,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -5816,8 +5830,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5827,7 +5841,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5860,7 +5874,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5870,7 +5884,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -5896,8 +5910,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5907,8 +5921,8 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5944,7 +5958,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5954,15 +5968,15 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5971,17 +5985,17 @@ pub mod backup_dr_protection_summary {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6017,8 +6031,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6028,7 +6042,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6059,7 +6073,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6069,7 +6083,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -6080,8 +6094,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6091,7 +6105,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6124,7 +6138,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6134,7 +6148,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -6145,8 +6159,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6156,7 +6170,7 @@ pub mod backup_dr_protection_summary {
     /// # Example
     /// ```
     /// # use google_cloud_backupdr_v1::builder::backup_dr_protection_summary::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_backupdr_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6189,7 +6203,7 @@ pub mod backup_dr_protection_summary {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6199,7 +6213,7 @@ pub mod backup_dr_protection_summary {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -6210,8 +6224,8 @@ pub mod backup_dr_protection_summary {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/backupdr/v1/src/client.rs b/src/generated/cloud/backupdr/v1/src/client.rs
index 99cb1bd77a..5f34983387 100644
--- a/src/generated/cloud/backupdr/v1/src/client.rs
+++ b/src/generated/cloud/backupdr/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_backupdr_v1::client::BackupDR;
 /// let client = BackupDR::builder().build().await?;
 /// // use `client` to make requests to the Backup and DR Service API.
@@ -66,13 +66,13 @@ impl BackupDR {
     /// Returns a builder for [BackupDR].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_backupdr_v1::client::BackupDR;
     /// let client = BackupDR::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::backup_dr::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::backup_dr::client::Factory)
+        crate::new_client_builder(super::builder::backup_dr::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl BackupDR {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BackupDR>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BackupDR>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl BackupDR {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackupDR> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackupDR> {
         super::transport::BackupDR::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackupDR> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackupDR> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BackupDR::new)
@@ -564,7 +564,7 @@ impl BackupDR {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_backupdr_v1::client::BackupDrProtectionSummary;
 /// let client = BackupDrProtectionSummary::builder().build().await?;
 /// // use `client` to make requests to the Backup and DR Service API.
@@ -610,15 +610,13 @@ impl BackupDrProtectionSummary {
     /// Returns a builder for [BackupDrProtectionSummary].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_backupdr_v1::client::BackupDrProtectionSummary;
     /// let client = BackupDrProtectionSummary::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::backup_dr_protection_summary::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::backup_dr_protection_summary::client::Factory,
-        )
+        crate::new_client_builder(super::builder::backup_dr_protection_summary::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -636,14 +634,14 @@ impl BackupDrProtectionSummary {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::BackupDrProtectionSummary>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -654,13 +652,13 @@ impl BackupDrProtectionSummary {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackupDrProtectionSummary> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackupDrProtectionSummary> {
         super::transport::BackupDrProtectionSummary::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackupDrProtectionSummary> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackupDrProtectionSummary> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BackupDrProtectionSummary::new)
diff --git a/src/generated/cloud/backupdr/v1/src/lib.rs b/src/generated/cloud/backupdr/v1/src/lib.rs
index 768df80b8b..cfc49522d9 100644
--- a/src/generated/cloud/backupdr/v1/src/lib.rs
+++ b/src/generated/cloud/backupdr/v1/src/lib.rs
@@ -47,8 +47,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -83,3 +83,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/backupdr/v1/src/model.rs b/src/generated/cloud/backupdr/v1/src/model.rs
index 644bb54832..335a2d7cf2 100644
--- a/src/generated/cloud/backupdr/v1/src/model.rs
+++ b/src/generated/cloud/backupdr/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -1357,7 +1357,7 @@ impl wkt::message::Message for ListManagementServersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListManagementServersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListManagementServersResponse {
     type PageItem = crate::model::ManagementServer;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3676,7 +3676,7 @@ impl wkt::message::Message for ListBackupPlansResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupPlansResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupPlansResponse {
     type PageItem = crate::model::BackupPlan;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4424,7 +4424,7 @@ impl wkt::message::Message for ListBackupPlanRevisionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupPlanRevisionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupPlanRevisionsResponse {
     type PageItem = crate::model::BackupPlanRevision;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5521,7 +5521,9 @@ impl wkt::message::Message for ListBackupPlanAssociationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupPlanAssociationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListBackupPlanAssociationsResponse
+{
     type PageItem = crate::model::BackupPlanAssociation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5729,7 +5731,7 @@ impl wkt::message::Message for FetchBackupPlanAssociationsForResourceTypeRespons
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for FetchBackupPlanAssociationsForResourceTypeResponse
 {
     type PageItem = crate::model::BackupPlanAssociation;
@@ -10903,7 +10905,7 @@ impl wkt::message::Message for ListBackupVaultsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupVaultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupVaultsResponse {
     type PageItem = crate::model::BackupVault;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11103,7 +11105,7 @@ impl wkt::message::Message for FetchUsableBackupVaultsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FetchUsableBackupVaultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for FetchUsableBackupVaultsResponse {
     type PageItem = crate::model::BackupVault;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11320,7 +11322,9 @@ impl wkt::message::Message for FetchBackupsForResourceTypeResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FetchBackupsForResourceTypeResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for FetchBackupsForResourceTypeResponse
+{
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11888,7 +11892,7 @@ impl wkt::message::Message for ListDataSourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataSourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataSourcesResponse {
     type PageItem = crate::model::DataSource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12278,7 +12282,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23476,7 +23480,7 @@ impl wkt::message::Message for ListDataSourceReferencesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataSourceReferencesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataSourceReferencesResponse {
     type PageItem = crate::model::DataSourceReference;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23688,7 +23692,7 @@ impl wkt::message::Message for FetchDataSourceReferencesForResourceTypeResponse
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for FetchDataSourceReferencesForResourceTypeResponse
 {
     type PageItem = crate::model::DataSourceReference;
@@ -23862,7 +23866,7 @@ impl wkt::message::Message for ListResourceBackupConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourceBackupConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListResourceBackupConfigsResponse {
     type PageItem = crate::model::ResourceBackupConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/backupdr/v1/src/stub.rs b/src/generated/cloud/backupdr/v1/src/stub.rs
index b75eaeda5b..f23cb115be 100644
--- a/src/generated/cloud/backupdr/v1/src/stub.rs
+++ b/src/generated/cloud/backupdr/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_management_servers(
         &self,
         _req: crate::model::ListManagementServersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListManagementServersResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListManagementServersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,9 +53,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_management_server(
         &self,
         _req: crate::model::GetManagementServerRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ManagementServer>>,
+        Output = crate::Result<crate::Response<crate::model::ManagementServer>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn create_management_server(
         &self,
         _req: crate::model::CreateManagementServerRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn delete_management_server(
         &self,
         _req: crate::model::DeleteManagementServerRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,9 +86,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn create_backup_vault(
         &self,
         _req: crate::model::CreateBackupVaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +97,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_backup_vaults(
         &self,
         _req: crate::model::ListBackupVaultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupVaultsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupVaultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,11 +108,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn fetch_usable_backup_vaults(
         &self,
         _req: crate::model::FetchUsableBackupVaultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchUsableBackupVaultsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchUsableBackupVaultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,10 +119,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_backup_vault(
         &self,
         _req: crate::model::GetBackupVaultRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupVault>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::BackupVault>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -134,9 +129,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn update_backup_vault(
         &self,
         _req: crate::model::UpdateBackupVaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,9 +140,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn delete_backup_vault(
         &self,
         _req: crate::model::DeleteBackupVaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,9 +151,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_data_sources(
         &self,
         _req: crate::model::ListDataSourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataSourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataSourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,10 +162,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_data_source(
         &self,
         _req: crate::model::GetDataSourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataSource>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataSource>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -178,9 +172,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn update_data_source(
         &self,
         _req: crate::model::UpdateDataSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,9 +183,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,11 +194,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn fetch_backups_for_resource_type(
         &self,
         _req: crate::model::FetchBackupsForResourceTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchBackupsForResourceTypeResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchBackupsForResourceTypeResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -213,10 +205,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -224,9 +215,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn update_backup(
         &self,
         _req: crate::model::UpdateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -235,9 +226,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -246,9 +237,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn restore_backup(
         &self,
         _req: crate::model::RestoreBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -257,9 +248,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn create_backup_plan(
         &self,
         _req: crate::model::CreateBackupPlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -268,9 +259,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn update_backup_plan(
         &self,
         _req: crate::model::UpdateBackupPlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -279,10 +270,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_backup_plan(
         &self,
         _req: crate::model::GetBackupPlanRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupPlan>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::BackupPlan>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -290,9 +280,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_backup_plans(
         &self,
         _req: crate::model::ListBackupPlansRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupPlansResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupPlansResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -301,9 +291,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn delete_backup_plan(
         &self,
         _req: crate::model::DeleteBackupPlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -312,9 +302,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_backup_plan_revision(
         &self,
         _req: crate::model::GetBackupPlanRevisionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupPlanRevision>>,
+        Output = crate::Result<crate::Response<crate::model::BackupPlanRevision>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -323,11 +313,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_backup_plan_revisions(
         &self,
         _req: crate::model::ListBackupPlanRevisionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListBackupPlanRevisionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListBackupPlanRevisionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -336,9 +324,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn create_backup_plan_association(
         &self,
         _req: crate::model::CreateBackupPlanAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -347,9 +335,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn update_backup_plan_association(
         &self,
         _req: crate::model::UpdateBackupPlanAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -358,9 +346,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_backup_plan_association(
         &self,
         _req: crate::model::GetBackupPlanAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupPlanAssociation>>,
+        Output = crate::Result<crate::Response<crate::model::BackupPlanAssociation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -369,11 +357,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_backup_plan_associations(
         &self,
         _req: crate::model::ListBackupPlanAssociationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListBackupPlanAssociationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListBackupPlanAssociationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -382,12 +368,10 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn fetch_backup_plan_associations_for_resource_type(
         &self,
         _req: crate::model::FetchBackupPlanAssociationsForResourceTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::FetchBackupPlanAssociationsForResourceTypeResponse,
-            >,
+            crate::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -397,9 +381,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn delete_backup_plan_association(
         &self,
         _req: crate::model::DeleteBackupPlanAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -408,9 +392,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn trigger_backup(
         &self,
         _req: crate::model::TriggerBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -419,9 +403,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_data_source_reference(
         &self,
         _req: crate::model::GetDataSourceReferenceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataSourceReference>>,
+        Output = crate::Result<crate::Response<crate::model::DataSourceReference>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -430,11 +414,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_data_source_references(
         &self,
         _req: crate::model::ListDataSourceReferencesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDataSourceReferencesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDataSourceReferencesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -443,10 +425,10 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn fetch_data_source_references_for_resource_type(
         &self,
         _req: crate::model::FetchDataSourceReferencesForResourceTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
+            crate::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -456,9 +438,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn initialize_service(
         &self,
         _req: crate::model::InitializeServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -467,10 +449,10 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -480,9 +462,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -491,9 +473,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -502,9 +484,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -513,10 +495,10 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -526,10 +508,10 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -539,9 +521,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -550,8 +532,8 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -559,8 +541,8 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -570,9 +552,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -581,9 +563,9 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -603,11 +585,9 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn list_resource_backup_configs(
         &self,
         _req: crate::model::ListResourceBackupConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListResourceBackupConfigsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListResourceBackupConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -616,10 +596,10 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -629,9 +609,9 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -640,9 +620,9 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -651,9 +631,9 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -662,10 +642,10 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -675,10 +655,10 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -688,9 +668,9 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -699,8 +679,8 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -708,8 +688,8 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/backupdr/v1/src/stub/dynamic.rs b/src/generated/cloud/backupdr/v1/src/stub/dynamic.rs
index 785a5f752d..27d27adc2c 100644
--- a/src/generated/cloud/backupdr/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/backupdr/v1/src/stub/dynamic.rs
@@ -20,296 +20,292 @@ pub trait BackupDR: std::fmt::Debug + Send + Sync {
     async fn list_management_servers(
         &self,
         req: crate::model::ListManagementServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListManagementServersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListManagementServersResponse>>;
 
     async fn get_management_server(
         &self,
         req: crate::model::GetManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagementServer>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagementServer>>;
 
     async fn create_management_server(
         &self,
         req: crate::model::CreateManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_management_server(
         &self,
         req: crate::model::DeleteManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupVaultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupVaultsResponse>>;
 
     async fn fetch_usable_backup_vaults(
         &self,
         req: crate::model::FetchUsableBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchUsableBackupVaultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchUsableBackupVaultsResponse>>;
 
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupVault>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupVault>>;
 
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataSourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataSourcesResponse>>;
 
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataSource>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataSource>>;
 
     async fn update_data_source(
         &self,
         req: crate::model::UpdateDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn fetch_backups_for_resource_type(
         &self,
         req: crate::model::FetchBackupsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchBackupsForResourceTypeResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchBackupsForResourceTypeResponse>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_backup(
         &self,
         req: crate::model::RestoreBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlan>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlan>>;
 
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlansResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlansResponse>>;
 
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup_plan_revision(
         &self,
         req: crate::model::GetBackupPlanRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlanRevision>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlanRevision>>;
 
     async fn list_backup_plan_revisions(
         &self,
         req: crate::model::ListBackupPlanRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlanRevisionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlanRevisionsResponse>>;
 
     async fn create_backup_plan_association(
         &self,
         req: crate::model::CreateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_backup_plan_association(
         &self,
         req: crate::model::UpdateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup_plan_association(
         &self,
         req: crate::model::GetBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlanAssociation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlanAssociation>>;
 
     async fn list_backup_plan_associations(
         &self,
         req: crate::model::ListBackupPlanAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlanAssociationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlanAssociationsResponse>>;
 
     async fn fetch_backup_plan_associations_for_resource_type(
         &self,
         req: crate::model::FetchBackupPlanAssociationsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
+        crate::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
     >;
 
     async fn delete_backup_plan_association(
         &self,
         req: crate::model::DeleteBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn trigger_backup(
         &self,
         req: crate::model::TriggerBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_data_source_reference(
         &self,
         req: crate::model::GetDataSourceReferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataSourceReference>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataSourceReference>>;
 
     async fn list_data_source_references(
         &self,
         req: crate::model::ListDataSourceReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataSourceReferencesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataSourceReferencesResponse>>;
 
     async fn fetch_data_source_references_for_resource_type(
         &self,
         req: crate::model::FetchDataSourceReferencesForResourceTypeRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
+        crate::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
     >;
 
     async fn initialize_service(
         &self,
         req: crate::model::InitializeServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BackupDR] also implement [BackupDR].
@@ -319,8 +315,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_management_servers(
         &self,
         req: crate::model::ListManagementServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListManagementServersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListManagementServersResponse>> {
         T::list_management_servers(self, req, options).await
     }
 
@@ -328,8 +324,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_management_server(
         &self,
         req: crate::model::GetManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagementServer>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagementServer>> {
         T::get_management_server(self, req, options).await
     }
 
@@ -337,8 +333,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn create_management_server(
         &self,
         req: crate::model::CreateManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_management_server(self, req, options).await
     }
 
@@ -346,8 +342,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn delete_management_server(
         &self,
         req: crate::model::DeleteManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_management_server(self, req, options).await
     }
 
@@ -355,8 +351,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_vault(self, req, options).await
     }
 
@@ -364,8 +360,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupVaultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupVaultsResponse>> {
         T::list_backup_vaults(self, req, options).await
     }
 
@@ -373,8 +369,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn fetch_usable_backup_vaults(
         &self,
         req: crate::model::FetchUsableBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchUsableBackupVaultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchUsableBackupVaultsResponse>> {
         T::fetch_usable_backup_vaults(self, req, options).await
     }
 
@@ -382,8 +378,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupVault>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupVault>> {
         T::get_backup_vault(self, req, options).await
     }
 
@@ -391,8 +387,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_vault(self, req, options).await
     }
 
@@ -400,8 +396,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_vault(self, req, options).await
     }
 
@@ -409,8 +405,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataSourcesResponse>> {
         T::list_data_sources(self, req, options).await
     }
 
@@ -418,8 +414,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataSource>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataSource>> {
         T::get_data_source(self, req, options).await
     }
 
@@ -427,8 +423,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn update_data_source(
         &self,
         req: crate::model::UpdateDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_data_source(self, req, options).await
     }
 
@@ -436,8 +432,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -445,9 +441,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn fetch_backups_for_resource_type(
         &self,
         req: crate::model::FetchBackupsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchBackupsForResourceTypeResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchBackupsForResourceTypeResponse>> {
         T::fetch_backups_for_resource_type(self, req, options).await
     }
 
@@ -455,8 +450,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -464,8 +459,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup(self, req, options).await
     }
 
@@ -473,8 +468,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -482,8 +477,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn restore_backup(
         &self,
         req: crate::model::RestoreBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_backup(self, req, options).await
     }
 
@@ -491,8 +486,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_plan(self, req, options).await
     }
 
@@ -500,8 +495,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_plan(self, req, options).await
     }
 
@@ -509,8 +504,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlan>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlan>> {
         T::get_backup_plan(self, req, options).await
     }
 
@@ -518,8 +513,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlansResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlansResponse>> {
         T::list_backup_plans(self, req, options).await
     }
 
@@ -527,8 +522,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_plan(self, req, options).await
     }
 
@@ -536,8 +531,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_backup_plan_revision(
         &self,
         req: crate::model::GetBackupPlanRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlanRevision>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlanRevision>> {
         T::get_backup_plan_revision(self, req, options).await
     }
 
@@ -545,8 +540,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_backup_plan_revisions(
         &self,
         req: crate::model::ListBackupPlanRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlanRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlanRevisionsResponse>> {
         T::list_backup_plan_revisions(self, req, options).await
     }
 
@@ -554,8 +549,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn create_backup_plan_association(
         &self,
         req: crate::model::CreateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_plan_association(self, req, options).await
     }
 
@@ -563,8 +558,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn update_backup_plan_association(
         &self,
         req: crate::model::UpdateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_plan_association(self, req, options).await
     }
 
@@ -572,8 +567,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_backup_plan_association(
         &self,
         req: crate::model::GetBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlanAssociation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlanAssociation>> {
         T::get_backup_plan_association(self, req, options).await
     }
 
@@ -581,9 +576,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_backup_plan_associations(
         &self,
         req: crate::model::ListBackupPlanAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlanAssociationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlanAssociationsResponse>> {
         T::list_backup_plan_associations(self, req, options).await
     }
 
@@ -591,9 +585,9 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn fetch_backup_plan_associations_for_resource_type(
         &self,
         req: crate::model::FetchBackupPlanAssociationsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
+        crate::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
     > {
         T::fetch_backup_plan_associations_for_resource_type(self, req, options).await
     }
@@ -602,8 +596,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn delete_backup_plan_association(
         &self,
         req: crate::model::DeleteBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_plan_association(self, req, options).await
     }
 
@@ -611,8 +605,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn trigger_backup(
         &self,
         req: crate::model::TriggerBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::trigger_backup(self, req, options).await
     }
 
@@ -620,8 +614,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_data_source_reference(
         &self,
         req: crate::model::GetDataSourceReferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataSourceReference>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataSourceReference>> {
         T::get_data_source_reference(self, req, options).await
     }
 
@@ -629,9 +623,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_data_source_references(
         &self,
         req: crate::model::ListDataSourceReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataSourceReferencesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataSourceReferencesResponse>> {
         T::list_data_source_references(self, req, options).await
     }
 
@@ -639,9 +632,9 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn fetch_data_source_references_for_resource_type(
         &self,
         req: crate::model::FetchDataSourceReferencesForResourceTypeRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
+        crate::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
     > {
         T::fetch_data_source_references_for_resource_type(self, req, options).await
     }
@@ -650,8 +643,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn initialize_service(
         &self,
         req: crate::model::InitializeServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::initialize_service(self, req, options).await
     }
 
@@ -659,9 +652,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -669,8 +661,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -678,8 +670,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -687,8 +679,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -696,10 +688,9 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -707,10 +698,9 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -718,8 +708,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -727,8 +717,8 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -736,22 +726,22 @@ impl<T: super::BackupDR> BackupDR for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -762,66 +752,62 @@ pub trait BackupDrProtectionSummary: std::fmt::Debug + Send + Sync {
     async fn list_resource_backup_configs(
         &self,
         req: crate::model::ListResourceBackupConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceBackupConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceBackupConfigsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::BackupDrProtectionSummary] also implement [BackupDrProtectionSummary].
@@ -831,9 +817,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn list_resource_backup_configs(
         &self,
         req: crate::model::ListResourceBackupConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceBackupConfigsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceBackupConfigsResponse>> {
         T::list_resource_backup_configs(self, req, options).await
     }
 
@@ -841,9 +826,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -851,8 +835,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -860,8 +844,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -869,8 +853,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -878,10 +862,9 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -889,10 +872,9 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -900,8 +882,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -909,8 +891,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -918,8 +900,8 @@ impl<T: super::BackupDrProtectionSummary> BackupDrProtectionSummary for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/backupdr/v1/src/tracing.rs b/src/generated/cloud/backupdr/v1/src/tracing.rs
index ac62ab7c8e..1b48402ebc 100644
--- a/src/generated/cloud/backupdr/v1/src/tracing.rs
+++ b/src/generated/cloud/backupdr/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_management_servers(
         &self,
         req: crate::model::ListManagementServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListManagementServersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListManagementServersResponse>> {
         self.inner.list_management_servers(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_management_server(
         &self,
         req: crate::model::GetManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagementServer>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagementServer>> {
         self.inner.get_management_server(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_management_server(
         &self,
         req: crate::model::CreateManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_management_server(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_management_server(
         &self,
         req: crate::model::DeleteManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_management_server(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup_vault(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupVaultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupVaultsResponse>> {
         self.inner.list_backup_vaults(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn fetch_usable_backup_vaults(
         &self,
         req: crate::model::FetchUsableBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchUsableBackupVaultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchUsableBackupVaultsResponse>> {
         self.inner.fetch_usable_backup_vaults(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupVault>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupVault>> {
         self.inner.get_backup_vault(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup_vault(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup_vault(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataSourcesResponse>> {
         self.inner.list_data_sources(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataSource>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataSource>> {
         self.inner.get_data_source(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn update_data_source(
         &self,
         req: crate::model::UpdateDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_data_source(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn fetch_backups_for_resource_type(
         &self,
         req: crate::model::FetchBackupsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchBackupsForResourceTypeResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchBackupsForResourceTypeResponse>> {
         self.inner
             .fetch_backups_for_resource_type(req, options)
             .await
@@ -178,8 +178,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -187,8 +187,8 @@ where
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup(req, options).await
     }
 
@@ -196,8 +196,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -205,8 +205,8 @@ where
     async fn restore_backup(
         &self,
         req: crate::model::RestoreBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_backup(req, options).await
     }
 
@@ -214,8 +214,8 @@ where
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup_plan(req, options).await
     }
 
@@ -223,8 +223,8 @@ where
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup_plan(req, options).await
     }
 
@@ -232,8 +232,8 @@ where
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlan>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlan>> {
         self.inner.get_backup_plan(req, options).await
     }
 
@@ -241,8 +241,8 @@ where
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlansResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlansResponse>> {
         self.inner.list_backup_plans(req, options).await
     }
 
@@ -250,8 +250,8 @@ where
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup_plan(req, options).await
     }
 
@@ -259,8 +259,8 @@ where
     async fn get_backup_plan_revision(
         &self,
         req: crate::model::GetBackupPlanRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlanRevision>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlanRevision>> {
         self.inner.get_backup_plan_revision(req, options).await
     }
 
@@ -268,8 +268,8 @@ where
     async fn list_backup_plan_revisions(
         &self,
         req: crate::model::ListBackupPlanRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlanRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlanRevisionsResponse>> {
         self.inner.list_backup_plan_revisions(req, options).await
     }
 
@@ -277,8 +277,8 @@ where
     async fn create_backup_plan_association(
         &self,
         req: crate::model::CreateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_backup_plan_association(req, options)
             .await
@@ -288,8 +288,8 @@ where
     async fn update_backup_plan_association(
         &self,
         req: crate::model::UpdateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_backup_plan_association(req, options)
             .await
@@ -299,8 +299,8 @@ where
     async fn get_backup_plan_association(
         &self,
         req: crate::model::GetBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlanAssociation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlanAssociation>> {
         self.inner.get_backup_plan_association(req, options).await
     }
 
@@ -308,8 +308,8 @@ where
     async fn list_backup_plan_associations(
         &self,
         req: crate::model::ListBackupPlanAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlanAssociationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlanAssociationsResponse>> {
         self.inner.list_backup_plan_associations(req, options).await
     }
 
@@ -317,10 +317,9 @@ where
     async fn fetch_backup_plan_associations_for_resource_type(
         &self,
         req: crate::model::FetchBackupPlanAssociationsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>>
+    {
         self.inner
             .fetch_backup_plan_associations_for_resource_type(req, options)
             .await
@@ -330,8 +329,8 @@ where
     async fn delete_backup_plan_association(
         &self,
         req: crate::model::DeleteBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_backup_plan_association(req, options)
             .await
@@ -341,8 +340,8 @@ where
     async fn trigger_backup(
         &self,
         req: crate::model::TriggerBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.trigger_backup(req, options).await
     }
 
@@ -350,8 +349,8 @@ where
     async fn get_data_source_reference(
         &self,
         req: crate::model::GetDataSourceReferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataSourceReference>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataSourceReference>> {
         self.inner.get_data_source_reference(req, options).await
     }
 
@@ -359,8 +358,8 @@ where
     async fn list_data_source_references(
         &self,
         req: crate::model::ListDataSourceReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataSourceReferencesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataSourceReferencesResponse>> {
         self.inner.list_data_source_references(req, options).await
     }
 
@@ -368,10 +367,9 @@ where
     async fn fetch_data_source_references_for_resource_type(
         &self,
         req: crate::model::FetchDataSourceReferencesForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>>
+    {
         self.inner
             .fetch_data_source_references_for_resource_type(req, options)
             .await
@@ -381,8 +379,8 @@ where
     async fn initialize_service(
         &self,
         req: crate::model::InitializeServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.initialize_service(req, options).await
     }
 
@@ -390,8 +388,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -399,8 +397,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -408,8 +406,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -417,8 +415,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -426,9 +424,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -436,9 +433,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -446,8 +442,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -455,8 +451,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -464,22 +460,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -510,8 +506,8 @@ where
     async fn list_resource_backup_configs(
         &self,
         req: crate::model::ListResourceBackupConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceBackupConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceBackupConfigsResponse>> {
         self.inner.list_resource_backup_configs(req, options).await
     }
 
@@ -519,8 +515,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -528,8 +524,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -537,8 +533,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -546,8 +542,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -555,9 +551,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -565,9 +560,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -575,8 +569,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -584,8 +578,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -593,8 +587,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/backupdr/v1/src/transport.rs b/src/generated/cloud/backupdr/v1/src/transport.rs
index b6b67b7a17..176138ec9b 100644
--- a/src/generated/cloud/backupdr/v1/src/transport.rs
+++ b/src/generated/cloud/backupdr/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [BackupDR](super::stub::BackupDR) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for BackupDR {
 }
 
 impl BackupDR {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_management_servers(
         &self,
         req: crate::model::ListManagementServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListManagementServersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListManagementServersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -96,9 +96,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -113,13 +113,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_management_server(
         &self,
         req: crate::model::GetManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagementServer>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagementServer>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -160,9 +160,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -177,13 +177,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn create_management_server(
         &self,
         req: crate::model::CreateManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -222,9 +222,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -239,13 +239,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn delete_management_server(
         &self,
         req: crate::model::DeleteManagementServerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -287,9 +287,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -304,13 +304,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -350,9 +350,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -367,13 +367,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupVaultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupVaultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415,9 +415,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -432,13 +432,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn fetch_usable_backup_vaults(
         &self,
         req: crate::model::FetchUsableBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchUsableBackupVaultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchUsableBackupVaultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -479,9 +479,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -496,13 +496,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupVault>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupVault>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -544,9 +544,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -561,13 +561,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -633,9 +633,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -650,13 +650,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -706,9 +706,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -723,13 +723,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataSourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataSourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -774,9 +774,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -791,13 +791,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataSource>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataSource>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -842,9 +842,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -859,13 +859,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn update_data_source(
         &self,
         req: crate::model::UpdateDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -930,9 +930,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -947,13 +947,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1003,9 +1003,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1020,13 +1020,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn fetch_backups_for_resource_type(
         &self,
         req: crate::model::FetchBackupsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchBackupsForResourceTypeResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchBackupsForResourceTypeResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1077,9 +1077,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1094,13 +1094,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1150,9 +1150,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1167,13 +1167,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1241,9 +1241,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1258,13 +1258,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1314,9 +1314,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1331,13 +1331,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn restore_backup(
         &self,
         req: crate::model::RestoreBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1386,9 +1386,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1403,13 +1403,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1448,9 +1448,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1465,13 +1465,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1531,9 +1531,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1548,13 +1548,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlan>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlan>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1595,9 +1595,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1612,13 +1612,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlansResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlansResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1659,9 +1659,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1676,13 +1676,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1724,9 +1724,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1741,13 +1741,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_backup_plan_revision(
         &self,
         req: crate::model::GetBackupPlanRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlanRevision>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlanRevision>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1792,9 +1792,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1809,13 +1809,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_backup_plan_revisions(
         &self,
         req: crate::model::ListBackupPlanRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlanRevisionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlanRevisionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1858,9 +1858,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1875,13 +1875,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn create_backup_plan_association(
         &self,
         req: crate::model::CreateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1921,9 +1921,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1938,13 +1938,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn update_backup_plan_association(
         &self,
         req: crate::model::UpdateBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2004,9 +2004,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2021,13 +2021,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_backup_plan_association(
         &self,
         req: crate::model::GetBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlanAssociation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlanAssociation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2068,9 +2068,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2085,13 +2085,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_backup_plan_associations(
         &self,
         req: crate::model::ListBackupPlanAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlanAssociationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlanAssociationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2131,9 +2131,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2148,15 +2148,14 @@ impl super::stub::BackupDR for BackupDR {
     async fn fetch_backup_plan_associations_for_resource_type(
         &self,
         req: crate::model::FetchBackupPlanAssociationsForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchBackupPlanAssociationsForResourceTypeResponse>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2198,9 +2197,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2215,13 +2214,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn delete_backup_plan_association(
         &self,
         req: crate::model::DeleteBackupPlanAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2263,9 +2262,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2280,13 +2279,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn trigger_backup(
         &self,
         req: crate::model::TriggerBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2327,9 +2326,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2344,13 +2343,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_data_source_reference(
         &self,
         req: crate::model::GetDataSourceReferenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataSourceReference>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataSourceReference>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2391,9 +2390,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2408,13 +2407,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_data_source_references(
         &self,
         req: crate::model::ListDataSourceReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataSourceReferencesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataSourceReferencesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2455,9 +2454,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2472,15 +2471,14 @@ impl super::stub::BackupDR for BackupDR {
     async fn fetch_data_source_references_for_resource_type(
         &self,
         req: crate::model::FetchDataSourceReferencesForResourceTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchDataSourceReferencesForResourceTypeResponse>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2522,9 +2520,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2539,13 +2537,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn initialize_service(
         &self,
         req: crate::model::InitializeServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2584,9 +2582,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2601,13 +2599,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2637,9 +2635,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2654,13 +2652,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2697,9 +2695,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2714,13 +2712,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2761,9 +2759,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2778,13 +2776,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2837,9 +2835,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2854,14 +2852,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2902,9 +2899,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2919,14 +2916,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2968,9 +2964,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2985,13 +2981,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3032,9 +3028,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3049,13 +3045,13 @@ impl super::stub::BackupDR for BackupDR {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3096,9 +3092,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3107,24 +3103,25 @@ impl super::stub::BackupDR for BackupDR {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3165,9 +3162,9 @@ impl super::stub::BackupDR for BackupDR {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3176,25 +3173,26 @@ impl super::stub::BackupDR for BackupDR {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3214,7 +3212,7 @@ impl std::fmt::Debug for BackupDrProtectionSummary {
 }
 
 impl BackupDrProtectionSummary {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3224,13 +3222,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn list_resource_backup_configs(
         &self,
         req: crate::model::ListResourceBackupConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceBackupConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceBackupConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3271,9 +3269,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3288,13 +3286,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3324,9 +3322,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3341,13 +3339,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3384,9 +3382,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3401,13 +3399,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3448,9 +3446,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3465,13 +3463,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3524,9 +3522,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3541,14 +3539,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3589,9 +3586,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3606,14 +3603,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3655,9 +3651,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3672,13 +3668,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3719,9 +3715,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3736,13 +3732,13 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3783,9 +3779,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3794,24 +3790,25 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3852,9 +3849,9 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3863,11 +3860,12 @@ impl super::stub::BackupDrProtectionSummary for BackupDrProtectionSummary {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/baremetalsolution/v2/Cargo.toml b/src/generated/cloud/baremetalsolution/v2/Cargo.toml
index 3e391e3625..9275af7f44 100644
--- a/src/generated/cloud/baremetalsolution/v2/Cargo.toml
+++ b/src/generated/cloud/baremetalsolution/v2/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/baremetalsolution/v2/src/builder.rs b/src/generated/cloud/baremetalsolution/v2/src/builder.rs
index 18e65d32a3..8c24749a6c 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/builder.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod bare_metal_solution {
     /// A builder for [BareMetalSolution][crate::client::BareMetalSolution].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_baremetalsolution_v2::*;
     /// # use builder::bare_metal_solution::ClientBuilder;
     /// # use client::BareMetalSolution;
@@ -30,19 +30,18 @@ pub mod bare_metal_solution {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BareMetalSolution;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BareMetalSolution;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod bare_metal_solution {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BareMetalSolution>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod bare_metal_solution {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -173,8 +174,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -184,7 +185,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -212,7 +213,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -222,7 +223,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -235,8 +236,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +247,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -275,7 +276,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -290,7 +291,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -307,7 +308,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -376,8 +377,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -387,7 +388,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::RenameInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -415,7 +416,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -425,7 +426,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .rename_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameInstanceRequest::name].
@@ -446,8 +447,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -457,7 +458,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ResetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -486,7 +487,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -501,7 +502,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .reset_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reset_instance`.
@@ -520,7 +521,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -557,8 +558,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -568,7 +569,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::StartInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -597,7 +598,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -612,7 +613,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .start_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_instance`.
@@ -631,7 +632,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -668,8 +669,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -679,7 +680,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::StopInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -708,7 +709,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -723,7 +724,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .stop_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_instance`.
@@ -742,7 +743,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -779,8 +780,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -790,7 +791,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::EnableInteractiveSerialConsole;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -824,7 +825,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -839,7 +840,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .enable_interactive_serial_console(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_interactive_serial_console`.
@@ -858,7 +859,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -895,8 +896,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnableInteractiveSerialConsole {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnableInteractiveSerialConsole {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -906,7 +907,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::DisableInteractiveSerialConsole;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -940,7 +941,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -955,7 +956,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .disable_interactive_serial_console(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_interactive_serial_console`.
@@ -974,7 +975,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1011,8 +1012,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisableInteractiveSerialConsole {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisableInteractiveSerialConsole {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1022,7 +1023,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::DetachLun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1051,7 +1052,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1066,7 +1067,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .detach_lun(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `detach_lun`.
@@ -1083,7 +1084,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1134,8 +1135,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachLun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachLun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1145,8 +1146,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListSSHKeys;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1177,7 +1178,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1187,13 +1188,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_ssh_keys(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSSHKeysResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSSHKeysResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1202,15 +1203,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSSHKeysResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSSHKeysResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1236,8 +1239,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSSHKeys {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSSHKeys {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1247,7 +1250,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::CreateSSHKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1275,7 +1278,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1285,7 +1288,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .create_ssh_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSSHKeyRequest::parent].
@@ -1328,8 +1331,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSSHKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSSHKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1339,7 +1342,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::DeleteSSHKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1367,7 +1370,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1377,7 +1380,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .delete_ssh_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSSHKeyRequest::name].
@@ -1390,8 +1393,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSSHKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSSHKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1401,8 +1404,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListVolumes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1433,7 +1436,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1443,13 +1446,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_volumes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVolumesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVolumesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1458,15 +1461,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVolumesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVolumesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1498,8 +1503,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVolumes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVolumes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1509,7 +1514,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1537,7 +1542,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1547,7 +1552,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVolumeRequest::name].
@@ -1560,8 +1565,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1571,7 +1576,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::UpdateVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1600,7 +1605,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1615,7 +1620,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .update_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_volume`.
@@ -1632,7 +1637,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1701,8 +1706,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1712,7 +1717,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::RenameVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1740,7 +1745,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1750,7 +1755,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .rename_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameVolumeRequest::name].
@@ -1771,8 +1776,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1782,7 +1787,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::EvictVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1811,7 +1816,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1826,7 +1831,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .evict_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `evict_volume`.
@@ -1838,7 +1843,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1875,8 +1880,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EvictVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EvictVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1886,7 +1891,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ResizeVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1915,7 +1920,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1930,7 +1935,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .resize_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize_volume`.
@@ -1947,7 +1952,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1990,8 +1995,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResizeVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResizeVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2001,8 +2006,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListNetworks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2033,7 +2038,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2043,13 +2048,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_networks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNetworksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListNetworksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2058,15 +2063,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListNetworksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListNetworksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2098,8 +2105,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNetworks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNetworks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2109,7 +2116,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListNetworkUsage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2140,7 +2147,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2150,7 +2157,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_network_usage(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [location][crate::model::ListNetworkUsageRequest::location].
@@ -2163,8 +2170,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNetworkUsage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNetworkUsage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2174,7 +2181,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2202,7 +2209,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2212,7 +2219,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNetworkRequest::name].
@@ -2225,8 +2232,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2236,7 +2243,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::UpdateNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2265,7 +2272,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2280,7 +2287,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .update_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_network`.
@@ -2297,7 +2304,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2366,8 +2373,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2377,7 +2384,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::CreateVolumeSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2408,7 +2415,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2418,7 +2425,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .create_volume_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateVolumeSnapshotRequest::parent].
@@ -2453,8 +2460,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVolumeSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVolumeSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2464,7 +2471,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::RestoreVolumeSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2496,7 +2503,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2511,7 +2518,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .restore_volume_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_volume_snapshot`.
@@ -2528,7 +2535,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2565,8 +2572,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreVolumeSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreVolumeSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2576,7 +2583,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::DeleteVolumeSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2607,7 +2614,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2617,7 +2624,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .delete_volume_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteVolumeSnapshotRequest::name].
@@ -2630,8 +2637,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVolumeSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVolumeSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2641,7 +2648,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetVolumeSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2672,7 +2679,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2682,7 +2689,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_volume_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVolumeSnapshotRequest::name].
@@ -2695,8 +2702,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVolumeSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVolumeSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2706,8 +2713,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListVolumeSnapshots;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2741,7 +2748,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2751,14 +2758,16 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_volume_snapshots(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVolumeSnapshotsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListVolumeSnapshotsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2766,17 +2775,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListVolumeSnapshotsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2802,8 +2811,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVolumeSnapshots {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVolumeSnapshots {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2813,7 +2822,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetLun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2841,7 +2850,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2851,7 +2860,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_lun(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetLunRequest::name].
@@ -2864,8 +2873,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2875,8 +2884,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListLuns;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2907,7 +2916,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2917,13 +2926,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_luns(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListLunsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListLunsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2932,15 +2941,15 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListLunsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListLunsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2966,8 +2975,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2977,7 +2986,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::EvictLun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3006,7 +3015,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3021,7 +3030,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .evict_lun(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `evict_lun`.
@@ -3033,7 +3042,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3070,8 +3079,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EvictLun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EvictLun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3081,7 +3090,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetNfsShare;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3109,7 +3118,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3119,7 +3128,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_nfs_share(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNfsShareRequest::name].
@@ -3132,8 +3141,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNfsShare {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNfsShare {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3143,8 +3152,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListNfsShares;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3175,7 +3184,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3185,13 +3194,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_nfs_shares(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNfsSharesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListNfsSharesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3200,15 +3209,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListNfsSharesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListNfsSharesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3240,8 +3251,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNfsShares {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNfsShares {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3251,7 +3262,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::UpdateNfsShare;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3280,7 +3291,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3295,7 +3306,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .update_nfs_share(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_nfs_share`.
@@ -3312,7 +3323,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3381,8 +3392,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateNfsShare {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateNfsShare {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3392,7 +3403,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::CreateNfsShare;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3421,7 +3432,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3436,7 +3447,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .create_nfs_share(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_nfs_share`.
@@ -3453,7 +3464,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3512,8 +3523,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNfsShare {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNfsShare {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3523,7 +3534,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::RenameNfsShare;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3551,7 +3562,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3561,7 +3572,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .rename_nfs_share(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameNfsShareRequest::name].
@@ -3582,8 +3593,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameNfsShare {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameNfsShare {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3593,7 +3604,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::DeleteNfsShare;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3622,7 +3633,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3637,7 +3648,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .delete_nfs_share(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_nfs_share`.
@@ -3649,7 +3660,7 @@ pub mod bare_metal_solution {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3686,8 +3697,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNfsShare {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNfsShare {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3697,8 +3708,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListProvisioningQuotas;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3732,7 +3743,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3742,15 +3753,15 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_provisioning_quotas(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListProvisioningQuotasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3759,17 +3770,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListProvisioningQuotasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3795,8 +3806,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProvisioningQuotas {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProvisioningQuotas {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3806,7 +3817,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::SubmitProvisioningConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3839,7 +3850,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3849,7 +3860,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .submit_provisioning_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::SubmitProvisioningConfigRequest::parent].
@@ -3890,8 +3901,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubmitProvisioningConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubmitProvisioningConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3901,7 +3912,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetProvisioningConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3932,7 +3943,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3942,7 +3953,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_provisioning_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProvisioningConfigRequest::name].
@@ -3955,8 +3966,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProvisioningConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProvisioningConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3966,7 +3977,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::CreateProvisioningConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3999,7 +4010,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4009,7 +4020,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .create_provisioning_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateProvisioningConfigRequest::parent].
@@ -4050,8 +4061,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateProvisioningConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateProvisioningConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4061,7 +4072,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::UpdateProvisioningConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4094,7 +4105,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4104,7 +4115,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .update_provisioning_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [provisioning_config][crate::model::UpdateProvisioningConfigRequest::provisioning_config].
@@ -4159,8 +4170,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateProvisioningConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateProvisioningConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4170,7 +4181,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::RenameNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4198,7 +4209,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4208,7 +4219,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .rename_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameNetworkRequest::name].
@@ -4229,8 +4240,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4240,8 +4251,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListOSImages;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4272,7 +4283,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4282,13 +4293,13 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_os_images(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListOSImagesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListOSImagesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4297,15 +4308,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListOSImagesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListOSImagesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4331,8 +4344,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOSImages {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOSImages {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4342,8 +4355,8 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4377,7 +4390,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4387,15 +4400,15 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4404,17 +4417,17 @@ pub mod bare_metal_solution {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4444,8 +4457,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4455,7 +4468,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4486,7 +4499,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4496,7 +4509,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4507,8 +4520,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4518,7 +4531,7 @@ pub mod bare_metal_solution {
     /// # Example
     /// ```
     /// # use google_cloud_baremetalsolution_v2::builder::bare_metal_solution::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_baremetalsolution_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4549,7 +4562,7 @@ pub mod bare_metal_solution {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4559,7 +4572,7 @@ pub mod bare_metal_solution {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4570,8 +4583,8 @@ pub mod bare_metal_solution {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/baremetalsolution/v2/src/client.rs b/src/generated/cloud/baremetalsolution/v2/src/client.rs
index 26cdfdf043..0eed138dc5 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/client.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_baremetalsolution_v2::client::BareMetalSolution;
 /// let client = BareMetalSolution::builder().build().await?;
 /// // use `client` to make requests to the Bare Metal Solution API.
@@ -73,15 +73,13 @@ impl BareMetalSolution {
     /// Returns a builder for [BareMetalSolution].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_baremetalsolution_v2::client::BareMetalSolution;
     /// let client = BareMetalSolution::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::bare_metal_solution::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::bare_metal_solution::client::Factory,
-        )
+        crate::new_client_builder(super::builder::bare_metal_solution::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -99,14 +97,14 @@ impl BareMetalSolution {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BareMetalSolution>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BareMetalSolution>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -116,13 +114,13 @@ impl BareMetalSolution {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BareMetalSolution> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BareMetalSolution> {
         super::transport::BareMetalSolution::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BareMetalSolution> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BareMetalSolution> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BareMetalSolution::new)
diff --git a/src/generated/cloud/baremetalsolution/v2/src/lib.rs b/src/generated/cloud/baremetalsolution/v2/src/lib.rs
index 7443425a0d..b9aca5f4de 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/lib.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/baremetalsolution/v2/src/model.rs b/src/generated/cloud/baremetalsolution/v2/src/model.rs
index c5ee5cc5ff..641b92c53f 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/model.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1026,7 +1026,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2637,7 +2637,7 @@ impl wkt::message::Message for ListLunsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListLunsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListLunsResponse {
     type PageItem = crate::model::Lun;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4180,7 +4180,7 @@ impl wkt::message::Message for ListNetworksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNetworksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNetworksResponse {
     type PageItem = crate::model::Network;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5525,7 +5525,7 @@ impl wkt::message::Message for ListNfsSharesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNfsSharesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNfsSharesResponse {
     type PageItem = crate::model::NfsShare;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6023,7 +6023,7 @@ impl wkt::message::Message for ListOSImagesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListOSImagesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListOSImagesResponse {
     type PageItem = crate::model::OSImage;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7236,7 +7236,7 @@ impl wkt::message::Message for ListProvisioningQuotasResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProvisioningQuotasResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProvisioningQuotasResponse {
     type PageItem = crate::model::ProvisioningQuota;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9861,7 +9861,7 @@ impl wkt::message::Message for ListSSHKeysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSSHKeysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSSHKeysResponse {
     type PageItem = crate::model::SSHKey;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11468,7 +11468,7 @@ impl wkt::message::Message for ListVolumesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVolumesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVolumesResponse {
     type PageItem = crate::model::Volume;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12163,7 +12163,7 @@ impl wkt::message::Message for ListVolumeSnapshotsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVolumeSnapshotsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVolumeSnapshotsResponse {
     type PageItem = crate::model::VolumeSnapshot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/baremetalsolution/v2/src/stub.rs b/src/generated/cloud/baremetalsolution/v2/src/stub.rs
index 58bedfd5ae..a059869508 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/stub.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/stub.rs
@@ -42,9 +42,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +74,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn rename_instance(
         &self,
         _req: crate::model::RenameInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,9 +84,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn reset_instance(
         &self,
         _req: crate::model::ResetInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +95,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn start_instance(
         &self,
         _req: crate::model::StartInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +106,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn stop_instance(
         &self,
         _req: crate::model::StopInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +117,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn enable_interactive_serial_console(
         &self,
         _req: crate::model::EnableInteractiveSerialConsoleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +128,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn disable_interactive_serial_console(
         &self,
         _req: crate::model::DisableInteractiveSerialConsoleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +139,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn detach_lun(
         &self,
         _req: crate::model::DetachLunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +150,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_ssh_keys(
         &self,
         _req: crate::model::ListSSHKeysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSSHKeysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSSHKeysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,10 +161,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn create_ssh_key(
         &self,
         _req: crate::model::CreateSSHKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SSHKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SSHKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -174,8 +171,8 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn delete_ssh_key(
         &self,
         _req: crate::model::DeleteSSHKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -183,9 +180,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_volumes(
         &self,
         _req: crate::model::ListVolumesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVolumesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVolumesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -194,10 +191,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_volume(
         &self,
         _req: crate::model::GetVolumeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Volume>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Volume>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -205,9 +201,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn update_volume(
         &self,
         _req: crate::model::UpdateVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -216,10 +212,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn rename_volume(
         &self,
         _req: crate::model::RenameVolumeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Volume>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Volume>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -227,9 +222,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn evict_volume(
         &self,
         _req: crate::model::EvictVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -238,9 +233,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn resize_volume(
         &self,
         _req: crate::model::ResizeVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -249,9 +244,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_networks(
         &self,
         _req: crate::model::ListNetworksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNetworksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNetworksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -260,9 +255,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_network_usage(
         &self,
         _req: crate::model::ListNetworkUsageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNetworkUsageResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNetworkUsageResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -271,10 +266,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_network(
         &self,
         _req: crate::model::GetNetworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Network>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Network>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -282,9 +276,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn update_network(
         &self,
         _req: crate::model::UpdateNetworkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -293,9 +287,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn create_volume_snapshot(
         &self,
         _req: crate::model::CreateVolumeSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VolumeSnapshot>>,
+        Output = crate::Result<crate::Response<crate::model::VolumeSnapshot>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -304,9 +298,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn restore_volume_snapshot(
         &self,
         _req: crate::model::RestoreVolumeSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -315,8 +309,8 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn delete_volume_snapshot(
         &self,
         _req: crate::model::DeleteVolumeSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -324,9 +318,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_volume_snapshot(
         &self,
         _req: crate::model::GetVolumeSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VolumeSnapshot>>,
+        Output = crate::Result<crate::Response<crate::model::VolumeSnapshot>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -335,9 +329,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_volume_snapshots(
         &self,
         _req: crate::model::ListVolumeSnapshotsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVolumeSnapshotsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVolumeSnapshotsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -346,9 +340,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_lun(
         &self,
         _req: crate::model::GetLunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Lun>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Lun>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -356,9 +350,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_luns(
         &self,
         _req: crate::model::ListLunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListLunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListLunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -367,9 +361,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn evict_lun(
         &self,
         _req: crate::model::EvictLunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -378,10 +372,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_nfs_share(
         &self,
         _req: crate::model::GetNfsShareRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NfsShare>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NfsShare>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -389,9 +382,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_nfs_shares(
         &self,
         _req: crate::model::ListNfsSharesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNfsSharesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNfsSharesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -400,9 +393,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn update_nfs_share(
         &self,
         _req: crate::model::UpdateNfsShareRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -411,9 +404,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn create_nfs_share(
         &self,
         _req: crate::model::CreateNfsShareRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -422,10 +415,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn rename_nfs_share(
         &self,
         _req: crate::model::RenameNfsShareRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NfsShare>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NfsShare>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -433,9 +425,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn delete_nfs_share(
         &self,
         _req: crate::model::DeleteNfsShareRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -444,11 +436,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_provisioning_quotas(
         &self,
         _req: crate::model::ListProvisioningQuotasRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListProvisioningQuotasResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListProvisioningQuotasResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -457,11 +447,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn submit_provisioning_config(
         &self,
         _req: crate::model::SubmitProvisioningConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SubmitProvisioningConfigResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SubmitProvisioningConfigResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -470,9 +458,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_provisioning_config(
         &self,
         _req: crate::model::GetProvisioningConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProvisioningConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ProvisioningConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -481,9 +469,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn create_provisioning_config(
         &self,
         _req: crate::model::CreateProvisioningConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProvisioningConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ProvisioningConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -492,9 +480,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn update_provisioning_config(
         &self,
         _req: crate::model::UpdateProvisioningConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProvisioningConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ProvisioningConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -503,10 +491,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn rename_network(
         &self,
         _req: crate::model::RenameNetworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Network>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Network>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -514,9 +501,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_os_images(
         &self,
         _req: crate::model::ListOSImagesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListOSImagesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListOSImagesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -525,10 +512,10 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -538,9 +525,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -549,9 +536,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -562,9 +549,9 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -573,8 +560,8 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/baremetalsolution/v2/src/stub/dynamic.rs b/src/generated/cloud/baremetalsolution/v2/src/stub/dynamic.rs
index 373c873e21..23f5217a59 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/stub/dynamic.rs
@@ -20,294 +20,294 @@ pub trait BareMetalSolution: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn rename_instance(
         &self,
         req: crate::model::RenameInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn reset_instance(
         &self,
         req: crate::model::ResetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn start_instance(
         &self,
         req: crate::model::StartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn stop_instance(
         &self,
         req: crate::model::StopInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn enable_interactive_serial_console(
         &self,
         req: crate::model::EnableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn disable_interactive_serial_console(
         &self,
         req: crate::model::DisableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn detach_lun(
         &self,
         req: crate::model::DetachLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_ssh_keys(
         &self,
         req: crate::model::ListSSHKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSSHKeysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSSHKeysResponse>>;
 
     async fn create_ssh_key(
         &self,
         req: crate::model::CreateSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SSHKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SSHKey>>;
 
     async fn delete_ssh_key(
         &self,
         req: crate::model::DeleteSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumesResponse>>;
 
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Volume>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Volume>>;
 
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn rename_volume(
         &self,
         req: crate::model::RenameVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Volume>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Volume>>;
 
     async fn evict_volume(
         &self,
         req: crate::model::EvictVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn resize_volume(
         &self,
         req: crate::model::ResizeVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNetworksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNetworksResponse>>;
 
     async fn list_network_usage(
         &self,
         req: crate::model::ListNetworkUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNetworkUsageResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNetworkUsageResponse>>;
 
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>>;
 
     async fn update_network(
         &self,
         req: crate::model::UpdateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_volume_snapshot(
         &self,
         req: crate::model::CreateVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeSnapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeSnapshot>>;
 
     async fn restore_volume_snapshot(
         &self,
         req: crate::model::RestoreVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_volume_snapshot(
         &self,
         req: crate::model::DeleteVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_volume_snapshot(
         &self,
         req: crate::model::GetVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeSnapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeSnapshot>>;
 
     async fn list_volume_snapshots(
         &self,
         req: crate::model::ListVolumeSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumeSnapshotsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumeSnapshotsResponse>>;
 
     async fn get_lun(
         &self,
         req: crate::model::GetLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Lun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Lun>>;
 
     async fn list_luns(
         &self,
         req: crate::model::ListLunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLunsResponse>>;
 
     async fn evict_lun(
         &self,
         req: crate::model::EvictLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_nfs_share(
         &self,
         req: crate::model::GetNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NfsShare>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NfsShare>>;
 
     async fn list_nfs_shares(
         &self,
         req: crate::model::ListNfsSharesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNfsSharesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNfsSharesResponse>>;
 
     async fn update_nfs_share(
         &self,
         req: crate::model::UpdateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_nfs_share(
         &self,
         req: crate::model::CreateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn rename_nfs_share(
         &self,
         req: crate::model::RenameNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NfsShare>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NfsShare>>;
 
     async fn delete_nfs_share(
         &self,
         req: crate::model::DeleteNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_provisioning_quotas(
         &self,
         req: crate::model::ListProvisioningQuotasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProvisioningQuotasResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProvisioningQuotasResponse>>;
 
     async fn submit_provisioning_config(
         &self,
         req: crate::model::SubmitProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubmitProvisioningConfigResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubmitProvisioningConfigResponse>>;
 
     async fn get_provisioning_config(
         &self,
         req: crate::model::GetProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProvisioningConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProvisioningConfig>>;
 
     async fn create_provisioning_config(
         &self,
         req: crate::model::CreateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProvisioningConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProvisioningConfig>>;
 
     async fn update_provisioning_config(
         &self,
         req: crate::model::UpdateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProvisioningConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProvisioningConfig>>;
 
     async fn rename_network(
         &self,
         req: crate::model::RenameNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>>;
 
     async fn list_os_images(
         &self,
         req: crate::model::ListOSImagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOSImagesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOSImagesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BareMetalSolution] also implement [BareMetalSolution].
@@ -317,8 +317,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -326,8 +326,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -335,8 +335,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -344,8 +344,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn rename_instance(
         &self,
         req: crate::model::RenameInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::rename_instance(self, req, options).await
     }
 
@@ -353,8 +353,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn reset_instance(
         &self,
         req: crate::model::ResetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reset_instance(self, req, options).await
     }
 
@@ -362,8 +362,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn start_instance(
         &self,
         req: crate::model::StartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::start_instance(self, req, options).await
     }
 
@@ -371,8 +371,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn stop_instance(
         &self,
         req: crate::model::StopInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::stop_instance(self, req, options).await
     }
 
@@ -380,8 +380,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn enable_interactive_serial_console(
         &self,
         req: crate::model::EnableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::enable_interactive_serial_console(self, req, options).await
     }
 
@@ -389,8 +389,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn disable_interactive_serial_console(
         &self,
         req: crate::model::DisableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::disable_interactive_serial_console(self, req, options).await
     }
 
@@ -398,8 +398,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn detach_lun(
         &self,
         req: crate::model::DetachLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::detach_lun(self, req, options).await
     }
 
@@ -407,8 +407,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_ssh_keys(
         &self,
         req: crate::model::ListSSHKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSSHKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSSHKeysResponse>> {
         T::list_ssh_keys(self, req, options).await
     }
 
@@ -416,8 +416,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn create_ssh_key(
         &self,
         req: crate::model::CreateSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SSHKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SSHKey>> {
         T::create_ssh_key(self, req, options).await
     }
 
@@ -425,8 +425,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn delete_ssh_key(
         &self,
         req: crate::model::DeleteSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_ssh_key(self, req, options).await
     }
 
@@ -434,8 +434,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumesResponse>> {
         T::list_volumes(self, req, options).await
     }
 
@@ -443,8 +443,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Volume>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Volume>> {
         T::get_volume(self, req, options).await
     }
 
@@ -452,8 +452,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_volume(self, req, options).await
     }
 
@@ -461,8 +461,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn rename_volume(
         &self,
         req: crate::model::RenameVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Volume>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Volume>> {
         T::rename_volume(self, req, options).await
     }
 
@@ -470,8 +470,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn evict_volume(
         &self,
         req: crate::model::EvictVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::evict_volume(self, req, options).await
     }
 
@@ -479,8 +479,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn resize_volume(
         &self,
         req: crate::model::ResizeVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::resize_volume(self, req, options).await
     }
 
@@ -488,8 +488,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNetworksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNetworksResponse>> {
         T::list_networks(self, req, options).await
     }
 
@@ -497,8 +497,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_network_usage(
         &self,
         req: crate::model::ListNetworkUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNetworkUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNetworkUsageResponse>> {
         T::list_network_usage(self, req, options).await
     }
 
@@ -506,8 +506,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>> {
         T::get_network(self, req, options).await
     }
 
@@ -515,8 +515,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn update_network(
         &self,
         req: crate::model::UpdateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_network(self, req, options).await
     }
 
@@ -524,8 +524,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn create_volume_snapshot(
         &self,
         req: crate::model::CreateVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeSnapshot>> {
         T::create_volume_snapshot(self, req, options).await
     }
 
@@ -533,8 +533,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn restore_volume_snapshot(
         &self,
         req: crate::model::RestoreVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_volume_snapshot(self, req, options).await
     }
 
@@ -542,8 +542,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn delete_volume_snapshot(
         &self,
         req: crate::model::DeleteVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_volume_snapshot(self, req, options).await
     }
 
@@ -551,8 +551,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_volume_snapshot(
         &self,
         req: crate::model::GetVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeSnapshot>> {
         T::get_volume_snapshot(self, req, options).await
     }
 
@@ -560,8 +560,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_volume_snapshots(
         &self,
         req: crate::model::ListVolumeSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumeSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumeSnapshotsResponse>> {
         T::list_volume_snapshots(self, req, options).await
     }
 
@@ -569,8 +569,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_lun(
         &self,
         req: crate::model::GetLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Lun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Lun>> {
         T::get_lun(self, req, options).await
     }
 
@@ -578,8 +578,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_luns(
         &self,
         req: crate::model::ListLunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLunsResponse>> {
         T::list_luns(self, req, options).await
     }
 
@@ -587,8 +587,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn evict_lun(
         &self,
         req: crate::model::EvictLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::evict_lun(self, req, options).await
     }
 
@@ -596,8 +596,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_nfs_share(
         &self,
         req: crate::model::GetNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NfsShare>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NfsShare>> {
         T::get_nfs_share(self, req, options).await
     }
 
@@ -605,8 +605,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_nfs_shares(
         &self,
         req: crate::model::ListNfsSharesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNfsSharesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNfsSharesResponse>> {
         T::list_nfs_shares(self, req, options).await
     }
 
@@ -614,8 +614,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn update_nfs_share(
         &self,
         req: crate::model::UpdateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_nfs_share(self, req, options).await
     }
 
@@ -623,8 +623,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn create_nfs_share(
         &self,
         req: crate::model::CreateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_nfs_share(self, req, options).await
     }
 
@@ -632,8 +632,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn rename_nfs_share(
         &self,
         req: crate::model::RenameNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NfsShare>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NfsShare>> {
         T::rename_nfs_share(self, req, options).await
     }
 
@@ -641,8 +641,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn delete_nfs_share(
         &self,
         req: crate::model::DeleteNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_nfs_share(self, req, options).await
     }
 
@@ -650,8 +650,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_provisioning_quotas(
         &self,
         req: crate::model::ListProvisioningQuotasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProvisioningQuotasResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProvisioningQuotasResponse>> {
         T::list_provisioning_quotas(self, req, options).await
     }
 
@@ -659,9 +659,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn submit_provisioning_config(
         &self,
         req: crate::model::SubmitProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubmitProvisioningConfigResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubmitProvisioningConfigResponse>> {
         T::submit_provisioning_config(self, req, options).await
     }
 
@@ -669,8 +668,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_provisioning_config(
         &self,
         req: crate::model::GetProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProvisioningConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProvisioningConfig>> {
         T::get_provisioning_config(self, req, options).await
     }
 
@@ -678,8 +677,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn create_provisioning_config(
         &self,
         req: crate::model::CreateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProvisioningConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProvisioningConfig>> {
         T::create_provisioning_config(self, req, options).await
     }
 
@@ -687,8 +686,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn update_provisioning_config(
         &self,
         req: crate::model::UpdateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProvisioningConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProvisioningConfig>> {
         T::update_provisioning_config(self, req, options).await
     }
 
@@ -696,8 +695,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn rename_network(
         &self,
         req: crate::model::RenameNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>> {
         T::rename_network(self, req, options).await
     }
 
@@ -705,8 +704,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_os_images(
         &self,
         req: crate::model::ListOSImagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOSImagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOSImagesResponse>> {
         T::list_os_images(self, req, options).await
     }
 
@@ -714,9 +713,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -724,8 +722,8 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -733,22 +731,22 @@ impl<T: super::BareMetalSolution> BareMetalSolution for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/baremetalsolution/v2/src/tracing.rs b/src/generated/cloud/baremetalsolution/v2/src/tracing.rs
index 2b78a62a9a..8af0d949b1 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/tracing.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn rename_instance(
         &self,
         req: crate::model::RenameInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.rename_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn reset_instance(
         &self,
         req: crate::model::ResetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reset_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn start_instance(
         &self,
         req: crate::model::StartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.start_instance(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn stop_instance(
         &self,
         req: crate::model::StopInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.stop_instance(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn enable_interactive_serial_console(
         &self,
         req: crate::model::EnableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .enable_interactive_serial_console(req, options)
             .await
@@ -115,8 +115,8 @@ where
     async fn disable_interactive_serial_console(
         &self,
         req: crate::model::DisableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .disable_interactive_serial_console(req, options)
             .await
@@ -126,8 +126,8 @@ where
     async fn detach_lun(
         &self,
         req: crate::model::DetachLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.detach_lun(req, options).await
     }
 
@@ -135,8 +135,8 @@ where
     async fn list_ssh_keys(
         &self,
         req: crate::model::ListSSHKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSSHKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSSHKeysResponse>> {
         self.inner.list_ssh_keys(req, options).await
     }
 
@@ -144,8 +144,8 @@ where
     async fn create_ssh_key(
         &self,
         req: crate::model::CreateSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SSHKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SSHKey>> {
         self.inner.create_ssh_key(req, options).await
     }
 
@@ -153,8 +153,8 @@ where
     async fn delete_ssh_key(
         &self,
         req: crate::model::DeleteSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_ssh_key(req, options).await
     }
 
@@ -162,8 +162,8 @@ where
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumesResponse>> {
         self.inner.list_volumes(req, options).await
     }
 
@@ -171,8 +171,8 @@ where
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Volume>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Volume>> {
         self.inner.get_volume(req, options).await
     }
 
@@ -180,8 +180,8 @@ where
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_volume(req, options).await
     }
 
@@ -189,8 +189,8 @@ where
     async fn rename_volume(
         &self,
         req: crate::model::RenameVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Volume>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Volume>> {
         self.inner.rename_volume(req, options).await
     }
 
@@ -198,8 +198,8 @@ where
     async fn evict_volume(
         &self,
         req: crate::model::EvictVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.evict_volume(req, options).await
     }
 
@@ -207,8 +207,8 @@ where
     async fn resize_volume(
         &self,
         req: crate::model::ResizeVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.resize_volume(req, options).await
     }
 
@@ -216,8 +216,8 @@ where
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNetworksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNetworksResponse>> {
         self.inner.list_networks(req, options).await
     }
 
@@ -225,8 +225,8 @@ where
     async fn list_network_usage(
         &self,
         req: crate::model::ListNetworkUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNetworkUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNetworkUsageResponse>> {
         self.inner.list_network_usage(req, options).await
     }
 
@@ -234,8 +234,8 @@ where
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         self.inner.get_network(req, options).await
     }
 
@@ -243,8 +243,8 @@ where
     async fn update_network(
         &self,
         req: crate::model::UpdateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_network(req, options).await
     }
 
@@ -252,8 +252,8 @@ where
     async fn create_volume_snapshot(
         &self,
         req: crate::model::CreateVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeSnapshot>> {
         self.inner.create_volume_snapshot(req, options).await
     }
 
@@ -261,8 +261,8 @@ where
     async fn restore_volume_snapshot(
         &self,
         req: crate::model::RestoreVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_volume_snapshot(req, options).await
     }
 
@@ -270,8 +270,8 @@ where
     async fn delete_volume_snapshot(
         &self,
         req: crate::model::DeleteVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_volume_snapshot(req, options).await
     }
 
@@ -279,8 +279,8 @@ where
     async fn get_volume_snapshot(
         &self,
         req: crate::model::GetVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeSnapshot>> {
         self.inner.get_volume_snapshot(req, options).await
     }
 
@@ -288,8 +288,8 @@ where
     async fn list_volume_snapshots(
         &self,
         req: crate::model::ListVolumeSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumeSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumeSnapshotsResponse>> {
         self.inner.list_volume_snapshots(req, options).await
     }
 
@@ -297,8 +297,8 @@ where
     async fn get_lun(
         &self,
         req: crate::model::GetLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Lun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Lun>> {
         self.inner.get_lun(req, options).await
     }
 
@@ -306,8 +306,8 @@ where
     async fn list_luns(
         &self,
         req: crate::model::ListLunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLunsResponse>> {
         self.inner.list_luns(req, options).await
     }
 
@@ -315,8 +315,8 @@ where
     async fn evict_lun(
         &self,
         req: crate::model::EvictLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.evict_lun(req, options).await
     }
 
@@ -324,8 +324,8 @@ where
     async fn get_nfs_share(
         &self,
         req: crate::model::GetNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NfsShare>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NfsShare>> {
         self.inner.get_nfs_share(req, options).await
     }
 
@@ -333,8 +333,8 @@ where
     async fn list_nfs_shares(
         &self,
         req: crate::model::ListNfsSharesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNfsSharesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNfsSharesResponse>> {
         self.inner.list_nfs_shares(req, options).await
     }
 
@@ -342,8 +342,8 @@ where
     async fn update_nfs_share(
         &self,
         req: crate::model::UpdateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_nfs_share(req, options).await
     }
 
@@ -351,8 +351,8 @@ where
     async fn create_nfs_share(
         &self,
         req: crate::model::CreateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_nfs_share(req, options).await
     }
 
@@ -360,8 +360,8 @@ where
     async fn rename_nfs_share(
         &self,
         req: crate::model::RenameNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NfsShare>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NfsShare>> {
         self.inner.rename_nfs_share(req, options).await
     }
 
@@ -369,8 +369,8 @@ where
     async fn delete_nfs_share(
         &self,
         req: crate::model::DeleteNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_nfs_share(req, options).await
     }
 
@@ -378,8 +378,8 @@ where
     async fn list_provisioning_quotas(
         &self,
         req: crate::model::ListProvisioningQuotasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProvisioningQuotasResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProvisioningQuotasResponse>> {
         self.inner.list_provisioning_quotas(req, options).await
     }
 
@@ -387,8 +387,8 @@ where
     async fn submit_provisioning_config(
         &self,
         req: crate::model::SubmitProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubmitProvisioningConfigResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubmitProvisioningConfigResponse>> {
         self.inner.submit_provisioning_config(req, options).await
     }
 
@@ -396,8 +396,8 @@ where
     async fn get_provisioning_config(
         &self,
         req: crate::model::GetProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProvisioningConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProvisioningConfig>> {
         self.inner.get_provisioning_config(req, options).await
     }
 
@@ -405,8 +405,8 @@ where
     async fn create_provisioning_config(
         &self,
         req: crate::model::CreateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProvisioningConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProvisioningConfig>> {
         self.inner.create_provisioning_config(req, options).await
     }
 
@@ -414,8 +414,8 @@ where
     async fn update_provisioning_config(
         &self,
         req: crate::model::UpdateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProvisioningConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProvisioningConfig>> {
         self.inner.update_provisioning_config(req, options).await
     }
 
@@ -423,8 +423,8 @@ where
     async fn rename_network(
         &self,
         req: crate::model::RenameNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         self.inner.rename_network(req, options).await
     }
 
@@ -432,8 +432,8 @@ where
     async fn list_os_images(
         &self,
         req: crate::model::ListOSImagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOSImagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOSImagesResponse>> {
         self.inner.list_os_images(req, options).await
     }
 
@@ -441,8 +441,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -450,8 +450,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -459,22 +459,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/baremetalsolution/v2/src/transport.rs b/src/generated/cloud/baremetalsolution/v2/src/transport.rs
index 81c9f535b2..84e0be3356 100644
--- a/src/generated/cloud/baremetalsolution/v2/src/transport.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [BareMetalSolution](super::stub::BareMetalSolution) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for BareMetalSolution {
 }
 
 impl BareMetalSolution {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89,9 +89,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -106,13 +106,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -153,9 +153,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -170,13 +170,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -235,9 +235,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -252,13 +252,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn rename_instance(
         &self,
         req: crate::model::RenameInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn reset_instance(
         &self,
         req: crate::model::ResetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -363,9 +363,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -380,13 +380,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn start_instance(
         &self,
         req: crate::model::StartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -427,9 +427,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -444,13 +444,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn stop_instance(
         &self,
         req: crate::model::StopInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -491,9 +491,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -508,13 +508,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn enable_interactive_serial_console(
         &self,
         req: crate::model::EnableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -555,9 +555,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -572,13 +572,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn disable_interactive_serial_console(
         &self,
         req: crate::model::DisableInteractiveSerialConsoleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -619,9 +619,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -636,13 +636,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn detach_lun(
         &self,
         req: crate::model::DetachLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -683,9 +683,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -700,13 +700,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_ssh_keys(
         &self,
         req: crate::model::ListSSHKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSSHKeysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSSHKeysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -745,9 +745,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -762,13 +762,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn create_ssh_key(
         &self,
         req: crate::model::CreateSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SSHKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SSHKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -806,9 +806,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -823,13 +823,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn delete_ssh_key(
         &self,
         req: crate::model::DeleteSSHKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -870,9 +870,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -881,24 +881,25 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -938,9 +939,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -955,13 +956,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Volume>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Volume>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1002,9 +1003,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1019,13 +1020,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1084,9 +1085,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1101,13 +1102,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn rename_volume(
         &self,
         req: crate::model::RenameVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Volume>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Volume>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1148,9 +1149,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1165,13 +1166,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn evict_volume(
         &self,
         req: crate::model::EvictVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1212,9 +1213,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1229,13 +1230,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn resize_volume(
         &self,
         req: crate::model::ResizeVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1276,9 +1277,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1293,13 +1294,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNetworksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNetworksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1339,9 +1340,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1356,13 +1357,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_network_usage(
         &self,
         req: crate::model::ListNetworkUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNetworkUsageResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNetworkUsageResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1399,9 +1400,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1416,13 +1417,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1463,9 +1464,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1480,13 +1481,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn update_network(
         &self,
         req: crate::model::UpdateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1545,9 +1546,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1562,13 +1563,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn create_volume_snapshot(
         &self,
         req: crate::model::CreateVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeSnapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeSnapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1609,9 +1610,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1626,13 +1627,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn restore_volume_snapshot(
         &self,
         req: crate::model::RestoreVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1677,9 +1678,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1694,13 +1695,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn delete_volume_snapshot(
         &self,
         req: crate::model::DeleteVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1745,9 +1746,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1756,24 +1757,25 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_volume_snapshot(
         &self,
         req: crate::model::GetVolumeSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeSnapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeSnapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1818,9 +1820,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1835,13 +1837,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_volume_snapshots(
         &self,
         req: crate::model::ListVolumeSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumeSnapshotsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumeSnapshotsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1884,9 +1886,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1901,13 +1903,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_lun(
         &self,
         req: crate::model::GetLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Lun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Lun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1952,9 +1954,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1969,13 +1971,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_luns(
         &self,
         req: crate::model::ListLunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2018,9 +2020,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2035,13 +2037,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn evict_lun(
         &self,
         req: crate::model::EvictLunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2086,9 +2088,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2103,13 +2105,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_nfs_share(
         &self,
         req: crate::model::GetNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NfsShare>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NfsShare>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2150,9 +2152,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2167,13 +2169,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_nfs_shares(
         &self,
         req: crate::model::ListNfsSharesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNfsSharesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNfsSharesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2213,9 +2215,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2230,13 +2232,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn update_nfs_share(
         &self,
         req: crate::model::UpdateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2295,9 +2297,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2312,13 +2314,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn create_nfs_share(
         &self,
         req: crate::model::CreateNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2355,9 +2357,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2372,13 +2374,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn rename_nfs_share(
         &self,
         req: crate::model::RenameNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NfsShare>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NfsShare>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2419,9 +2421,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2436,13 +2438,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn delete_nfs_share(
         &self,
         req: crate::model::DeleteNfsShareRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2483,9 +2485,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2500,13 +2502,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_provisioning_quotas(
         &self,
         req: crate::model::ListProvisioningQuotasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProvisioningQuotasResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProvisioningQuotasResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2545,9 +2547,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2562,13 +2564,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn submit_provisioning_config(
         &self,
         req: crate::model::SubmitProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubmitProvisioningConfigResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubmitProvisioningConfigResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2605,9 +2607,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2622,13 +2624,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_provisioning_config(
         &self,
         req: crate::model::GetProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProvisioningConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProvisioningConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2669,9 +2671,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2686,13 +2688,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn create_provisioning_config(
         &self,
         req: crate::model::CreateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProvisioningConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProvisioningConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2730,9 +2732,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2747,13 +2749,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn update_provisioning_config(
         &self,
         req: crate::model::UpdateProvisioningConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProvisioningConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProvisioningConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2813,9 +2815,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2830,13 +2832,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn rename_network(
         &self,
         req: crate::model::RenameNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2877,9 +2879,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2894,13 +2896,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_os_images(
         &self,
         req: crate::model::ListOSImagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOSImagesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOSImagesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2939,9 +2941,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2956,13 +2958,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2992,9 +2994,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3009,13 +3011,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3052,9 +3054,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3069,13 +3071,13 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3108,9 +3110,9 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3124,15 +3126,15 @@ impl super::stub::BareMetalSolution for BareMetalSolution {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml b/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml
index 76722e6175..792b3e9d23 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/builder.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/builder.rs
index e162a285f1..2946575a1c 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/builder.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod app_connections_service {
     /// A builder for [AppConnectionsService][crate::client::AppConnectionsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_appconnections_v1::*;
     /// # use builder::app_connections_service::ClientBuilder;
     /// # use client::AppConnectionsService;
@@ -30,19 +30,18 @@ pub mod app_connections_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AppConnectionsService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AppConnectionsService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod app_connections_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AppConnectionsService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod app_connections_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::ListAppConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .list_app_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAppConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAppConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod app_connections_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAppConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -184,8 +185,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAppConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAppConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -195,7 +196,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::GetAppConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -226,7 +227,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -236,7 +237,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .get_app_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAppConnectionRequest::name].
@@ -249,8 +250,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAppConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAppConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +261,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::CreateAppConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -292,7 +293,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +308,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .create_app_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_app_connection`.
@@ -326,7 +327,7 @@ pub mod app_connections_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -403,8 +404,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAppConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAppConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -414,7 +415,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::UpdateAppConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -446,7 +447,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -461,7 +462,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .update_app_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_app_connection`.
@@ -480,7 +481,7 @@ pub mod app_connections_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -571,8 +572,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAppConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAppConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -582,7 +583,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::DeleteAppConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -614,7 +615,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -629,7 +630,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .delete_app_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_app_connection`.
@@ -646,7 +647,7 @@ pub mod app_connections_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -695,8 +696,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAppConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAppConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -706,8 +707,8 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::ResolveAppConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -741,7 +742,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -751,14 +752,16 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .resolve_app_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ResolveAppConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ResolveAppConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -766,17 +769,17 @@ pub mod app_connections_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ResolveAppConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -810,8 +813,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResolveAppConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResolveAppConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -821,8 +824,8 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -856,7 +859,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -866,15 +869,15 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -883,17 +886,17 @@ pub mod app_connections_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -923,8 +926,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -934,7 +937,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -965,7 +968,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -975,7 +978,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -986,8 +989,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -997,7 +1000,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1028,7 +1031,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1038,7 +1041,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1091,8 +1094,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1102,7 +1105,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1133,7 +1136,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1143,7 +1146,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1174,8 +1177,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1185,7 +1188,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1218,7 +1221,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1228,7 +1231,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1254,8 +1257,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1265,8 +1268,8 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1302,7 +1305,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1312,15 +1315,15 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1329,17 +1332,17 @@ pub mod app_connections_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1375,8 +1378,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1386,7 +1389,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1417,7 +1420,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1427,7 +1430,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1438,8 +1441,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1449,7 +1452,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1482,7 +1485,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1492,7 +1495,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1503,8 +1506,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1514,7 +1517,7 @@ pub mod app_connections_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnections_v1::builder::app_connections_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnections_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1547,7 +1550,7 @@ pub mod app_connections_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1557,7 +1560,7 @@ pub mod app_connections_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1568,8 +1571,8 @@ pub mod app_connections_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/client.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/client.rs
index 1c43d2a7c0..3fcc26a38a 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/client.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_beyondcorp_appconnections_v1::client::AppConnectionsService;
 /// let client = AppConnectionsService::builder().build().await?;
 /// // use `client` to make requests to the BeyondCorp API.
@@ -79,15 +79,13 @@ impl AppConnectionsService {
     /// Returns a builder for [AppConnectionsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_appconnections_v1::client::AppConnectionsService;
     /// let client = AppConnectionsService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::app_connections_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::app_connections_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::app_connections_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -105,14 +103,14 @@ impl AppConnectionsService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AppConnectionsService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AppConnectionsService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -122,13 +120,13 @@ impl AppConnectionsService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppConnectionsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppConnectionsService> {
         super::transport::AppConnectionsService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppConnectionsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppConnectionsService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AppConnectionsService::new)
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/lib.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/lib.rs
index 565ec11da8..30f3c85702 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/lib.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs
index a14b9542fe..6d546a5536 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -222,7 +222,7 @@ impl wkt::message::Message for ListAppConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAppConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAppConnectionsResponse {
     type PageItem = crate::model::AppConnection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -814,7 +814,7 @@ impl wkt::message::Message for ResolveAppConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ResolveAppConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ResolveAppConnectionsResponse {
     type PageItem = crate::model::resolve_app_connections_response::AppConnectionDetails;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/stub.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/stub.rs
index c631580cca..747c97ac33 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/stub.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn list_app_connections(
         &self,
         _req: crate::model::ListAppConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAppConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAppConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn get_app_connection(
         &self,
         _req: crate::model::GetAppConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AppConnection>>,
+        Output = crate::Result<crate::Response<crate::model::AppConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn create_app_connection(
         &self,
         _req: crate::model::CreateAppConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn update_app_connection(
         &self,
         _req: crate::model::UpdateAppConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn delete_app_connection(
         &self,
         _req: crate::model::DeleteAppConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,11 +97,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn resolve_app_connections(
         &self,
         _req: crate::model::ResolveAppConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResolveAppConnectionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResolveAppConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,10 +108,10 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -123,9 +121,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +132,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,9 +143,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,10 +154,10 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -169,10 +167,10 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -182,9 +180,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -193,8 +191,8 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -202,8 +200,8 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -213,9 +211,9 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -224,8 +222,8 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/stub/dynamic.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/stub/dynamic.rs
index ada93caaef..d51e0d91b5 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/stub/dynamic.rs
@@ -20,106 +20,102 @@ pub trait AppConnectionsService: std::fmt::Debug + Send + Sync {
     async fn list_app_connections(
         &self,
         req: crate::model::ListAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppConnectionsResponse>>;
 
     async fn get_app_connection(
         &self,
         req: crate::model::GetAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppConnection>>;
 
     async fn create_app_connection(
         &self,
         req: crate::model::CreateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_app_connection(
         &self,
         req: crate::model::UpdateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_app_connection(
         &self,
         req: crate::model::DeleteAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn resolve_app_connections(
         &self,
         req: crate::model::ResolveAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResolveAppConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResolveAppConnectionsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AppConnectionsService] also implement [AppConnectionsService].
@@ -129,8 +125,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn list_app_connections(
         &self,
         req: crate::model::ListAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppConnectionsResponse>> {
         T::list_app_connections(self, req, options).await
     }
 
@@ -138,8 +134,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn get_app_connection(
         &self,
         req: crate::model::GetAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppConnection>> {
         T::get_app_connection(self, req, options).await
     }
 
@@ -147,8 +143,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn create_app_connection(
         &self,
         req: crate::model::CreateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_app_connection(self, req, options).await
     }
 
@@ -156,8 +152,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn update_app_connection(
         &self,
         req: crate::model::UpdateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_app_connection(self, req, options).await
     }
 
@@ -165,8 +161,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn delete_app_connection(
         &self,
         req: crate::model::DeleteAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_app_connection(self, req, options).await
     }
 
@@ -174,8 +170,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn resolve_app_connections(
         &self,
         req: crate::model::ResolveAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResolveAppConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResolveAppConnectionsResponse>> {
         T::resolve_app_connections(self, req, options).await
     }
 
@@ -183,9 +179,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -193,8 +188,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -202,8 +197,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -211,8 +206,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -220,10 +215,9 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -231,10 +225,9 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -242,8 +235,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -251,8 +244,8 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -260,22 +253,22 @@ impl<T: super::AppConnectionsService> AppConnectionsService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/tracing.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/tracing.rs
index 40e482267f..607a0d9611 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/tracing.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_app_connections(
         &self,
         req: crate::model::ListAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppConnectionsResponse>> {
         self.inner.list_app_connections(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_app_connection(
         &self,
         req: crate::model::GetAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppConnection>> {
         self.inner.get_app_connection(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_app_connection(
         &self,
         req: crate::model::CreateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_app_connection(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_app_connection(
         &self,
         req: crate::model::UpdateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_app_connection(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_app_connection(
         &self,
         req: crate::model::DeleteAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_app_connection(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn resolve_app_connections(
         &self,
         req: crate::model::ResolveAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResolveAppConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResolveAppConnectionsResponse>> {
         self.inner.resolve_app_connections(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -131,9 +131,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -141,9 +140,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -151,8 +149,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -160,8 +158,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -169,22 +167,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs
index 65433bc1d4..6d893c119a 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AppConnectionsService](super::stub::AppConnectionsService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AppConnectionsService {
 }
 
 impl AppConnectionsService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn list_app_connections(
         &self,
         req: crate::model::ListAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn get_app_connection(
         &self,
         req: crate::model::GetAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn create_app_connection(
         &self,
         req: crate::model::CreateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn update_app_connection(
         &self,
         req: crate::model::UpdateAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -302,9 +302,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -319,13 +319,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn delete_app_connection(
         &self,
         req: crate::model::DeleteAppConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -368,9 +368,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -385,13 +385,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn resolve_app_connections(
         &self,
         req: crate::model::ResolveAppConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResolveAppConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResolveAppConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431,9 +431,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,13 +448,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -484,9 +484,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -501,13 +501,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -544,9 +544,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -561,13 +561,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -756,9 +756,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -773,13 +773,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1028,9 +1028,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1045,14 +1045,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1241,9 +1240,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1258,14 +1257,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1307,9 +1305,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1324,13 +1322,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1371,9 +1369,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1388,13 +1386,13 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1435,9 +1433,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1446,24 +1444,25 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1504,9 +1503,9 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1515,25 +1514,26 @@ impl super::stub::AppConnectionsService for AppConnectionsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml b/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml
index a33a9f2fd7..5bab75c928 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/builder.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/builder.rs
index 31c5c86828..0e48fb4410 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/builder.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod app_connectors_service {
     /// A builder for [AppConnectorsService][crate::client::AppConnectorsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_appconnectors_v1::*;
     /// # use builder::app_connectors_service::ClientBuilder;
     /// # use client::AppConnectorsService;
@@ -30,19 +30,18 @@ pub mod app_connectors_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AppConnectorsService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AppConnectorsService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod app_connectors_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AppConnectorsService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod app_connectors_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::ListAppConnectors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .list_app_connectors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAppConnectorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAppConnectorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,15 +137,17 @@ pub mod app_connectors_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAppConnectorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAppConnectorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -182,8 +185,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAppConnectors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAppConnectors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -193,7 +196,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::GetAppConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -221,7 +224,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -231,7 +234,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .get_app_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAppConnectorRequest::name].
@@ -244,8 +247,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAppConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAppConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -255,7 +258,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::CreateAppConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -287,7 +290,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -302,7 +305,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .create_app_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_app_connector`.
@@ -321,7 +324,7 @@ pub mod app_connectors_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -398,8 +401,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAppConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAppConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -409,7 +412,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::UpdateAppConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -441,7 +444,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -456,7 +459,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .update_app_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_app_connector`.
@@ -475,7 +478,7 @@ pub mod app_connectors_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -560,8 +563,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAppConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAppConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -571,7 +574,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::DeleteAppConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -603,7 +606,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -618,7 +621,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .delete_app_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_app_connector`.
@@ -635,7 +638,7 @@ pub mod app_connectors_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -684,8 +687,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAppConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAppConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -695,7 +698,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::ReportStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -724,7 +727,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -739,7 +742,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .report_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `report_status`.
@@ -758,7 +761,7 @@ pub mod app_connectors_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -829,8 +832,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReportStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReportStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -840,8 +843,8 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -875,7 +878,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -885,15 +888,15 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -902,17 +905,17 @@ pub mod app_connectors_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -942,8 +945,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -953,7 +956,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -984,7 +987,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -994,7 +997,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1005,8 +1008,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1016,7 +1019,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1047,7 +1050,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1057,7 +1060,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1110,8 +1113,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1121,7 +1124,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1152,7 +1155,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1162,7 +1165,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1193,8 +1196,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1204,7 +1207,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1237,7 +1240,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1247,7 +1250,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1273,8 +1276,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1284,8 +1287,8 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1321,7 +1324,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1331,15 +1334,15 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1348,17 +1351,17 @@ pub mod app_connectors_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1394,8 +1397,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1405,7 +1408,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1436,7 +1439,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1446,7 +1449,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1457,8 +1460,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1468,7 +1471,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1501,7 +1504,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1511,7 +1514,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1522,8 +1525,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1533,7 +1536,7 @@ pub mod app_connectors_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appconnectors_v1::builder::app_connectors_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appconnectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1566,7 +1569,7 @@ pub mod app_connectors_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1576,7 +1579,7 @@ pub mod app_connectors_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1587,8 +1590,8 @@ pub mod app_connectors_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/client.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/client.rs
index 4172058fa2..0d07381f4f 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/client.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_beyondcorp_appconnectors_v1::client::AppConnectorsService;
 /// let client = AppConnectorsService::builder().build().await?;
 /// // use `client` to make requests to the BeyondCorp API.
@@ -79,15 +79,13 @@ impl AppConnectorsService {
     /// Returns a builder for [AppConnectorsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_appconnectors_v1::client::AppConnectorsService;
     /// let client = AppConnectorsService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::app_connectors_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::app_connectors_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::app_connectors_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -105,14 +103,14 @@ impl AppConnectorsService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AppConnectorsService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AppConnectorsService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -122,13 +120,13 @@ impl AppConnectorsService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppConnectorsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppConnectorsService> {
         super::transport::AppConnectorsService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppConnectorsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppConnectorsService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AppConnectorsService::new)
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/lib.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/lib.rs
index 42e117cfa0..6236538e43 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/lib.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs
index 4f21c49d12..23fbb59052 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -558,7 +558,7 @@ impl wkt::message::Message for ListAppConnectorsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAppConnectorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAppConnectorsResponse {
     type PageItem = crate::model::AppConnector;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub.rs
index 1aa2c2d9d2..2df7bc1552 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn list_app_connectors(
         &self,
         _req: crate::model::ListAppConnectorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAppConnectorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAppConnectorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn get_app_connector(
         &self,
         _req: crate::model::GetAppConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AppConnector>>,
+        Output = crate::Result<crate::Response<crate::model::AppConnector>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn create_app_connector(
         &self,
         _req: crate::model::CreateAppConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn update_app_connector(
         &self,
         _req: crate::model::UpdateAppConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn delete_app_connector(
         &self,
         _req: crate::model::DeleteAppConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn report_status(
         &self,
         _req: crate::model::ReportStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +108,10 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -121,9 +121,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,9 +132,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,9 +143,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,10 +154,10 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -167,10 +167,10 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -180,9 +180,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -191,8 +191,8 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -200,8 +200,8 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -211,9 +211,9 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -222,8 +222,8 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub/dynamic.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub/dynamic.rs
index 94d54011d2..39ec05050e 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/stub/dynamic.rs
@@ -20,106 +20,102 @@ pub trait AppConnectorsService: std::fmt::Debug + Send + Sync {
     async fn list_app_connectors(
         &self,
         req: crate::model::ListAppConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppConnectorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppConnectorsResponse>>;
 
     async fn get_app_connector(
         &self,
         req: crate::model::GetAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppConnector>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppConnector>>;
 
     async fn create_app_connector(
         &self,
         req: crate::model::CreateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_app_connector(
         &self,
         req: crate::model::UpdateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_app_connector(
         &self,
         req: crate::model::DeleteAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn report_status(
         &self,
         req: crate::model::ReportStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AppConnectorsService] also implement [AppConnectorsService].
@@ -129,8 +125,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn list_app_connectors(
         &self,
         req: crate::model::ListAppConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppConnectorsResponse>> {
         T::list_app_connectors(self, req, options).await
     }
 
@@ -138,8 +134,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn get_app_connector(
         &self,
         req: crate::model::GetAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppConnector>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppConnector>> {
         T::get_app_connector(self, req, options).await
     }
 
@@ -147,8 +143,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn create_app_connector(
         &self,
         req: crate::model::CreateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_app_connector(self, req, options).await
     }
 
@@ -156,8 +152,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn update_app_connector(
         &self,
         req: crate::model::UpdateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_app_connector(self, req, options).await
     }
 
@@ -165,8 +161,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn delete_app_connector(
         &self,
         req: crate::model::DeleteAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_app_connector(self, req, options).await
     }
 
@@ -174,8 +170,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn report_status(
         &self,
         req: crate::model::ReportStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::report_status(self, req, options).await
     }
 
@@ -183,9 +179,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -193,8 +188,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -202,8 +197,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -211,8 +206,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -220,10 +215,9 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -231,10 +225,9 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -242,8 +235,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -251,8 +244,8 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -260,22 +253,22 @@ impl<T: super::AppConnectorsService> AppConnectorsService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/tracing.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/tracing.rs
index e6f29f71b0..a5cf3f879a 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/tracing.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_app_connectors(
         &self,
         req: crate::model::ListAppConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppConnectorsResponse>> {
         self.inner.list_app_connectors(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_app_connector(
         &self,
         req: crate::model::GetAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppConnector>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppConnector>> {
         self.inner.get_app_connector(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_app_connector(
         &self,
         req: crate::model::CreateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_app_connector(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_app_connector(
         &self,
         req: crate::model::UpdateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_app_connector(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_app_connector(
         &self,
         req: crate::model::DeleteAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_app_connector(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn report_status(
         &self,
         req: crate::model::ReportStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.report_status(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -131,9 +131,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -141,9 +140,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -151,8 +149,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -160,8 +158,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -169,22 +167,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs
index 127fba22b7..c5628a7a62 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AppConnectorsService](super::stub::AppConnectorsService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AppConnectorsService {
 }
 
 impl AppConnectorsService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn list_app_connectors(
         &self,
         req: crate::model::ListAppConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppConnectorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppConnectorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn get_app_connector(
         &self,
         req: crate::model::GetAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppConnector>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppConnector>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn create_app_connector(
         &self,
         req: crate::model::CreateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn update_app_connector(
         &self,
         req: crate::model::UpdateAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -301,9 +301,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -318,13 +318,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn delete_app_connector(
         &self,
         req: crate::model::DeleteAppConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -367,9 +367,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -384,13 +384,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn report_status(
         &self,
         req: crate::model::ReportStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431,9 +431,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,13 +448,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -484,9 +484,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -501,13 +501,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -544,9 +544,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -561,13 +561,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -756,9 +756,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -773,13 +773,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1028,9 +1028,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1045,14 +1045,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1241,9 +1240,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1258,14 +1257,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1307,9 +1305,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1324,13 +1322,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1371,9 +1369,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1388,13 +1386,13 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1435,9 +1433,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1446,24 +1444,25 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1504,9 +1503,9 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1515,25 +1514,26 @@ impl super::stub::AppConnectorsService for AppConnectorsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml b/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml
index ba49e707a2..26ae7c3511 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/builder.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/builder.rs
index bc7f9a2c5d..a1c58b2f64 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/builder.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod app_gateways_service {
     /// A builder for [AppGatewaysService][crate::client::AppGatewaysService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_appgateways_v1::*;
     /// # use builder::app_gateways_service::ClientBuilder;
     /// # use client::AppGatewaysService;
@@ -30,19 +30,18 @@ pub mod app_gateways_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AppGatewaysService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AppGatewaysService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod app_gateways_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AppGatewaysService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod app_gateways_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::ListAppGateways;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,14 +117,16 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .list_app_gateways(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAppGatewaysResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAppGatewaysResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -133,15 +134,17 @@ pub mod app_gateways_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAppGatewaysResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAppGatewaysResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +182,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAppGateways {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAppGateways {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +193,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::GetAppGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +221,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +231,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .get_app_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAppGatewayRequest::name].
@@ -241,8 +244,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAppGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAppGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +255,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::CreateAppGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -284,7 +287,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -299,7 +302,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .create_app_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_app_gateway`.
@@ -318,7 +321,7 @@ pub mod app_gateways_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -395,8 +398,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAppGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAppGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -406,7 +409,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::DeleteAppGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -438,7 +441,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -453,7 +456,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .delete_app_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_app_gateway`.
@@ -469,7 +472,7 @@ pub mod app_gateways_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -518,8 +521,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAppGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAppGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -529,8 +532,8 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -564,7 +567,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -574,15 +577,15 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -591,17 +594,17 @@ pub mod app_gateways_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -631,8 +634,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -642,7 +645,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -673,7 +676,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -683,7 +686,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -694,8 +697,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -705,7 +708,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -736,7 +739,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -746,7 +749,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -799,8 +802,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -810,7 +813,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -841,7 +844,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -851,7 +854,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -882,8 +885,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -893,7 +896,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -926,7 +929,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -936,7 +939,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -962,8 +965,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -973,8 +976,8 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1010,7 +1013,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1020,15 +1023,15 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1037,17 +1040,17 @@ pub mod app_gateways_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1083,8 +1086,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1094,7 +1097,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1125,7 +1128,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1135,7 +1138,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1146,8 +1149,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1157,7 +1160,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1190,7 +1193,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1200,7 +1203,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1211,8 +1214,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1222,7 +1225,7 @@ pub mod app_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_appgateways_v1::builder::app_gateways_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_appgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1255,7 +1258,7 @@ pub mod app_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1265,7 +1268,7 @@ pub mod app_gateways_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1276,8 +1279,8 @@ pub mod app_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/client.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/client.rs
index 3195668756..b8dcdb2bd3 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/client.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_beyondcorp_appgateways_v1::client::AppGatewaysService;
 /// let client = AppGatewaysService::builder().build().await?;
 /// // use `client` to make requests to the BeyondCorp API.
@@ -79,15 +79,13 @@ impl AppGatewaysService {
     /// Returns a builder for [AppGatewaysService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_appgateways_v1::client::AppGatewaysService;
     /// let client = AppGatewaysService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::app_gateways_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::app_gateways_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::app_gateways_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -105,14 +103,14 @@ impl AppGatewaysService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AppGatewaysService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AppGatewaysService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -122,13 +120,13 @@ impl AppGatewaysService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppGatewaysService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppGatewaysService> {
         super::transport::AppGatewaysService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AppGatewaysService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AppGatewaysService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AppGatewaysService::new)
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/lib.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/lib.rs
index c0ba381408..eab3751df5 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/lib.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs
index e2b1f2eaaf..4075998c35 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -222,7 +222,7 @@ impl wkt::message::Message for ListAppGatewaysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAppGatewaysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAppGatewaysResponse {
     type PageItem = crate::model::AppGateway;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/stub.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/stub.rs
index 6450aadfca..8b074e65de 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/stub.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn list_app_gateways(
         &self,
         _req: crate::model::ListAppGatewaysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAppGatewaysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAppGatewaysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_app_gateway(
         &self,
         _req: crate::model::GetAppGatewayRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AppGateway>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AppGateway>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn create_app_gateway(
         &self,
         _req: crate::model::CreateAppGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn delete_app_gateway(
         &self,
         _req: crate::model::DeleteAppGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +85,10 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -99,9 +98,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +109,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,9 +120,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,10 +131,10 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -145,10 +144,10 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -158,9 +157,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -169,8 +168,8 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -178,8 +177,8 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -189,9 +188,9 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -200,8 +199,8 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/stub/dynamic.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/stub/dynamic.rs
index f858c9809e..31400ec158 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/stub/dynamic.rs
@@ -20,94 +20,90 @@ pub trait AppGatewaysService: std::fmt::Debug + Send + Sync {
     async fn list_app_gateways(
         &self,
         req: crate::model::ListAppGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppGatewaysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppGatewaysResponse>>;
 
     async fn get_app_gateway(
         &self,
         req: crate::model::GetAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppGateway>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppGateway>>;
 
     async fn create_app_gateway(
         &self,
         req: crate::model::CreateAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_app_gateway(
         &self,
         req: crate::model::DeleteAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AppGatewaysService] also implement [AppGatewaysService].
@@ -117,8 +113,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn list_app_gateways(
         &self,
         req: crate::model::ListAppGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAppGatewaysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAppGatewaysResponse>> {
         T::list_app_gateways(self, req, options).await
     }
 
@@ -126,8 +122,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn get_app_gateway(
         &self,
         req: crate::model::GetAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AppGateway>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AppGateway>> {
         T::get_app_gateway(self, req, options).await
     }
 
@@ -135,8 +131,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn create_app_gateway(
         &self,
         req: crate::model::CreateAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_app_gateway(self, req, options).await
     }
 
@@ -144,8 +140,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn delete_app_gateway(
         &self,
         req: crate::model::DeleteAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_app_gateway(self, req, options).await
     }
 
@@ -153,9 +149,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -163,8 +158,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -172,8 +167,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -181,8 +176,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -190,10 +185,9 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -201,10 +195,9 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -212,8 +205,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -221,8 +214,8 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -230,22 +223,22 @@ impl<T: super::AppGatewaysService> AppGatewaysService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/tracing.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/tracing.rs
index 9a1506db1e..cfa5b98976 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/tracing.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_app_gateways(
         &self,
         req: crate::model::ListAppGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppGatewaysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppGatewaysResponse>> {
         self.inner.list_app_gateways(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_app_gateway(
         &self,
         req: crate::model::GetAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppGateway>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppGateway>> {
         self.inner.get_app_gateway(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_app_gateway(
         &self,
         req: crate::model::CreateAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_app_gateway(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_app_gateway(
         &self,
         req: crate::model::DeleteAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_app_gateway(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -113,9 +113,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -123,9 +122,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -133,8 +131,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -142,8 +140,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -151,22 +149,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs
index 537d54fbac..bcfb2e220a 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AppGatewaysService](super::stub::AppGatewaysService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AppGatewaysService {
 }
 
 impl AppGatewaysService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn list_app_gateways(
         &self,
         req: crate::model::ListAppGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAppGatewaysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAppGatewaysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn get_app_gateway(
         &self,
         req: crate::model::GetAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AppGateway>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AppGateway>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn create_app_gateway(
         &self,
         req: crate::model::CreateAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn delete_app_gateway(
         &self,
         req: crate::model::DeleteAppGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -283,9 +283,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -300,13 +300,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -336,9 +336,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -353,13 +353,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -396,9 +396,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -413,13 +413,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -608,9 +608,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -625,13 +625,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -880,9 +880,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -897,14 +897,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1093,9 +1092,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1110,14 +1109,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1159,9 +1157,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1176,13 +1174,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1223,9 +1221,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1240,13 +1238,13 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1287,9 +1285,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1298,24 +1296,25 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1356,9 +1355,9 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1367,25 +1366,26 @@ impl super::stub::AppGatewaysService for AppGatewaysService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml
index 0484e6a72d..a9e739576d 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/builder.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/builder.rs
index a9bb91367f..ecc67b9971 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/builder.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod client_connector_services_service {
     /// A builder for [ClientConnectorServicesService][crate::client::ClientConnectorServicesService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::*;
     /// # use builder::client_connector_services_service::ClientBuilder;
     /// # use client::ClientConnectorServicesService;
@@ -30,19 +30,18 @@ pub mod client_connector_services_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ClientConnectorServicesService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ClientConnectorServicesService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod client_connector_services_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ClientConnectorServicesService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod client_connector_services_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::ListClientConnectorServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -113,7 +112,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123,15 +122,15 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .list_client_connector_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListClientConnectorServicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -140,17 +139,17 @@ pub mod client_connector_services_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListClientConnectorServicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -188,8 +187,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClientConnectorServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClientConnectorServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -199,7 +198,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::GetClientConnectorService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -232,7 +231,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -242,7 +241,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .get_client_connector_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetClientConnectorServiceRequest::name].
@@ -255,8 +254,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetClientConnectorService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetClientConnectorService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -266,7 +265,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::CreateClientConnectorService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -300,7 +299,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -315,7 +314,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .create_client_connector_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_client_connector_service`.
@@ -334,7 +333,7 @@ pub mod client_connector_services_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -414,8 +413,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateClientConnectorService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateClientConnectorService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -425,7 +424,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::UpdateClientConnectorService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -459,7 +458,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -474,7 +473,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .update_client_connector_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_client_connector_service`.
@@ -493,7 +492,7 @@ pub mod client_connector_services_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -584,8 +583,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateClientConnectorService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateClientConnectorService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -595,7 +594,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::DeleteClientConnectorService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -629,7 +628,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -644,7 +643,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .delete_client_connector_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_client_connector_service`.
@@ -661,7 +660,7 @@ pub mod client_connector_services_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -710,8 +709,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteClientConnectorService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteClientConnectorService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -721,8 +720,8 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -756,7 +755,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -766,15 +765,15 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -783,17 +782,17 @@ pub mod client_connector_services_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -823,8 +822,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -834,7 +833,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -865,7 +864,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -875,7 +874,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -886,8 +885,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -897,7 +896,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -928,7 +927,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -938,7 +937,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -991,8 +990,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1002,7 +1001,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1033,7 +1032,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1043,7 +1042,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1074,8 +1073,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1085,7 +1084,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1118,7 +1117,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1128,7 +1127,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1154,8 +1153,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1165,8 +1164,8 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1202,7 +1201,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1212,15 +1211,15 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1229,17 +1228,17 @@ pub mod client_connector_services_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1275,8 +1274,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1286,7 +1285,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1317,7 +1316,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1327,7 +1326,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1338,8 +1337,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1349,7 +1348,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1382,7 +1381,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1392,7 +1391,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1403,8 +1402,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1414,7 +1413,7 @@ pub mod client_connector_services_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::builder::client_connector_services_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientconnectorservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1447,7 +1446,7 @@ pub mod client_connector_services_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1457,7 +1456,7 @@ pub mod client_connector_services_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1468,8 +1467,8 @@ pub mod client_connector_services_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/client.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/client.rs
index 9add49b6a1..f613eee218 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/client.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_beyondcorp_clientconnectorservices_v1::client::ClientConnectorServicesService;
 /// let client = ClientConnectorServicesService::builder().build().await?;
 /// // use `client` to make requests to the BeyondCorp API.
@@ -76,13 +76,13 @@ impl ClientConnectorServicesService {
     /// Returns a builder for [ClientConnectorServicesService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_clientconnectorservices_v1::client::ClientConnectorServicesService;
     /// let client = ClientConnectorServicesService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::client_connector_services_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::client_connector_services_service::client::Factory,
         )
     }
@@ -102,14 +102,14 @@ impl ClientConnectorServicesService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::ClientConnectorServicesService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -120,13 +120,13 @@ impl ClientConnectorServicesService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ClientConnectorServicesService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ClientConnectorServicesService> {
         super::transport::ClientConnectorServicesService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ClientConnectorServicesService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ClientConnectorServicesService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ClientConnectorServicesService::new)
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/lib.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/lib.rs
index d152f21068..88d995ab57 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/lib.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs
index fc408047aa..d8a202c56d 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -1116,7 +1116,9 @@ impl wkt::message::Message for ListClientConnectorServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListClientConnectorServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListClientConnectorServicesResponse
+{
     type PageItem = crate::model::ClientConnectorService;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub.rs
index 30032a13db..c277bc2ca1 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn list_client_connector_services(
         &self,
         _req: crate::model::ListClientConnectorServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListClientConnectorServicesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListClientConnectorServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,9 +53,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn get_client_connector_service(
         &self,
         _req: crate::model::GetClientConnectorServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ClientConnectorService>>,
+        Output = crate::Result<crate::Response<crate::model::ClientConnectorService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn create_client_connector_service(
         &self,
         _req: crate::model::CreateClientConnectorServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn update_client_connector_service(
         &self,
         _req: crate::model::UpdateClientConnectorServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,9 +86,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn delete_client_connector_service(
         &self,
         _req: crate::model::DeleteClientConnectorServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,10 +97,10 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -112,9 +110,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,9 +121,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +132,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,10 +143,10 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -158,10 +156,10 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -171,9 +169,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -182,8 +180,8 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -191,8 +189,8 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -202,9 +200,9 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -213,8 +211,8 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub/dynamic.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub/dynamic.rs
index b3c52fd95d..377bd11fdf 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/stub/dynamic.rs
@@ -20,100 +20,96 @@ pub trait ClientConnectorServicesService: std::fmt::Debug + Send + Sync {
     async fn list_client_connector_services(
         &self,
         req: crate::model::ListClientConnectorServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClientConnectorServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClientConnectorServicesResponse>>;
 
     async fn get_client_connector_service(
         &self,
         req: crate::model::GetClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ClientConnectorService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ClientConnectorService>>;
 
     async fn create_client_connector_service(
         &self,
         req: crate::model::CreateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_client_connector_service(
         &self,
         req: crate::model::UpdateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_client_connector_service(
         &self,
         req: crate::model::DeleteClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ClientConnectorServicesService] also implement [ClientConnectorServicesService].
@@ -123,9 +119,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn list_client_connector_services(
         &self,
         req: crate::model::ListClientConnectorServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClientConnectorServicesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClientConnectorServicesResponse>> {
         T::list_client_connector_services(self, req, options).await
     }
 
@@ -133,8 +128,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn get_client_connector_service(
         &self,
         req: crate::model::GetClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ClientConnectorService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ClientConnectorService>> {
         T::get_client_connector_service(self, req, options).await
     }
 
@@ -142,8 +137,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn create_client_connector_service(
         &self,
         req: crate::model::CreateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_client_connector_service(self, req, options).await
     }
 
@@ -151,8 +146,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn update_client_connector_service(
         &self,
         req: crate::model::UpdateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_client_connector_service(self, req, options).await
     }
 
@@ -160,8 +155,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn delete_client_connector_service(
         &self,
         req: crate::model::DeleteClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_client_connector_service(self, req, options).await
     }
 
@@ -169,9 +164,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -179,8 +173,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -188,8 +182,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -197,8 +191,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -206,10 +200,9 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -217,10 +210,9 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -228,8 +220,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -237,8 +229,8 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -246,22 +238,22 @@ impl<T: super::ClientConnectorServicesService> ClientConnectorServicesService fo
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/tracing.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/tracing.rs
index 5f8e429e26..2a0e2a2f24 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/tracing.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_client_connector_services(
         &self,
         req: crate::model::ListClientConnectorServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClientConnectorServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClientConnectorServicesResponse>> {
         self.inner
             .list_client_connector_services(req, options)
             .await
@@ -52,8 +52,8 @@ where
     async fn get_client_connector_service(
         &self,
         req: crate::model::GetClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ClientConnectorService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ClientConnectorService>> {
         self.inner.get_client_connector_service(req, options).await
     }
 
@@ -61,8 +61,8 @@ where
     async fn create_client_connector_service(
         &self,
         req: crate::model::CreateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_client_connector_service(req, options)
             .await
@@ -72,8 +72,8 @@ where
     async fn update_client_connector_service(
         &self,
         req: crate::model::UpdateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_client_connector_service(req, options)
             .await
@@ -83,8 +83,8 @@ where
     async fn delete_client_connector_service(
         &self,
         req: crate::model::DeleteClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_client_connector_service(req, options)
             .await
@@ -94,8 +94,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -103,8 +103,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -112,8 +112,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -121,8 +121,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -130,9 +130,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -140,9 +139,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -150,8 +148,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -159,8 +157,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -168,22 +166,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs
index 0217b8a186..9f1ac09d5f 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ClientConnectorServicesService](super::stub::ClientConnectorServicesService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ClientConnectorServicesService {
 }
 
 impl ClientConnectorServicesService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn list_client_connector_services(
         &self,
         req: crate::model::ListClientConnectorServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClientConnectorServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClientConnectorServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn get_client_connector_service(
         &self,
         req: crate::model::GetClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ClientConnectorService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ClientConnectorService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn create_client_connector_service(
         &self,
         req: crate::model::CreateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -218,9 +218,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -235,13 +235,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn update_client_connector_service(
         &self,
         req: crate::model::UpdateClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -303,9 +303,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -320,13 +320,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn delete_client_connector_service(
         &self,
         req: crate::model::DeleteClientConnectorServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -369,9 +369,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386,13 +386,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -422,9 +422,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -439,13 +439,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -482,9 +482,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -499,13 +499,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -694,9 +694,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -711,13 +711,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -966,9 +966,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -983,14 +983,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1179,9 +1178,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1196,14 +1195,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1245,9 +1243,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1262,13 +1260,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1309,9 +1307,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1326,13 +1324,13 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1373,9 +1371,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1384,24 +1382,25 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1442,9 +1441,9 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1453,25 +1452,26 @@ impl super::stub::ClientConnectorServicesService for ClientConnectorServicesServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml b/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml
index d4216521bf..bc97a59ffa 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/builder.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/builder.rs
index 161e1a160a..5f778b8924 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/builder.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod client_gateways_service {
     /// A builder for [ClientGatewaysService][crate::client::ClientGatewaysService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_clientgateways_v1::*;
     /// # use builder::client_gateways_service::ClientBuilder;
     /// # use client::ClientGatewaysService;
@@ -30,19 +30,18 @@ pub mod client_gateways_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ClientGatewaysService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ClientGatewaysService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod client_gateways_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ClientGatewaysService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod client_gateways_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::ListClientGateways;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .list_client_gateways(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListClientGatewaysResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListClientGatewaysResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod client_gateways_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListClientGatewaysResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -184,8 +185,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClientGateways {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClientGateways {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -195,7 +196,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::GetClientGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -226,7 +227,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -236,7 +237,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .get_client_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetClientGatewayRequest::name].
@@ -249,8 +250,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetClientGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetClientGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +261,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::CreateClientGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -292,7 +293,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +308,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .create_client_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_client_gateway`.
@@ -326,7 +327,7 @@ pub mod client_gateways_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -403,8 +404,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateClientGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateClientGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -414,7 +415,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::DeleteClientGateway;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -446,7 +447,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -461,7 +462,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .delete_client_gateway(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_client_gateway`.
@@ -478,7 +479,7 @@ pub mod client_gateways_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -527,8 +528,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteClientGateway {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteClientGateway {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -538,8 +539,8 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -573,7 +574,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -583,15 +584,15 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -600,17 +601,17 @@ pub mod client_gateways_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -640,8 +641,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -651,7 +652,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -682,7 +683,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -692,7 +693,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -703,8 +704,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -714,7 +715,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -745,7 +746,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -755,7 +756,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -808,8 +809,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -819,7 +820,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -850,7 +851,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -860,7 +861,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -891,8 +892,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -902,7 +903,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -935,7 +936,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -945,7 +946,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -971,8 +972,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -982,8 +983,8 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1019,7 +1020,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1029,15 +1030,15 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1046,17 +1047,17 @@ pub mod client_gateways_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1092,8 +1093,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1103,7 +1104,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1134,7 +1135,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1144,7 +1145,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1155,8 +1156,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1166,7 +1167,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1199,7 +1200,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1209,7 +1210,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1220,8 +1221,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1231,7 +1232,7 @@ pub mod client_gateways_service {
     /// # Example
     /// ```
     /// # use google_cloud_beyondcorp_clientgateways_v1::builder::client_gateways_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_beyondcorp_clientgateways_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1264,7 +1265,7 @@ pub mod client_gateways_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1274,7 +1275,7 @@ pub mod client_gateways_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1285,8 +1286,8 @@ pub mod client_gateways_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/client.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/client.rs
index 309bddefd6..925dc530e9 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/client.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_beyondcorp_clientgateways_v1::client::ClientGatewaysService;
 /// let client = ClientGatewaysService::builder().build().await?;
 /// // use `client` to make requests to the BeyondCorp API.
@@ -76,15 +76,13 @@ impl ClientGatewaysService {
     /// Returns a builder for [ClientGatewaysService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_beyondcorp_clientgateways_v1::client::ClientGatewaysService;
     /// let client = ClientGatewaysService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::client_gateways_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::client_gateways_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::client_gateways_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -102,14 +100,14 @@ impl ClientGatewaysService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ClientGatewaysService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ClientGatewaysService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -119,13 +117,13 @@ impl ClientGatewaysService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ClientGatewaysService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ClientGatewaysService> {
         super::transport::ClientGatewaysService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ClientGatewaysService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ClientGatewaysService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ClientGatewaysService::new)
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/lib.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/lib.rs
index 0b95d15334..72ec355188 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/lib.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs
index e2bad50887..c2ba2c31eb 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -541,7 +541,7 @@ impl wkt::message::Message for ListClientGatewaysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListClientGatewaysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListClientGatewaysResponse {
     type PageItem = crate::model::ClientGateway;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub.rs
index 25afd15efb..862f091ecd 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn list_client_gateways(
         &self,
         _req: crate::model::ListClientGatewaysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListClientGatewaysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListClientGatewaysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_client_gateway(
         &self,
         _req: crate::model::GetClientGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ClientGateway>>,
+        Output = crate::Result<crate::Response<crate::model::ClientGateway>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn create_client_gateway(
         &self,
         _req: crate::model::CreateClientGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn delete_client_gateway(
         &self,
         _req: crate::model::DeleteClientGatewayRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +86,10 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -99,9 +99,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +110,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,9 +121,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,10 +132,10 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -145,10 +145,10 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -158,9 +158,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -169,8 +169,8 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -178,8 +178,8 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -189,9 +189,9 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -200,8 +200,8 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub/dynamic.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub/dynamic.rs
index ad5249199d..7ea3b0d8bf 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/stub/dynamic.rs
@@ -20,94 +20,90 @@ pub trait ClientGatewaysService: std::fmt::Debug + Send + Sync {
     async fn list_client_gateways(
         &self,
         req: crate::model::ListClientGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClientGatewaysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClientGatewaysResponse>>;
 
     async fn get_client_gateway(
         &self,
         req: crate::model::GetClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ClientGateway>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ClientGateway>>;
 
     async fn create_client_gateway(
         &self,
         req: crate::model::CreateClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_client_gateway(
         &self,
         req: crate::model::DeleteClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ClientGatewaysService] also implement [ClientGatewaysService].
@@ -117,8 +113,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn list_client_gateways(
         &self,
         req: crate::model::ListClientGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClientGatewaysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClientGatewaysResponse>> {
         T::list_client_gateways(self, req, options).await
     }
 
@@ -126,8 +122,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn get_client_gateway(
         &self,
         req: crate::model::GetClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ClientGateway>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ClientGateway>> {
         T::get_client_gateway(self, req, options).await
     }
 
@@ -135,8 +131,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn create_client_gateway(
         &self,
         req: crate::model::CreateClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_client_gateway(self, req, options).await
     }
 
@@ -144,8 +140,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn delete_client_gateway(
         &self,
         req: crate::model::DeleteClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_client_gateway(self, req, options).await
     }
 
@@ -153,9 +149,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -163,8 +158,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -172,8 +167,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -181,8 +176,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -190,10 +185,9 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -201,10 +195,9 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -212,8 +205,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -221,8 +214,8 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -230,22 +223,22 @@ impl<T: super::ClientGatewaysService> ClientGatewaysService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/tracing.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/tracing.rs
index 56d6ba4734..41717198ab 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/tracing.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_client_gateways(
         &self,
         req: crate::model::ListClientGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClientGatewaysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClientGatewaysResponse>> {
         self.inner.list_client_gateways(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_client_gateway(
         &self,
         req: crate::model::GetClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ClientGateway>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ClientGateway>> {
         self.inner.get_client_gateway(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_client_gateway(
         &self,
         req: crate::model::CreateClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_client_gateway(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_client_gateway(
         &self,
         req: crate::model::DeleteClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_client_gateway(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -113,9 +113,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -123,9 +122,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -133,8 +131,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -142,8 +140,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -151,22 +149,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs
index 7c8a712ba7..01990bd059 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ClientGatewaysService](super::stub::ClientGatewaysService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ClientGatewaysService {
 }
 
 impl ClientGatewaysService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn list_client_gateways(
         &self,
         req: crate::model::ListClientGatewaysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClientGatewaysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClientGatewaysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn get_client_gateway(
         &self,
         req: crate::model::GetClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ClientGateway>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ClientGateway>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn create_client_gateway(
         &self,
         req: crate::model::CreateClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn delete_client_gateway(
         &self,
         req: crate::model::DeleteClientGatewayRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -283,9 +283,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -300,13 +300,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -336,9 +336,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -353,13 +353,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -396,9 +396,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -413,13 +413,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -608,9 +608,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -625,13 +625,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -880,9 +880,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -897,14 +897,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1093,9 +1092,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1110,14 +1109,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1159,9 +1157,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1176,13 +1174,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1223,9 +1221,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1240,13 +1238,13 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1287,9 +1285,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1298,24 +1296,25 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1356,9 +1355,9 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1367,25 +1366,26 @@ impl super::stub::ClientGatewaysService for ClientGatewaysService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/biglake/v1/Cargo.toml b/src/generated/cloud/biglake/v1/Cargo.toml
index fb2114bd4a..c50c7cd195 100644
--- a/src/generated/cloud/biglake/v1/Cargo.toml
+++ b/src/generated/cloud/biglake/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace      = true
 bytes.workspace            = true
-gax.workspace              = true
 gaxi                       = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace = true
+google-cloud-gax.workspace = true
 lazy_static.workspace      = true
 serde.workspace            = true
 serde_json.workspace       = true
diff --git a/src/generated/cloud/biglake/v1/src/builder.rs b/src/generated/cloud/biglake/v1/src/builder.rs
index 7d69c0d96b..fd713e45f8 100644
--- a/src/generated/cloud/biglake/v1/src/builder.rs
+++ b/src/generated/cloud/biglake/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod iceberg_catalog_service {
     /// A builder for [IcebergCatalogService][crate::client::IcebergCatalogService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_biglake_v1::*;
     /// # use builder::iceberg_catalog_service::ClientBuilder;
     /// # use client::IcebergCatalogService;
@@ -30,19 +30,18 @@ pub mod iceberg_catalog_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::IcebergCatalogService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = IcebergCatalogService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod iceberg_catalog_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::IcebergCatalogService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod iceberg_catalog_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::GetIcebergCatalogConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109,7 +108,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119,7 +118,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .get_iceberg_catalog_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [warehouse][crate::model::GetIcebergCatalogConfigRequest::warehouse].
@@ -132,8 +131,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIcebergCatalogConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIcebergCatalogConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -143,7 +142,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::ListIcebergNamespaces;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -174,7 +173,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -184,7 +183,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .list_iceberg_namespaces(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [page_token][crate::model::ListIcebergNamespacesRequest::page_token].
@@ -215,8 +214,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIcebergNamespaces {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIcebergNamespaces {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -226,7 +225,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::GetIcebergNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -257,7 +256,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -267,7 +266,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .get_iceberg_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIcebergNamespaceRequest::name].
@@ -280,8 +279,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIcebergNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIcebergNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -291,7 +290,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::CreateIcebergNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -322,7 +321,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -332,7 +331,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .create_iceberg_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIcebergNamespaceRequest::parent].
@@ -367,8 +366,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIcebergNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIcebergNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -378,7 +377,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::DeleteIcebergNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -409,7 +408,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -419,7 +418,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .delete_iceberg_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIcebergNamespaceRequest::name].
@@ -432,8 +431,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIcebergNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIcebergNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -443,7 +442,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::UpdateIcebergNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -474,7 +473,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -484,7 +483,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .update_iceberg_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateIcebergNamespaceRequest::name].
@@ -519,8 +518,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIcebergNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIcebergNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -530,7 +529,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::ListIcebergTableIdentifiers;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -563,7 +562,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -573,7 +572,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .list_iceberg_table_identifiers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [page_token][crate::model::ListIcebergTableIdentifiersRequest::page_token].
@@ -598,8 +597,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIcebergTableIdentifiers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIcebergTableIdentifiers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -609,7 +608,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::CreateIcebergTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -640,7 +639,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -650,7 +649,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .create_iceberg_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIcebergTableRequest::parent].
@@ -685,8 +684,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIcebergTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIcebergTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -696,7 +695,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::DeleteIcebergTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -727,7 +726,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -737,7 +736,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .delete_iceberg_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIcebergTableRequest::name].
@@ -756,8 +755,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIcebergTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIcebergTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -767,7 +766,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::GetIcebergTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -795,7 +794,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -805,7 +804,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .get_iceberg_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIcebergTableRequest::name].
@@ -824,8 +823,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIcebergTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIcebergTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -835,7 +834,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::LoadIcebergTableCredentials;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -863,7 +862,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -873,7 +872,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .load_iceberg_table_credentials(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIcebergTableRequest::name].
@@ -892,8 +891,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LoadIcebergTableCredentials {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LoadIcebergTableCredentials {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -903,7 +902,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::UpdateIcebergTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -934,7 +933,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -944,7 +943,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .update_iceberg_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateIcebergTableRequest::name].
@@ -979,8 +978,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIcebergTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIcebergTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -990,7 +989,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::RegisterIcebergTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1021,7 +1020,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1031,7 +1030,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .register_iceberg_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::RegisterIcebergTableRequest::parent].
@@ -1066,8 +1065,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RegisterIcebergTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RegisterIcebergTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1077,7 +1076,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::GetIcebergCatalog;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1108,7 +1107,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1118,7 +1117,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .get_iceberg_catalog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIcebergCatalogRequest::name].
@@ -1131,8 +1130,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIcebergCatalog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIcebergCatalog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1142,7 +1141,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::ListIcebergCatalogs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1173,7 +1172,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1183,7 +1182,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .list_iceberg_catalogs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListIcebergCatalogsRequest::parent].
@@ -1217,8 +1216,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIcebergCatalogs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIcebergCatalogs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1228,7 +1227,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::DeleteIcebergCatalog;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1259,7 +1258,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1269,7 +1268,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .delete_iceberg_catalog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIcebergCatalogRequest::name].
@@ -1282,8 +1281,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIcebergCatalog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIcebergCatalog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1293,7 +1292,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::UpdateIcebergCatalog;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1324,7 +1323,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1334,7 +1333,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .update_iceberg_catalog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [iceberg_catalog][crate::model::UpdateIcebergCatalogRequest::iceberg_catalog].
@@ -1379,8 +1378,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIcebergCatalog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIcebergCatalog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1390,7 +1389,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::CreateIcebergCatalog;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1421,7 +1420,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1431,7 +1430,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .create_iceberg_catalog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIcebergCatalogRequest::parent].
@@ -1474,8 +1473,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIcebergCatalog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIcebergCatalog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1485,7 +1484,7 @@ pub mod iceberg_catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_biglake_v1::builder::iceberg_catalog_service::FailoverIcebergCatalog;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_biglake_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1516,7 +1515,7 @@ pub mod iceberg_catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1526,7 +1525,7 @@ pub mod iceberg_catalog_service {
             (*self.0.stub)
                 .failover_iceberg_catalog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FailoverIcebergCatalogRequest::name].
@@ -1575,8 +1574,8 @@ pub mod iceberg_catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FailoverIcebergCatalog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FailoverIcebergCatalog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/biglake/v1/src/client.rs b/src/generated/cloud/biglake/v1/src/client.rs
index 8a929ee51b..d097f44059 100644
--- a/src/generated/cloud/biglake/v1/src/client.rs
+++ b/src/generated/cloud/biglake/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_biglake_v1::client::IcebergCatalogService;
 /// let client = IcebergCatalogService::builder().build().await?;
 /// // use `client` to make requests to the BigLake API.
@@ -94,15 +94,13 @@ impl IcebergCatalogService {
     /// Returns a builder for [IcebergCatalogService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_biglake_v1::client::IcebergCatalogService;
     /// let client = IcebergCatalogService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::iceberg_catalog_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::iceberg_catalog_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::iceberg_catalog_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -120,14 +118,14 @@ impl IcebergCatalogService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::IcebergCatalogService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::IcebergCatalogService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -137,13 +135,13 @@ impl IcebergCatalogService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IcebergCatalogService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IcebergCatalogService> {
         super::transport::IcebergCatalogService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IcebergCatalogService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IcebergCatalogService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::IcebergCatalogService::new)
diff --git a/src/generated/cloud/biglake/v1/src/lib.rs b/src/generated/cloud/biglake/v1/src/lib.rs
index 134454e978..38e02beac8 100644
--- a/src/generated/cloud/biglake/v1/src/lib.rs
+++ b/src/generated/cloud/biglake/v1/src/lib.rs
@@ -51,8 +51,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -87,3 +87,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/biglake/v1/src/model.rs b/src/generated/cloud/biglake/v1/src/model.rs
index edab0223c9..a47a74e2a7 100644
--- a/src/generated/cloud/biglake/v1/src/model.rs
+++ b/src/generated/cloud/biglake/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
diff --git a/src/generated/cloud/biglake/v1/src/stub.rs b/src/generated/cloud/biglake/v1/src/stub.rs
index 51284b6941..759e312845 100644
--- a/src/generated/cloud/biglake/v1/src/stub.rs
+++ b/src/generated/cloud/biglake/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn get_iceberg_catalog_config(
         &self,
         _req: crate::model::GetIcebergCatalogConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IcebergCatalogConfig>>,
+        Output = crate::Result<crate::Response<crate::model::IcebergCatalogConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,11 +53,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn list_iceberg_namespaces(
         &self,
         _req: crate::model::ListIcebergNamespacesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListIcebergNamespacesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListIcebergNamespacesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn get_iceberg_namespace(
         &self,
         _req: crate::model::GetIcebergNamespaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IcebergNamespace>>,
+        Output = crate::Result<crate::Response<crate::model::IcebergNamespace>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn create_iceberg_namespace(
         &self,
         _req: crate::model::CreateIcebergNamespaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IcebergNamespace>>,
+        Output = crate::Result<crate::Response<crate::model::IcebergNamespace>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,8 +86,8 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn delete_iceberg_namespace(
         &self,
         _req: crate::model::DeleteIcebergNamespaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,11 +95,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn update_iceberg_namespace(
         &self,
         _req: crate::model::UpdateIcebergNamespaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::UpdateIcebergNamespaceResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::UpdateIcebergNamespaceResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,11 +106,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn list_iceberg_table_identifiers(
         &self,
         _req: crate::model::ListIcebergTableIdentifiersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListIcebergTableIdentifiersResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListIcebergTableIdentifiersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,9 +117,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn create_iceberg_table(
         &self,
         _req: crate::model::CreateIcebergTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,8 +128,8 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn delete_iceberg_table(
         &self,
         _req: crate::model::DeleteIcebergTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -143,9 +137,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn get_iceberg_table(
         &self,
         _req: crate::model::GetIcebergTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,11 +148,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn load_iceberg_table_credentials(
         &self,
         _req: crate::model::GetIcebergTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::LoadIcebergTableCredentialsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::LoadIcebergTableCredentialsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,9 +159,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn update_iceberg_table(
         &self,
         _req: crate::model::UpdateIcebergTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +170,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn register_iceberg_table(
         &self,
         _req: crate::model::RegisterIcebergTableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,9 +181,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn get_iceberg_catalog(
         &self,
         _req: crate::model::GetIcebergCatalogRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IcebergCatalog>>,
+        Output = crate::Result<crate::Response<crate::model::IcebergCatalog>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,9 +192,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn list_iceberg_catalogs(
         &self,
         _req: crate::model::ListIcebergCatalogsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIcebergCatalogsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIcebergCatalogsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,8 +203,8 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn delete_iceberg_catalog(
         &self,
         _req: crate::model::DeleteIcebergCatalogRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -220,9 +212,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn update_iceberg_catalog(
         &self,
         _req: crate::model::UpdateIcebergCatalogRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IcebergCatalog>>,
+        Output = crate::Result<crate::Response<crate::model::IcebergCatalog>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +223,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn create_iceberg_catalog(
         &self,
         _req: crate::model::CreateIcebergCatalogRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IcebergCatalog>>,
+        Output = crate::Result<crate::Response<crate::model::IcebergCatalog>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,11 +234,9 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     fn failover_iceberg_catalog(
         &self,
         _req: crate::model::FailoverIcebergCatalogRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FailoverIcebergCatalogResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FailoverIcebergCatalogResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/biglake/v1/src/stub/dynamic.rs b/src/generated/cloud/biglake/v1/src/stub/dynamic.rs
index bc505cddf0..0d9345f13a 100644
--- a/src/generated/cloud/biglake/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/biglake/v1/src/stub/dynamic.rs
@@ -20,116 +20,116 @@ pub trait IcebergCatalogService: std::fmt::Debug + Send + Sync {
     async fn get_iceberg_catalog_config(
         &self,
         req: crate::model::GetIcebergCatalogConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalogConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalogConfig>>;
 
     async fn list_iceberg_namespaces(
         &self,
         req: crate::model::ListIcebergNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIcebergNamespacesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIcebergNamespacesResponse>>;
 
     async fn get_iceberg_namespace(
         &self,
         req: crate::model::GetIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergNamespace>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergNamespace>>;
 
     async fn create_iceberg_namespace(
         &self,
         req: crate::model::CreateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergNamespace>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergNamespace>>;
 
     async fn delete_iceberg_namespace(
         &self,
         req: crate::model::DeleteIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_iceberg_namespace(
         &self,
         req: crate::model::UpdateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UpdateIcebergNamespaceResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UpdateIcebergNamespaceResponse>>;
 
     async fn list_iceberg_table_identifiers(
         &self,
         req: crate::model::ListIcebergTableIdentifiersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIcebergTableIdentifiersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIcebergTableIdentifiersResponse>>;
 
     async fn create_iceberg_table(
         &self,
         req: crate::model::CreateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn delete_iceberg_table(
         &self,
         req: crate::model::DeleteIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_iceberg_table(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn load_iceberg_table_credentials(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LoadIcebergTableCredentialsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LoadIcebergTableCredentialsResponse>>;
 
     async fn update_iceberg_table(
         &self,
         req: crate::model::UpdateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn register_iceberg_table(
         &self,
         req: crate::model::RegisterIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn get_iceberg_catalog(
         &self,
         req: crate::model::GetIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalog>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalog>>;
 
     async fn list_iceberg_catalogs(
         &self,
         req: crate::model::ListIcebergCatalogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIcebergCatalogsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIcebergCatalogsResponse>>;
 
     async fn delete_iceberg_catalog(
         &self,
         req: crate::model::DeleteIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_iceberg_catalog(
         &self,
         req: crate::model::UpdateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalog>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalog>>;
 
     async fn create_iceberg_catalog(
         &self,
         req: crate::model::CreateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalog>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalog>>;
 
     async fn failover_iceberg_catalog(
         &self,
         req: crate::model::FailoverIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FailoverIcebergCatalogResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FailoverIcebergCatalogResponse>>;
 }
 
 /// All implementations of [super::IcebergCatalogService] also implement [IcebergCatalogService].
@@ -139,8 +139,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn get_iceberg_catalog_config(
         &self,
         req: crate::model::GetIcebergCatalogConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalogConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalogConfig>> {
         T::get_iceberg_catalog_config(self, req, options).await
     }
 
@@ -148,8 +148,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn list_iceberg_namespaces(
         &self,
         req: crate::model::ListIcebergNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIcebergNamespacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIcebergNamespacesResponse>> {
         T::list_iceberg_namespaces(self, req, options).await
     }
 
@@ -157,8 +157,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn get_iceberg_namespace(
         &self,
         req: crate::model::GetIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergNamespace>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergNamespace>> {
         T::get_iceberg_namespace(self, req, options).await
     }
 
@@ -166,8 +166,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn create_iceberg_namespace(
         &self,
         req: crate::model::CreateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergNamespace>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergNamespace>> {
         T::create_iceberg_namespace(self, req, options).await
     }
 
@@ -175,8 +175,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn delete_iceberg_namespace(
         &self,
         req: crate::model::DeleteIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_iceberg_namespace(self, req, options).await
     }
 
@@ -184,8 +184,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn update_iceberg_namespace(
         &self,
         req: crate::model::UpdateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UpdateIcebergNamespaceResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UpdateIcebergNamespaceResponse>> {
         T::update_iceberg_namespace(self, req, options).await
     }
 
@@ -193,9 +193,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn list_iceberg_table_identifiers(
         &self,
         req: crate::model::ListIcebergTableIdentifiersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIcebergTableIdentifiersResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIcebergTableIdentifiersResponse>> {
         T::list_iceberg_table_identifiers(self, req, options).await
     }
 
@@ -203,8 +202,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn create_iceberg_table(
         &self,
         req: crate::model::CreateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::create_iceberg_table(self, req, options).await
     }
 
@@ -212,8 +211,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn delete_iceberg_table(
         &self,
         req: crate::model::DeleteIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_iceberg_table(self, req, options).await
     }
 
@@ -221,8 +220,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn get_iceberg_table(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::get_iceberg_table(self, req, options).await
     }
 
@@ -230,9 +229,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn load_iceberg_table_credentials(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LoadIcebergTableCredentialsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LoadIcebergTableCredentialsResponse>> {
         T::load_iceberg_table_credentials(self, req, options).await
     }
 
@@ -240,8 +238,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn update_iceberg_table(
         &self,
         req: crate::model::UpdateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::update_iceberg_table(self, req, options).await
     }
 
@@ -249,8 +247,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn register_iceberg_table(
         &self,
         req: crate::model::RegisterIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::register_iceberg_table(self, req, options).await
     }
 
@@ -258,8 +256,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn get_iceberg_catalog(
         &self,
         req: crate::model::GetIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalog>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalog>> {
         T::get_iceberg_catalog(self, req, options).await
     }
 
@@ -267,8 +265,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn list_iceberg_catalogs(
         &self,
         req: crate::model::ListIcebergCatalogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIcebergCatalogsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIcebergCatalogsResponse>> {
         T::list_iceberg_catalogs(self, req, options).await
     }
 
@@ -276,8 +274,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn delete_iceberg_catalog(
         &self,
         req: crate::model::DeleteIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_iceberg_catalog(self, req, options).await
     }
 
@@ -285,8 +283,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn update_iceberg_catalog(
         &self,
         req: crate::model::UpdateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalog>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalog>> {
         T::update_iceberg_catalog(self, req, options).await
     }
 
@@ -294,8 +292,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn create_iceberg_catalog(
         &self,
         req: crate::model::CreateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IcebergCatalog>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IcebergCatalog>> {
         T::create_iceberg_catalog(self, req, options).await
     }
 
@@ -303,8 +301,8 @@ impl<T: super::IcebergCatalogService> IcebergCatalogService for T {
     async fn failover_iceberg_catalog(
         &self,
         req: crate::model::FailoverIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FailoverIcebergCatalogResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FailoverIcebergCatalogResponse>> {
         T::failover_iceberg_catalog(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/biglake/v1/src/tracing.rs b/src/generated/cloud/biglake/v1/src/tracing.rs
index aad2a74a9b..1e01fbc8af 100644
--- a/src/generated/cloud/biglake/v1/src/tracing.rs
+++ b/src/generated/cloud/biglake/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_iceberg_catalog_config(
         &self,
         req: crate::model::GetIcebergCatalogConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalogConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalogConfig>> {
         self.inner.get_iceberg_catalog_config(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_iceberg_namespaces(
         &self,
         req: crate::model::ListIcebergNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIcebergNamespacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIcebergNamespacesResponse>> {
         self.inner.list_iceberg_namespaces(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_iceberg_namespace(
         &self,
         req: crate::model::GetIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergNamespace>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergNamespace>> {
         self.inner.get_iceberg_namespace(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn create_iceberg_namespace(
         &self,
         req: crate::model::CreateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergNamespace>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergNamespace>> {
         self.inner.create_iceberg_namespace(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_iceberg_namespace(
         &self,
         req: crate::model::DeleteIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_iceberg_namespace(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn update_iceberg_namespace(
         &self,
         req: crate::model::UpdateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UpdateIcebergNamespaceResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UpdateIcebergNamespaceResponse>> {
         self.inner.update_iceberg_namespace(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_iceberg_table_identifiers(
         &self,
         req: crate::model::ListIcebergTableIdentifiersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIcebergTableIdentifiersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIcebergTableIdentifiersResponse>> {
         self.inner
             .list_iceberg_table_identifiers(req, options)
             .await
@@ -106,8 +106,8 @@ where
     async fn create_iceberg_table(
         &self,
         req: crate::model::CreateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.create_iceberg_table(req, options).await
     }
 
@@ -115,8 +115,8 @@ where
     async fn delete_iceberg_table(
         &self,
         req: crate::model::DeleteIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_iceberg_table(req, options).await
     }
 
@@ -124,8 +124,8 @@ where
     async fn get_iceberg_table(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.get_iceberg_table(req, options).await
     }
 
@@ -133,8 +133,8 @@ where
     async fn load_iceberg_table_credentials(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LoadIcebergTableCredentialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LoadIcebergTableCredentialsResponse>> {
         self.inner
             .load_iceberg_table_credentials(req, options)
             .await
@@ -144,8 +144,8 @@ where
     async fn update_iceberg_table(
         &self,
         req: crate::model::UpdateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.update_iceberg_table(req, options).await
     }
 
@@ -153,8 +153,8 @@ where
     async fn register_iceberg_table(
         &self,
         req: crate::model::RegisterIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.register_iceberg_table(req, options).await
     }
 
@@ -162,8 +162,8 @@ where
     async fn get_iceberg_catalog(
         &self,
         req: crate::model::GetIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalog>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalog>> {
         self.inner.get_iceberg_catalog(req, options).await
     }
 
@@ -171,8 +171,8 @@ where
     async fn list_iceberg_catalogs(
         &self,
         req: crate::model::ListIcebergCatalogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIcebergCatalogsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIcebergCatalogsResponse>> {
         self.inner.list_iceberg_catalogs(req, options).await
     }
 
@@ -180,8 +180,8 @@ where
     async fn delete_iceberg_catalog(
         &self,
         req: crate::model::DeleteIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_iceberg_catalog(req, options).await
     }
 
@@ -189,8 +189,8 @@ where
     async fn update_iceberg_catalog(
         &self,
         req: crate::model::UpdateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalog>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalog>> {
         self.inner.update_iceberg_catalog(req, options).await
     }
 
@@ -198,8 +198,8 @@ where
     async fn create_iceberg_catalog(
         &self,
         req: crate::model::CreateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalog>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalog>> {
         self.inner.create_iceberg_catalog(req, options).await
     }
 
@@ -207,8 +207,8 @@ where
     async fn failover_iceberg_catalog(
         &self,
         req: crate::model::FailoverIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FailoverIcebergCatalogResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FailoverIcebergCatalogResponse>> {
         self.inner.failover_iceberg_catalog(req, options).await
     }
 }
diff --git a/src/generated/cloud/biglake/v1/src/transport.rs b/src/generated/cloud/biglake/v1/src/transport.rs
index 17bf5db923..467c519c37 100644
--- a/src/generated/cloud/biglake/v1/src/transport.rs
+++ b/src/generated/cloud/biglake/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [IcebergCatalogService](super::stub::IcebergCatalogService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for IcebergCatalogService {
 }
 
 impl IcebergCatalogService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,11 +43,11 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn get_iceberg_catalog_config(
         &self,
         req: crate::model::GetIcebergCatalogConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalogConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalogConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/iceberg/v1/restcatalog/v1/config".to_string();
@@ -63,9 +63,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -80,13 +80,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn list_iceberg_namespaces(
         &self,
         req: crate::model::ListIcebergNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIcebergNamespacesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIcebergNamespacesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -126,9 +126,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -143,13 +143,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn get_iceberg_namespace(
         &self,
         req: crate::model::GetIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergNamespace>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergNamespace>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -190,9 +190,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207,13 +207,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn create_iceberg_namespace(
         &self,
         req: crate::model::CreateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergNamespace>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergNamespace>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -250,9 +250,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -267,13 +267,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn delete_iceberg_namespace(
         &self,
         req: crate::model::DeleteIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -314,9 +314,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -325,24 +325,25 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_iceberg_namespace(
         &self,
         req: crate::model::UpdateIcebergNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UpdateIcebergNamespaceResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UpdateIcebergNamespaceResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -420,9 +421,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -437,13 +438,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn list_iceberg_table_identifiers(
         &self,
         req: crate::model::ListIcebergTableIdentifiersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIcebergTableIdentifiersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIcebergTableIdentifiersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -486,9 +487,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -503,13 +504,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn create_iceberg_table(
         &self,
         req: crate::model::CreateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -550,9 +551,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -567,13 +568,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn delete_iceberg_table(
         &self,
         req: crate::model::DeleteIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -619,9 +620,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -630,24 +631,25 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_iceberg_table(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -693,9 +695,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -710,13 +712,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn load_iceberg_table_credentials(
         &self,
         req: crate::model::GetIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LoadIcebergTableCredentialsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LoadIcebergTableCredentialsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -762,9 +764,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -779,13 +781,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn update_iceberg_table(
         &self,
         req: crate::model::UpdateIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -830,9 +832,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -847,13 +849,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn register_iceberg_table(
         &self,
         req: crate::model::RegisterIcebergTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -894,9 +896,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -911,13 +913,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn get_iceberg_catalog(
         &self,
         req: crate::model::GetIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalog>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalog>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -954,9 +956,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -971,13 +973,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn list_iceberg_catalogs(
         &self,
         req: crate::model::ListIcebergCatalogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIcebergCatalogsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIcebergCatalogsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1007,9 +1009,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1024,13 +1026,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn delete_iceberg_catalog(
         &self,
         req: crate::model::DeleteIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1067,9 +1069,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1078,24 +1080,25 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_iceberg_catalog(
         &self,
         req: crate::model::UpdateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalog>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalog>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1150,9 +1153,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1167,13 +1170,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn create_iceberg_catalog(
         &self,
         req: crate::model::CreateIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IcebergCatalog>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IcebergCatalog>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1201,9 +1204,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1218,13 +1221,13 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
     async fn failover_iceberg_catalog(
         &self,
         req: crate::model::FailoverIcebergCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FailoverIcebergCatalogResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FailoverIcebergCatalogResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1261,9 +1264,9 @@ impl super::stub::IcebergCatalogService for IcebergCatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml b/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml
index d9087e4e48..b25658b7fe 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/builder.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/builder.rs
index 3b7e45088b..9cd5e8ffb3 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/builder.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod analytics_hub_service {
     /// A builder for [AnalyticsHubService][crate::client::AnalyticsHubService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_analyticshub_v1::*;
     /// # use builder::analytics_hub_service::ClientBuilder;
     /// # use client::AnalyticsHubService;
@@ -30,19 +30,18 @@ pub mod analytics_hub_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AnalyticsHubService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AnalyticsHubService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod analytics_hub_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AnalyticsHubService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod analytics_hub_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ListDataExchanges;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .list_data_exchanges(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataExchangesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataExchangesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,15 +137,17 @@ pub mod analytics_hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataExchangesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataExchangesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -170,8 +173,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataExchanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataExchanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -181,8 +184,8 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ListOrgDataExchanges;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -216,7 +219,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -226,14 +229,16 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .list_org_data_exchanges(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListOrgDataExchangesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListOrgDataExchangesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -241,17 +246,17 @@ pub mod analytics_hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListOrgDataExchangesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -277,8 +282,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOrgDataExchanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOrgDataExchanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -288,7 +293,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::GetDataExchange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -316,7 +321,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -326,7 +331,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .get_data_exchange(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataExchangeRequest::name].
@@ -339,8 +344,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataExchange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataExchange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -350,7 +355,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::CreateDataExchange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -381,7 +386,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -391,7 +396,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .create_data_exchange(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDataExchangeRequest::parent].
@@ -434,8 +439,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataExchange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataExchange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -445,7 +450,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::UpdateDataExchange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -476,7 +481,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -486,7 +491,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .update_data_exchange(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateDataExchangeRequest::update_mask].
@@ -535,8 +540,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataExchange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataExchange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -546,7 +551,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::DeleteDataExchange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -577,7 +582,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -587,7 +592,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .delete_data_exchange(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDataExchangeRequest::name].
@@ -600,8 +605,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataExchange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataExchange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -611,8 +616,8 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ListListings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -643,7 +648,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -653,13 +658,13 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .list_listings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListListingsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListListingsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -668,15 +673,17 @@ pub mod analytics_hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListListingsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListListingsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -702,8 +709,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListListings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListListings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -713,7 +720,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::GetListing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -741,7 +748,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -751,7 +758,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .get_listing(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetListingRequest::name].
@@ -764,8 +771,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetListing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetListing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -775,7 +782,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::CreateListing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -803,7 +810,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -813,7 +820,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .create_listing(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateListingRequest::parent].
@@ -856,8 +863,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateListing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateListing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -867,7 +874,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::UpdateListing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -895,7 +902,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -905,7 +912,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .update_listing(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateListingRequest::update_mask].
@@ -954,8 +961,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateListing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateListing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -965,7 +972,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::DeleteListing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -993,7 +1000,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1003,7 +1010,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .delete_listing(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteListingRequest::name].
@@ -1022,8 +1029,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteListing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteListing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1033,7 +1040,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::SubscribeListing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1064,7 +1071,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1074,7 +1081,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .subscribe_listing(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::SubscribeListingRequest::name].
@@ -1131,8 +1138,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubscribeListing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubscribeListing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1142,7 +1149,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::SubscribeDataExchange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1174,7 +1181,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1189,7 +1196,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .subscribe_data_exchange(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `subscribe_data_exchange`.
@@ -1208,7 +1215,7 @@ pub mod analytics_hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1285,8 +1292,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubscribeDataExchange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubscribeDataExchange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1296,7 +1303,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::RefreshSubscription;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1328,7 +1335,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1343,7 +1350,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .refresh_subscription(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `refresh_subscription`.
@@ -1362,7 +1369,7 @@ pub mod analytics_hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1399,8 +1406,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RefreshSubscription {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RefreshSubscription {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1410,7 +1417,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::GetSubscription;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1438,7 +1445,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1448,7 +1455,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .get_subscription(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSubscriptionRequest::name].
@@ -1461,8 +1468,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSubscription {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSubscription {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1472,8 +1479,8 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ListSubscriptions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1507,7 +1514,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1517,14 +1524,16 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .list_subscriptions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSubscriptionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSubscriptionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1532,15 +1541,17 @@ pub mod analytics_hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSubscriptionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSubscriptionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1572,8 +1583,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSubscriptions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSubscriptions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1583,8 +1594,8 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ListSharedResourceSubscriptions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1620,7 +1631,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1630,15 +1641,15 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .list_shared_resource_subscriptions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListSharedResourceSubscriptionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1647,17 +1658,17 @@ pub mod analytics_hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSharedResourceSubscriptionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1689,8 +1700,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSharedResourceSubscriptions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSharedResourceSubscriptions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1700,7 +1711,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::RevokeSubscription;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1731,7 +1742,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1741,7 +1752,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .revoke_subscription(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RevokeSubscriptionRequest::name].
@@ -1760,8 +1771,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RevokeSubscription {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RevokeSubscription {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1771,7 +1782,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::DeleteSubscription;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1803,7 +1814,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1818,7 +1829,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .delete_subscription(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_subscription`.
@@ -1830,7 +1841,7 @@ pub mod analytics_hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1867,8 +1878,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSubscription {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSubscription {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1878,7 +1889,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1909,7 +1920,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1919,7 +1930,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1950,8 +1961,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1961,7 +1972,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1992,7 +2003,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2002,7 +2013,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2055,8 +2066,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2066,7 +2077,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2099,7 +2110,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2109,7 +2120,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2135,8 +2146,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2146,7 +2157,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::CreateQueryTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2177,7 +2188,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2187,7 +2198,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .create_query_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateQueryTemplateRequest::parent].
@@ -2230,8 +2241,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateQueryTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateQueryTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2241,7 +2252,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::GetQueryTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2272,7 +2283,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2282,7 +2293,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .get_query_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQueryTemplateRequest::name].
@@ -2295,8 +2306,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQueryTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQueryTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2306,8 +2317,8 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ListQueryTemplates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2341,7 +2352,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2351,14 +2362,16 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .list_query_templates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListQueryTemplatesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListQueryTemplatesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2366,17 +2379,17 @@ pub mod analytics_hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListQueryTemplatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2402,8 +2415,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQueryTemplates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQueryTemplates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2413,7 +2426,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::UpdateQueryTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2444,7 +2457,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2454,7 +2467,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .update_query_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateQueryTemplateRequest::update_mask].
@@ -2499,8 +2512,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateQueryTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateQueryTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2510,7 +2523,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::DeleteQueryTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2541,7 +2554,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2551,7 +2564,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .delete_query_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteQueryTemplateRequest::name].
@@ -2564,8 +2577,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteQueryTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteQueryTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2575,7 +2588,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::SubmitQueryTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2606,7 +2619,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2616,7 +2629,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .submit_query_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::SubmitQueryTemplateRequest::name].
@@ -2629,8 +2642,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubmitQueryTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubmitQueryTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2640,7 +2653,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::ApproveQueryTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2671,7 +2684,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2681,7 +2694,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .approve_query_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ApproveQueryTemplateRequest::name].
@@ -2694,8 +2707,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApproveQueryTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApproveQueryTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2705,7 +2718,7 @@ pub mod analytics_hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_analyticshub_v1::builder::analytics_hub_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_analyticshub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2736,7 +2749,7 @@ pub mod analytics_hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2746,7 +2759,7 @@ pub mod analytics_hub_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2757,8 +2770,8 @@ pub mod analytics_hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/client.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/client.rs
index ff7e0e2c09..3268db4e50 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/client.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_analyticshub_v1::client::AnalyticsHubService;
 /// let client = AnalyticsHubService::builder().build().await?;
 /// // use `client` to make requests to the Analytics Hub API.
@@ -71,15 +71,13 @@ impl AnalyticsHubService {
     /// Returns a builder for [AnalyticsHubService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_analyticshub_v1::client::AnalyticsHubService;
     /// let client = AnalyticsHubService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::analytics_hub_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::analytics_hub_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::analytics_hub_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -97,14 +95,14 @@ impl AnalyticsHubService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AnalyticsHubService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AnalyticsHubService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -114,13 +112,13 @@ impl AnalyticsHubService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AnalyticsHubService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AnalyticsHubService> {
         super::transport::AnalyticsHubService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AnalyticsHubService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AnalyticsHubService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AnalyticsHubService::new)
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/lib.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/lib.rs
index 37868bfeeb..b5e3fe8186 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/lib.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs
index 4a91b4d08c..7d351dd206 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1129,7 +1129,7 @@ impl wkt::message::Message for ListQueryTemplatesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQueryTemplatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQueryTemplatesResponse {
     type PageItem = crate::model::QueryTemplate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5427,7 +5427,7 @@ impl wkt::message::Message for ListDataExchangesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataExchangesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataExchangesResponse {
     type PageItem = crate::model::DataExchange;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5569,7 +5569,7 @@ impl wkt::message::Message for ListOrgDataExchangesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListOrgDataExchangesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListOrgDataExchangesResponse {
     type PageItem = crate::model::DataExchange;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5963,7 +5963,7 @@ impl wkt::message::Message for ListListingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListListingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListListingsResponse {
     type PageItem = crate::model::Listing;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6917,7 +6917,7 @@ impl wkt::message::Message for ListSubscriptionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSubscriptionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSubscriptionsResponse {
     type PageItem = crate::model::Subscription;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7073,7 +7073,9 @@ impl wkt::message::Message for ListSharedResourceSubscriptionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSharedResourceSubscriptionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListSharedResourceSubscriptionsResponse
+{
     type PageItem = crate::model::Subscription;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/stub.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/stub.rs
index b5f7f20104..4b53cae376 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/stub.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn list_data_exchanges(
         &self,
         _req: crate::model::ListDataExchangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataExchangesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataExchangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn list_org_data_exchanges(
         &self,
         _req: crate::model::ListOrgDataExchangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListOrgDataExchangesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListOrgDataExchangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn get_data_exchange(
         &self,
         _req: crate::model::GetDataExchangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataExchange>>,
+        Output = crate::Result<crate::Response<crate::model::DataExchange>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn create_data_exchange(
         &self,
         _req: crate::model::CreateDataExchangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataExchange>>,
+        Output = crate::Result<crate::Response<crate::model::DataExchange>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn update_data_exchange(
         &self,
         _req: crate::model::UpdateDataExchangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataExchange>>,
+        Output = crate::Result<crate::Response<crate::model::DataExchange>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,8 +97,8 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn delete_data_exchange(
         &self,
         _req: crate::model::DeleteDataExchangeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,9 +106,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn list_listings(
         &self,
         _req: crate::model::ListListingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListListingsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListListingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,10 +117,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn get_listing(
         &self,
         _req: crate::model::GetListingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Listing>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Listing>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -128,10 +127,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn create_listing(
         &self,
         _req: crate::model::CreateListingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Listing>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Listing>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -139,10 +137,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn update_listing(
         &self,
         _req: crate::model::UpdateListingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Listing>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Listing>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -150,8 +147,8 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn delete_listing(
         &self,
         _req: crate::model::DeleteListingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -159,9 +156,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn subscribe_listing(
         &self,
         _req: crate::model::SubscribeListingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SubscribeListingResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SubscribeListingResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -170,9 +167,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn subscribe_data_exchange(
         &self,
         _req: crate::model::SubscribeDataExchangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -181,9 +178,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn refresh_subscription(
         &self,
         _req: crate::model::RefreshSubscriptionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -192,9 +189,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn get_subscription(
         &self,
         _req: crate::model::GetSubscriptionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Subscription>>,
+        Output = crate::Result<crate::Response<crate::model::Subscription>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -203,9 +200,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn list_subscriptions(
         &self,
         _req: crate::model::ListSubscriptionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSubscriptionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSubscriptionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -214,10 +211,10 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn list_shared_resource_subscriptions(
         &self,
         _req: crate::model::ListSharedResourceSubscriptionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListSharedResourceSubscriptionsResponse>,
+            crate::Response<crate::model::ListSharedResourceSubscriptionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -227,9 +224,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn revoke_subscription(
         &self,
         _req: crate::model::RevokeSubscriptionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RevokeSubscriptionResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RevokeSubscriptionResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -238,9 +235,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn delete_subscription(
         &self,
         _req: crate::model::DeleteSubscriptionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -249,9 +246,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -260,9 +257,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -271,10 +268,10 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -284,9 +281,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn create_query_template(
         &self,
         _req: crate::model::CreateQueryTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::QueryTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -295,9 +292,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn get_query_template(
         &self,
         _req: crate::model::GetQueryTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::QueryTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -306,9 +303,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn list_query_templates(
         &self,
         _req: crate::model::ListQueryTemplatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListQueryTemplatesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListQueryTemplatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -317,9 +314,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn update_query_template(
         &self,
         _req: crate::model::UpdateQueryTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::QueryTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -328,8 +325,8 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn delete_query_template(
         &self,
         _req: crate::model::DeleteQueryTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -337,9 +334,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn submit_query_template(
         &self,
         _req: crate::model::SubmitQueryTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::QueryTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -348,9 +345,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn approve_query_template(
         &self,
         _req: crate::model::ApproveQueryTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::QueryTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -359,9 +356,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -372,9 +369,9 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -383,8 +380,8 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/stub/dynamic.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/stub/dynamic.rs
index 14b53c03a1..eba0d608fd 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/stub/dynamic.rs
@@ -20,194 +20,192 @@ pub trait AnalyticsHubService: std::fmt::Debug + Send + Sync {
     async fn list_data_exchanges(
         &self,
         req: crate::model::ListDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataExchangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataExchangesResponse>>;
 
     async fn list_org_data_exchanges(
         &self,
         req: crate::model::ListOrgDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOrgDataExchangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOrgDataExchangesResponse>>;
 
     async fn get_data_exchange(
         &self,
         req: crate::model::GetDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataExchange>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataExchange>>;
 
     async fn create_data_exchange(
         &self,
         req: crate::model::CreateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataExchange>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataExchange>>;
 
     async fn update_data_exchange(
         &self,
         req: crate::model::UpdateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataExchange>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataExchange>>;
 
     async fn delete_data_exchange(
         &self,
         req: crate::model::DeleteDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_listings(
         &self,
         req: crate::model::ListListingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListListingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListListingsResponse>>;
 
     async fn get_listing(
         &self,
         req: crate::model::GetListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Listing>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Listing>>;
 
     async fn create_listing(
         &self,
         req: crate::model::CreateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Listing>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Listing>>;
 
     async fn update_listing(
         &self,
         req: crate::model::UpdateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Listing>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Listing>>;
 
     async fn delete_listing(
         &self,
         req: crate::model::DeleteListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn subscribe_listing(
         &self,
         req: crate::model::SubscribeListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubscribeListingResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubscribeListingResponse>>;
 
     async fn subscribe_data_exchange(
         &self,
         req: crate::model::SubscribeDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn refresh_subscription(
         &self,
         req: crate::model::RefreshSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_subscription(
         &self,
         req: crate::model::GetSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Subscription>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Subscription>>;
 
     async fn list_subscriptions(
         &self,
         req: crate::model::ListSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSubscriptionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSubscriptionsResponse>>;
 
     async fn list_shared_resource_subscriptions(
         &self,
         req: crate::model::ListSharedResourceSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSharedResourceSubscriptionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSharedResourceSubscriptionsResponse>>;
 
     async fn revoke_subscription(
         &self,
         req: crate::model::RevokeSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RevokeSubscriptionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RevokeSubscriptionResponse>>;
 
     async fn delete_subscription(
         &self,
         req: crate::model::DeleteSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn create_query_template(
         &self,
         req: crate::model::CreateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>>;
 
     async fn get_query_template(
         &self,
         req: crate::model::GetQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>>;
 
     async fn list_query_templates(
         &self,
         req: crate::model::ListQueryTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQueryTemplatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQueryTemplatesResponse>>;
 
     async fn update_query_template(
         &self,
         req: crate::model::UpdateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>>;
 
     async fn delete_query_template(
         &self,
         req: crate::model::DeleteQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn submit_query_template(
         &self,
         req: crate::model::SubmitQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>>;
 
     async fn approve_query_template(
         &self,
         req: crate::model::ApproveQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AnalyticsHubService] also implement [AnalyticsHubService].
@@ -217,8 +215,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn list_data_exchanges(
         &self,
         req: crate::model::ListDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataExchangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataExchangesResponse>> {
         T::list_data_exchanges(self, req, options).await
     }
 
@@ -226,8 +224,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn list_org_data_exchanges(
         &self,
         req: crate::model::ListOrgDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOrgDataExchangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOrgDataExchangesResponse>> {
         T::list_org_data_exchanges(self, req, options).await
     }
 
@@ -235,8 +233,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn get_data_exchange(
         &self,
         req: crate::model::GetDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataExchange>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataExchange>> {
         T::get_data_exchange(self, req, options).await
     }
 
@@ -244,8 +242,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn create_data_exchange(
         &self,
         req: crate::model::CreateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataExchange>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataExchange>> {
         T::create_data_exchange(self, req, options).await
     }
 
@@ -253,8 +251,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn update_data_exchange(
         &self,
         req: crate::model::UpdateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataExchange>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataExchange>> {
         T::update_data_exchange(self, req, options).await
     }
 
@@ -262,8 +260,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn delete_data_exchange(
         &self,
         req: crate::model::DeleteDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_data_exchange(self, req, options).await
     }
 
@@ -271,8 +269,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn list_listings(
         &self,
         req: crate::model::ListListingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListListingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListListingsResponse>> {
         T::list_listings(self, req, options).await
     }
 
@@ -280,8 +278,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn get_listing(
         &self,
         req: crate::model::GetListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Listing>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Listing>> {
         T::get_listing(self, req, options).await
     }
 
@@ -289,8 +287,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn create_listing(
         &self,
         req: crate::model::CreateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Listing>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Listing>> {
         T::create_listing(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn update_listing(
         &self,
         req: crate::model::UpdateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Listing>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Listing>> {
         T::update_listing(self, req, options).await
     }
 
@@ -307,8 +305,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn delete_listing(
         &self,
         req: crate::model::DeleteListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_listing(self, req, options).await
     }
 
@@ -316,8 +314,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn subscribe_listing(
         &self,
         req: crate::model::SubscribeListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubscribeListingResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubscribeListingResponse>> {
         T::subscribe_listing(self, req, options).await
     }
 
@@ -325,8 +323,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn subscribe_data_exchange(
         &self,
         req: crate::model::SubscribeDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::subscribe_data_exchange(self, req, options).await
     }
 
@@ -334,8 +332,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn refresh_subscription(
         &self,
         req: crate::model::RefreshSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::refresh_subscription(self, req, options).await
     }
 
@@ -343,8 +341,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn get_subscription(
         &self,
         req: crate::model::GetSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Subscription>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Subscription>> {
         T::get_subscription(self, req, options).await
     }
 
@@ -352,8 +350,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn list_subscriptions(
         &self,
         req: crate::model::ListSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSubscriptionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSubscriptionsResponse>> {
         T::list_subscriptions(self, req, options).await
     }
 
@@ -361,9 +359,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn list_shared_resource_subscriptions(
         &self,
         req: crate::model::ListSharedResourceSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSharedResourceSubscriptionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSharedResourceSubscriptionsResponse>> {
         T::list_shared_resource_subscriptions(self, req, options).await
     }
 
@@ -371,8 +368,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn revoke_subscription(
         &self,
         req: crate::model::RevokeSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RevokeSubscriptionResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RevokeSubscriptionResponse>> {
         T::revoke_subscription(self, req, options).await
     }
 
@@ -380,8 +377,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn delete_subscription(
         &self,
         req: crate::model::DeleteSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_subscription(self, req, options).await
     }
 
@@ -389,8 +386,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -398,8 +395,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -407,10 +404,9 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -418,8 +414,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn create_query_template(
         &self,
         req: crate::model::CreateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>> {
         T::create_query_template(self, req, options).await
     }
 
@@ -427,8 +423,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn get_query_template(
         &self,
         req: crate::model::GetQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>> {
         T::get_query_template(self, req, options).await
     }
 
@@ -436,8 +432,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn list_query_templates(
         &self,
         req: crate::model::ListQueryTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQueryTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQueryTemplatesResponse>> {
         T::list_query_templates(self, req, options).await
     }
 
@@ -445,8 +441,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn update_query_template(
         &self,
         req: crate::model::UpdateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>> {
         T::update_query_template(self, req, options).await
     }
 
@@ -454,8 +450,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn delete_query_template(
         &self,
         req: crate::model::DeleteQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_query_template(self, req, options).await
     }
 
@@ -463,8 +459,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn submit_query_template(
         &self,
         req: crate::model::SubmitQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>> {
         T::submit_query_template(self, req, options).await
     }
 
@@ -472,8 +468,8 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn approve_query_template(
         &self,
         req: crate::model::ApproveQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryTemplate>> {
         T::approve_query_template(self, req, options).await
     }
 
@@ -481,22 +477,22 @@ impl<T: super::AnalyticsHubService> AnalyticsHubService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/tracing.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/tracing.rs
index 0a553dc0b2..4b03d67467 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/tracing.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_data_exchanges(
         &self,
         req: crate::model::ListDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataExchangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataExchangesResponse>> {
         self.inner.list_data_exchanges(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_org_data_exchanges(
         &self,
         req: crate::model::ListOrgDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOrgDataExchangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOrgDataExchangesResponse>> {
         self.inner.list_org_data_exchanges(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_data_exchange(
         &self,
         req: crate::model::GetDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataExchange>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataExchange>> {
         self.inner.get_data_exchange(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn create_data_exchange(
         &self,
         req: crate::model::CreateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataExchange>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataExchange>> {
         self.inner.create_data_exchange(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_data_exchange(
         &self,
         req: crate::model::UpdateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataExchange>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataExchange>> {
         self.inner.update_data_exchange(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_data_exchange(
         &self,
         req: crate::model::DeleteDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_data_exchange(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_listings(
         &self,
         req: crate::model::ListListingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListListingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListListingsResponse>> {
         self.inner.list_listings(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_listing(
         &self,
         req: crate::model::GetListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Listing>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Listing>> {
         self.inner.get_listing(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn create_listing(
         &self,
         req: crate::model::CreateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Listing>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Listing>> {
         self.inner.create_listing(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn update_listing(
         &self,
         req: crate::model::UpdateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Listing>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Listing>> {
         self.inner.update_listing(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_listing(
         &self,
         req: crate::model::DeleteListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_listing(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn subscribe_listing(
         &self,
         req: crate::model::SubscribeListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubscribeListingResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubscribeListingResponse>> {
         self.inner.subscribe_listing(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn subscribe_data_exchange(
         &self,
         req: crate::model::SubscribeDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.subscribe_data_exchange(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn refresh_subscription(
         &self,
         req: crate::model::RefreshSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.refresh_subscription(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_subscription(
         &self,
         req: crate::model::GetSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Subscription>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Subscription>> {
         self.inner.get_subscription(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn list_subscriptions(
         &self,
         req: crate::model::ListSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSubscriptionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSubscriptionsResponse>> {
         self.inner.list_subscriptions(req, options).await
     }
 
@@ -185,9 +185,8 @@ where
     async fn list_shared_resource_subscriptions(
         &self,
         req: crate::model::ListSharedResourceSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSharedResourceSubscriptionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSharedResourceSubscriptionsResponse>> {
         self.inner
             .list_shared_resource_subscriptions(req, options)
             .await
@@ -197,8 +196,8 @@ where
     async fn revoke_subscription(
         &self,
         req: crate::model::RevokeSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RevokeSubscriptionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RevokeSubscriptionResponse>> {
         self.inner.revoke_subscription(req, options).await
     }
 
@@ -206,8 +205,8 @@ where
     async fn delete_subscription(
         &self,
         req: crate::model::DeleteSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_subscription(req, options).await
     }
 
@@ -215,8 +214,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -224,8 +223,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -233,9 +232,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -243,8 +241,8 @@ where
     async fn create_query_template(
         &self,
         req: crate::model::CreateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         self.inner.create_query_template(req, options).await
     }
 
@@ -252,8 +250,8 @@ where
     async fn get_query_template(
         &self,
         req: crate::model::GetQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         self.inner.get_query_template(req, options).await
     }
 
@@ -261,8 +259,8 @@ where
     async fn list_query_templates(
         &self,
         req: crate::model::ListQueryTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQueryTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQueryTemplatesResponse>> {
         self.inner.list_query_templates(req, options).await
     }
 
@@ -270,8 +268,8 @@ where
     async fn update_query_template(
         &self,
         req: crate::model::UpdateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         self.inner.update_query_template(req, options).await
     }
 
@@ -279,8 +277,8 @@ where
     async fn delete_query_template(
         &self,
         req: crate::model::DeleteQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_query_template(req, options).await
     }
 
@@ -288,8 +286,8 @@ where
     async fn submit_query_template(
         &self,
         req: crate::model::SubmitQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         self.inner.submit_query_template(req, options).await
     }
 
@@ -297,8 +295,8 @@ where
     async fn approve_query_template(
         &self,
         req: crate::model::ApproveQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         self.inner.approve_query_template(req, options).await
     }
 
@@ -306,22 +304,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs
index 00cb0e59c1..3c86c8665d 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AnalyticsHubService](super::stub::AnalyticsHubService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AnalyticsHubService {
 }
 
 impl AnalyticsHubService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn list_data_exchanges(
         &self,
         req: crate::model::ListDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataExchangesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataExchangesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn list_org_data_exchanges(
         &self,
         req: crate::model::ListOrgDataExchangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOrgDataExchangesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOrgDataExchangesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn get_data_exchange(
         &self,
         req: crate::model::GetDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataExchange>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataExchange>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn create_data_exchange(
         &self,
         req: crate::model::CreateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataExchange>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataExchange>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -275,9 +275,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -292,13 +292,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn update_data_exchange(
         &self,
         req: crate::model::UpdateDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataExchange>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataExchange>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357,9 +357,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -374,13 +374,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn delete_data_exchange(
         &self,
         req: crate::model::DeleteDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -421,9 +421,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -432,24 +432,25 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_listings(
         &self,
         req: crate::model::ListListingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListListingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListListingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +493,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +510,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn get_listing(
         &self,
         req: crate::model::GetListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Listing>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Listing>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -560,9 +561,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -577,13 +578,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn create_listing(
         &self,
         req: crate::model::CreateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Listing>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Listing>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -625,9 +626,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -642,13 +643,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn update_listing(
         &self,
         req: crate::model::UpdateListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Listing>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Listing>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -711,9 +712,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -728,13 +729,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn delete_listing(
         &self,
         req: crate::model::DeleteListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -780,9 +781,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -791,24 +792,25 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn subscribe_listing(
         &self,
         req: crate::model::SubscribeListingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubscribeListingResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubscribeListingResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -853,9 +855,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -870,13 +872,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn subscribe_data_exchange(
         &self,
         req: crate::model::SubscribeDataExchangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -917,9 +919,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -934,13 +936,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn refresh_subscription(
         &self,
         req: crate::model::RefreshSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -981,9 +983,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -998,13 +1000,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn get_subscription(
         &self,
         req: crate::model::GetSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Subscription>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Subscription>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1045,9 +1047,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1062,13 +1064,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn list_subscriptions(
         &self,
         req: crate::model::ListSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSubscriptionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSubscriptionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1108,9 +1110,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1125,14 +1127,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn list_shared_resource_subscriptions(
         &self,
         req: crate::model::ListSharedResourceSubscriptionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSharedResourceSubscriptionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSharedResourceSubscriptionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1226,9 +1227,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1243,13 +1244,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn revoke_subscription(
         &self,
         req: crate::model::RevokeSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RevokeSubscriptionResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RevokeSubscriptionResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1290,9 +1291,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1307,13 +1308,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn delete_subscription(
         &self,
         req: crate::model::DeleteSubscriptionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1354,9 +1355,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1371,13 +1372,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1496,9 +1497,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1513,13 +1514,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1638,9 +1639,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1655,14 +1656,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1744,9 +1744,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1761,13 +1761,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn create_query_template(
         &self,
         req: crate::model::CreateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1809,9 +1809,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1826,13 +1826,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn get_query_template(
         &self,
         req: crate::model::GetQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1877,9 +1877,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1894,13 +1894,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn list_query_templates(
         &self,
         req: crate::model::ListQueryTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQueryTemplatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQueryTemplatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1943,9 +1943,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1960,13 +1960,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn update_query_template(
         &self,
         req: crate::model::UpdateQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2029,9 +2029,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2046,13 +2046,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn delete_query_template(
         &self,
         req: crate::model::DeleteQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2097,9 +2097,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2108,24 +2108,25 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn submit_query_template(
         &self,
         req: crate::model::SubmitQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2170,9 +2171,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2187,13 +2188,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn approve_query_template(
         &self,
         req: crate::model::ApproveQueryTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2238,9 +2239,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2255,13 +2256,13 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2294,9 +2295,9 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2310,15 +2311,15 @@ impl super::stub::AnalyticsHubService for AnalyticsHubService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/bigquery/connection/v1/Cargo.toml b/src/generated/cloud/bigquery/connection/v1/Cargo.toml
index 7948ee17c9..58d60af1c9 100644
--- a/src/generated/cloud/bigquery/connection/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/connection/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-iam-v1.workspace = true
 lazy_static.workspace         = true
 serde.workspace               = true
diff --git a/src/generated/cloud/bigquery/connection/v1/src/builder.rs b/src/generated/cloud/bigquery/connection/v1/src/builder.rs
index 6bce982f0e..767653ee98 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/builder.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod connection_service {
     /// A builder for [ConnectionService][crate::client::ConnectionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_connection_v1::*;
     /// # use builder::connection_service::ClientBuilder;
     /// # use client::ConnectionService;
@@ -30,19 +30,18 @@ pub mod connection_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConnectionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConnectionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod connection_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConnectionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod connection_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::CreateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .create_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateConnectionRequest::parent].
@@ -158,8 +157,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -169,7 +168,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::GetConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -197,7 +196,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -207,7 +206,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .get_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectionRequest::name].
@@ -220,8 +219,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -231,8 +230,8 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::ListConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -263,7 +262,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -273,14 +272,16 @@ pub mod connection_service {
             (*self.0.stub)
                 .list_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -288,15 +289,17 @@ pub mod connection_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -324,8 +327,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -335,7 +338,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::UpdateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -366,7 +369,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -376,7 +379,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .update_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateConnectionRequest::name].
@@ -433,8 +436,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -444,7 +447,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::DeleteConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -475,7 +478,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -485,7 +488,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .delete_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteConnectionRequest::name].
@@ -498,8 +501,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -509,7 +512,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -540,7 +543,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -550,7 +553,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -581,8 +584,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -592,7 +595,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -623,7 +626,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -633,7 +636,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -686,8 +689,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -697,7 +700,7 @@ pub mod connection_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_connection_v1::builder::connection_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_connection_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -730,7 +733,7 @@ pub mod connection_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -740,7 +743,7 @@ pub mod connection_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -766,8 +769,8 @@ pub mod connection_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/connection/v1/src/client.rs b/src/generated/cloud/bigquery/connection/v1/src/client.rs
index 85478531d9..5e9751429c 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/client.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_connection_v1::client::ConnectionService;
 /// let client = ConnectionService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery Connection API.
@@ -66,15 +66,13 @@ impl ConnectionService {
     /// Returns a builder for [ConnectionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_connection_v1::client::ConnectionService;
     /// let client = ConnectionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::connection_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::connection_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::connection_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl ConnectionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConnectionService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConnectionService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl ConnectionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConnectionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConnectionService> {
         super::transport::ConnectionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConnectionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConnectionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConnectionService::new)
diff --git a/src/generated/cloud/bigquery/connection/v1/src/lib.rs b/src/generated/cloud/bigquery/connection/v1/src/lib.rs
index f9a9963afb..5bc6ca291d 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/lib.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/connection/v1/src/model.rs b/src/generated/cloud/bigquery/connection/v1/src/model.rs
index 9aa09593e8..4c79cdfc7a 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate lazy_static;
 extern crate serde;
@@ -292,7 +292,7 @@ impl wkt::message::Message for ListConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectionsResponse {
     type PageItem = crate::model::Connection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/connection/v1/src/stub.rs b/src/generated/cloud/bigquery/connection/v1/src/stub.rs
index 1685e3451d..0443bf6ffb 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/stub.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn create_connection(
         &self,
         _req: crate::model::CreateConnectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connection>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connection>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn get_connection(
         &self,
         _req: crate::model::GetConnectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connection>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connection>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +62,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn list_connections(
         &self,
         _req: crate::model::ListConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +73,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn update_connection(
         &self,
         _req: crate::model::UpdateConnectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connection>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connection>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +83,8 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn delete_connection(
         &self,
         _req: crate::model::DeleteConnectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +92,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,9 +103,9 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,10 +114,10 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
diff --git a/src/generated/cloud/bigquery/connection/v1/src/stub/dynamic.rs b/src/generated/cloud/bigquery/connection/v1/src/stub/dynamic.rs
index b67594ab58..64ff7886d5 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/stub/dynamic.rs
@@ -20,52 +20,50 @@ pub trait ConnectionService: std::fmt::Debug + Send + Sync {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>>;
 
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>>;
 
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>>;
 
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>>;
 
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 }
 
 /// All implementations of [super::ConnectionService] also implement [ConnectionService].
@@ -75,8 +73,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>> {
         T::create_connection(self, req, options).await
     }
 
@@ -84,8 +82,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>> {
         T::get_connection(self, req, options).await
     }
 
@@ -93,8 +91,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>> {
         T::list_connections(self, req, options).await
     }
 
@@ -102,8 +100,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>> {
         T::update_connection(self, req, options).await
     }
 
@@ -111,8 +109,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_connection(self, req, options).await
     }
 
@@ -120,8 +118,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -129,8 +127,8 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -138,10 +136,9 @@ impl<T: super::ConnectionService> ConnectionService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/connection/v1/src/tracing.rs b/src/generated/cloud/bigquery/connection/v1/src/tracing.rs
index 11a423bb63..fb234ac794 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/tracing.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         self.inner.create_connection(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         self.inner.get_connection(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         self.inner.list_connections(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         self.inner.update_connection(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_connection(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -104,9 +104,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/connection/v1/src/transport.rs b/src/generated/cloud/bigquery/connection/v1/src/transport.rs
index ab9d15e710..1c74539084 100644
--- a/src/generated/cloud/bigquery/connection/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ConnectionService](super::stub::ConnectionService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ConnectionService {
 }
 
 impl ConnectionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -151,9 +151,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -168,13 +168,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -213,9 +213,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -230,13 +230,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -289,9 +289,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -306,13 +306,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -353,9 +353,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -364,24 +364,25 @@ impl super::stub::ConnectionService for ConnectionService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -422,9 +423,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -439,13 +440,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -486,9 +487,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -503,14 +504,13 @@ impl super::stub::ConnectionService for ConnectionService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -551,9 +551,9 @@ impl super::stub::ConnectionService for ConnectionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml b/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml
index 4e7065a070..d51c15bc17 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-iam-v1.workspace = true
 lazy_static.workspace         = true
 serde.workspace               = true
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/builder.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/builder.rs
index 4ad67d0fb5..f241e86f91 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/builder.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_policy_service {
     /// A builder for [DataPolicyService][crate::client::DataPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_datapolicies_v1::*;
     /// # use builder::data_policy_service::ClientBuilder;
     /// # use client::DataPolicyService;
@@ -30,19 +30,18 @@ pub mod data_policy_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataPolicyService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataPolicyService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_policy_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataPolicyService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_policy_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::CreateDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .create_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDataPolicyRequest::parent].
@@ -152,8 +151,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -163,7 +162,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::UpdateDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -194,7 +193,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -204,7 +203,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .update_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_policy][crate::model::UpdateDataPolicyRequest::data_policy].
@@ -249,8 +248,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +259,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::RenameDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -291,7 +290,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -301,7 +300,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .rename_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameDataPolicyRequest::name].
@@ -322,8 +321,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -333,7 +332,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::DeleteDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -364,7 +363,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -374,7 +373,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .delete_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDataPolicyRequest::name].
@@ -387,8 +386,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -398,7 +397,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::GetDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -426,7 +425,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -436,7 +435,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .get_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataPolicyRequest::name].
@@ -449,8 +448,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -460,8 +459,8 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::ListDataPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -495,7 +494,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -505,14 +504,16 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .list_data_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -520,15 +521,17 @@ pub mod data_policy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataPoliciesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataPoliciesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -560,8 +563,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -571,7 +574,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -602,7 +605,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -612,7 +615,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -643,8 +646,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -654,7 +657,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -685,7 +688,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -695,7 +698,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -748,8 +751,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -759,7 +762,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v1::builder::data_policy_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -792,7 +795,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -802,7 +805,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -828,8 +831,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/client.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/client.rs
index 3092a935e0..4c56650f46 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/client.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_datapolicies_v1::client::DataPolicyService;
 /// let client = DataPolicyService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery Data Policy API.
@@ -66,15 +66,13 @@ impl DataPolicyService {
     /// Returns a builder for [DataPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_datapolicies_v1::client::DataPolicyService;
     /// let client = DataPolicyService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_policy_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_policy_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_policy_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl DataPolicyService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataPolicyService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataPolicyService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl DataPolicyService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataPolicyService> {
         super::transport::DataPolicyService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataPolicyService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataPolicyService::new)
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/lib.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/lib.rs
index 15ce26dcde..871bcc8ece 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/lib.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs
index 8f293b16ef..85d871dd62 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate lazy_static;
 extern crate serde;
@@ -479,7 +479,7 @@ impl wkt::message::Message for ListDataPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataPoliciesResponse {
     type PageItem = crate::model::DataPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/stub.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/stub.rs
index b616cb4700..ad4cd05ede 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/stub.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn create_data_policy(
         &self,
         _req: crate::model::CreateDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn update_data_policy(
         &self,
         _req: crate::model::UpdateDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +62,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn rename_data_policy(
         &self,
         _req: crate::model::RenameDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,8 +72,8 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn delete_data_policy(
         &self,
         _req: crate::model::DeleteDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -84,10 +81,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn get_data_policy(
         &self,
         _req: crate::model::GetDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +91,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn list_data_policies(
         &self,
         _req: crate::model::ListDataPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataPoliciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,9 +102,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,9 +113,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,10 +124,10 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/stub/dynamic.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/stub/dynamic.rs
index 7a05070568..36c8122cbc 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/stub/dynamic.rs
@@ -20,58 +20,56 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn rename_data_policy(
         &self,
         req: crate::model::RenameDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataPoliciesResponse>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 }
 
 /// All implementations of [super::DataPolicyService] also implement [DataPolicyService].
@@ -81,8 +79,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::create_data_policy(self, req, options).await
     }
 
@@ -90,8 +88,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::update_data_policy(self, req, options).await
     }
 
@@ -99,8 +97,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn rename_data_policy(
         &self,
         req: crate::model::RenameDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::rename_data_policy(self, req, options).await
     }
 
@@ -108,8 +106,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_data_policy(self, req, options).await
     }
 
@@ -117,8 +115,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::get_data_policy(self, req, options).await
     }
 
@@ -126,8 +124,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataPoliciesResponse>> {
         T::list_data_policies(self, req, options).await
     }
 
@@ -135,8 +133,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -144,8 +142,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -153,10 +151,9 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/tracing.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/tracing.rs
index 3989c365d3..d300a43a75 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/tracing.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.create_data_policy(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.update_data_policy(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn rename_data_policy(
         &self,
         req: crate::model::RenameDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.rename_data_policy(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_data_policy(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.get_data_policy(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataPoliciesResponse>> {
         self.inner.list_data_policies(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -113,9 +113,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs
index 270c51ddb3..8b289ca42f 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataPolicyService](super::stub::DataPolicyService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataPolicyService {
 }
 
 impl DataPolicyService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -86,9 +86,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103,13 +103,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -168,9 +168,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -185,13 +185,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn rename_data_policy(
         &self,
         req: crate::model::RenameDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -232,9 +232,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -249,13 +249,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296,9 +296,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -307,24 +307,25 @@ impl super::stub::DataPolicyService for DataPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -365,9 +366,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -382,13 +383,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +429,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +446,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +493,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +510,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -556,9 +557,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -573,14 +574,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -621,9 +621,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/Cargo.toml b/src/generated/cloud/bigquery/datapolicies/v2/Cargo.toml
index 3a3ed89290..49c500912d 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/Cargo.toml
+++ b/src/generated/cloud/bigquery/datapolicies/v2/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-iam-v1.workspace = true
 lazy_static.workspace         = true
 serde.workspace               = true
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/builder.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/builder.rs
index d20fe154ee..30b542b8ca 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/builder.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_policy_service {
     /// A builder for [DataPolicyService][crate::client::DataPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_datapolicies_v2::*;
     /// # use builder::data_policy_service::ClientBuilder;
     /// # use client::DataPolicyService;
@@ -30,19 +30,18 @@ pub mod data_policy_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataPolicyService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataPolicyService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_policy_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataPolicyService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_policy_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::CreateDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .create_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDataPolicyRequest::parent].
@@ -160,8 +159,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -171,7 +170,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::AddGrantees;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -199,7 +198,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -209,7 +208,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .add_grantees(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_policy][crate::model::AddGranteesRequest::data_policy].
@@ -235,8 +234,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddGrantees {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddGrantees {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +245,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::RemoveGrantees;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -274,7 +273,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -284,7 +283,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .remove_grantees(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_policy][crate::model::RemoveGranteesRequest::data_policy].
@@ -310,8 +309,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveGrantees {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveGrantees {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -321,7 +320,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::UpdateDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -352,7 +351,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -362,7 +361,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .update_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_policy][crate::model::UpdateDataPolicyRequest::data_policy].
@@ -413,8 +412,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -424,7 +423,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::DeleteDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -455,7 +454,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -465,7 +464,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .delete_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDataPolicyRequest::name].
@@ -478,8 +477,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -489,7 +488,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::GetDataPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -517,7 +516,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -527,7 +526,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .get_data_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataPolicyRequest::name].
@@ -540,8 +539,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -551,8 +550,8 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::ListDataPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -586,7 +585,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -596,14 +595,16 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .list_data_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -611,15 +612,17 @@ pub mod data_policy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataPoliciesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataPoliciesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -651,8 +654,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -662,7 +665,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -693,7 +696,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -703,7 +706,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -734,8 +737,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -745,7 +748,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -776,7 +779,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -786,7 +789,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -839,8 +842,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -850,7 +853,7 @@ pub mod data_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datapolicies_v2::builder::data_policy_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datapolicies_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -883,7 +886,7 @@ pub mod data_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -893,7 +896,7 @@ pub mod data_policy_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -919,8 +922,8 @@ pub mod data_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/client.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/client.rs
index c3f1dd4cd1..3607192900 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/client.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_datapolicies_v2::client::DataPolicyService;
 /// let client = DataPolicyService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery Data Policy API.
@@ -66,15 +66,13 @@ impl DataPolicyService {
     /// Returns a builder for [DataPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_datapolicies_v2::client::DataPolicyService;
     /// let client = DataPolicyService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_policy_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_policy_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_policy_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl DataPolicyService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataPolicyService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataPolicyService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl DataPolicyService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataPolicyService> {
         super::transport::DataPolicyService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataPolicyService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataPolicyService::new)
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/lib.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/lib.rs
index 15ce26dcde..871bcc8ece 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/lib.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/model.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/model.rs
index e7e95c8f53..11a5561056 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/model.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate lazy_static;
 extern crate serde;
@@ -588,7 +588,7 @@ impl wkt::message::Message for ListDataPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataPoliciesResponse {
     type PageItem = crate::model::DataPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/stub.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/stub.rs
index bb3369a290..3d9e882e92 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/stub.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/stub.rs
@@ -42,10 +42,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn create_data_policy(
         &self,
         _req: crate::model::CreateDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn add_grantees(
         &self,
         _req: crate::model::AddGranteesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +62,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn remove_grantees(
         &self,
         _req: crate::model::RemoveGranteesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +72,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn update_data_policy(
         &self,
         _req: crate::model::UpdateDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +82,8 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn delete_data_policy(
         &self,
         _req: crate::model::DeleteDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,10 +91,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn get_data_policy(
         &self,
         _req: crate::model::GetDataPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,9 +101,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn list_data_policies(
         &self,
         _req: crate::model::ListDataPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataPoliciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,9 +112,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,9 +123,9 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,10 +134,10 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/stub/dynamic.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/stub/dynamic.rs
index 07053da780..a95ea6e662 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/stub/dynamic.rs
@@ -20,64 +20,62 @@ pub trait DataPolicyService: std::fmt::Debug + Send + Sync {
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn add_grantees(
         &self,
         req: crate::model::AddGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn remove_grantees(
         &self,
         req: crate::model::RemoveGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>>;
 
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataPoliciesResponse>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 }
 
 /// All implementations of [super::DataPolicyService] also implement [DataPolicyService].
@@ -87,8 +85,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::create_data_policy(self, req, options).await
     }
 
@@ -96,8 +94,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn add_grantees(
         &self,
         req: crate::model::AddGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::add_grantees(self, req, options).await
     }
 
@@ -105,8 +103,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn remove_grantees(
         &self,
         req: crate::model::RemoveGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::remove_grantees(self, req, options).await
     }
 
@@ -114,8 +112,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::update_data_policy(self, req, options).await
     }
 
@@ -123,8 +121,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_data_policy(self, req, options).await
     }
 
@@ -132,8 +130,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataPolicy>> {
         T::get_data_policy(self, req, options).await
     }
 
@@ -141,8 +139,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataPoliciesResponse>> {
         T::list_data_policies(self, req, options).await
     }
 
@@ -150,8 +148,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -159,8 +157,8 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -168,10 +166,9 @@ impl<T: super::DataPolicyService> DataPolicyService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/tracing.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/tracing.rs
index a04d8ea5f2..247d91e025 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/tracing.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.create_data_policy(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn add_grantees(
         &self,
         req: crate::model::AddGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.add_grantees(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn remove_grantees(
         &self,
         req: crate::model::RemoveGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.remove_grantees(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.update_data_policy(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_data_policy(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         self.inner.get_data_policy(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataPoliciesResponse>> {
         self.inner.list_data_policies(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -122,9 +122,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/datapolicies/v2/src/transport.rs b/src/generated/cloud/bigquery/datapolicies/v2/src/transport.rs
index c6e96a0769..f3a2b2e2b8 100644
--- a/src/generated/cloud/bigquery/datapolicies/v2/src/transport.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataPolicyService](super::stub::DataPolicyService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataPolicyService {
 }
 
 impl DataPolicyService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn create_data_policy(
         &self,
         req: crate::model::CreateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -86,9 +86,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103,13 +103,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn add_grantees(
         &self,
         req: crate::model::AddGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn remove_grantees(
         &self,
         req: crate::model::RemoveGranteesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn update_data_policy(
         &self,
         req: crate::model::UpdateDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn delete_data_policy(
         &self,
         req: crate::model::DeleteDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -372,24 +372,25 @@ impl super::stub::DataPolicyService for DataPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_data_policy(
         &self,
         req: crate::model::GetDataPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430,9 +431,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -447,13 +448,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn list_data_policies(
         &self,
         req: crate::model::ListDataPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -493,9 +494,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -510,13 +511,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -557,9 +558,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -574,13 +575,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -621,9 +622,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -638,14 +639,13 @@ impl super::stub::DataPolicyService for DataPolicyService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -686,9 +686,9 @@ impl super::stub::DataPolicyService for DataPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml b/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml
index 96ed64f679..e57f258d8f 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-location.workspace = true
 google-cloud-rpc.workspace      = true
 lazy_static.workspace           = true
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/builder.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/builder.rs
index 6514388b77..5b74058ac3 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/builder.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_transfer_service {
     /// A builder for [DataTransferService][crate::client::DataTransferService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_datatransfer_v1::*;
     /// # use builder::data_transfer_service::ClientBuilder;
     /// # use client::DataTransferService;
@@ -30,19 +30,18 @@ pub mod data_transfer_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataTransferService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataTransferService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_transfer_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataTransferService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_transfer_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::GetDataSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_data_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataSourceRequest::name].
@@ -127,8 +126,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -138,8 +137,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::ListDataSources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -170,7 +169,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -180,14 +179,16 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_data_sources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataSourcesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataSourcesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -195,15 +196,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataSourcesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataSourcesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -229,8 +232,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataSources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataSources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -240,7 +243,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::CreateTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -271,7 +274,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -281,7 +284,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .create_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTransferConfigRequest::parent].
@@ -335,8 +338,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -346,7 +349,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::UpdateTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -377,7 +380,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -387,7 +390,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .update_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [transfer_config][crate::model::UpdateTransferConfigRequest::transfer_config].
@@ -455,8 +458,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -466,7 +469,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::DeleteTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -497,7 +500,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -507,7 +510,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .delete_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTransferConfigRequest::name].
@@ -520,8 +523,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -531,7 +534,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::GetTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -562,7 +565,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -572,7 +575,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTransferConfigRequest::name].
@@ -585,8 +588,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -596,8 +599,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::ListTransferConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -631,7 +634,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -641,14 +644,16 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_transfer_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTransferConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTransferConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -656,17 +661,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTransferConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -703,8 +708,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTransferConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTransferConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -714,7 +719,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::ScheduleTransferRuns;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -745,7 +750,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -755,7 +760,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .schedule_transfer_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ScheduleTransferRunsRequest::parent].
@@ -812,8 +817,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ScheduleTransferRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ScheduleTransferRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -823,7 +828,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::StartManualTransferRuns;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -856,7 +861,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -866,7 +871,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .start_manual_transfer_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::StartManualTransferRunsRequest::parent].
@@ -921,8 +926,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartManualTransferRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartManualTransferRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -932,7 +937,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::GetTransferRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -960,7 +965,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -970,7 +975,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_transfer_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTransferRunRequest::name].
@@ -983,8 +988,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTransferRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTransferRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -994,7 +999,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::DeleteTransferRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1025,7 +1030,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1035,7 +1040,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .delete_transfer_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTransferRunRequest::name].
@@ -1048,8 +1053,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTransferRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTransferRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1059,8 +1064,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::ListTransferRuns;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1094,7 +1099,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1104,14 +1109,16 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_transfer_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTransferRunsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTransferRunsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1119,15 +1126,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTransferRunsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTransferRunsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1173,8 +1182,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTransferRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTransferRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1184,8 +1193,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::ListTransferLogs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1219,7 +1228,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1229,14 +1238,16 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_transfer_logs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTransferLogsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTransferLogsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1244,15 +1255,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTransferLogsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTransferLogsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1289,8 +1302,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTransferLogs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTransferLogs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1300,7 +1313,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::CheckValidCreds;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1328,7 +1341,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1338,7 +1351,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .check_valid_creds(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CheckValidCredsRequest::name].
@@ -1351,8 +1364,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CheckValidCreds {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CheckValidCreds {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1362,7 +1375,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::EnrollDataSources;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1393,7 +1406,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1403,7 +1416,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .enroll_data_sources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::EnrollDataSourcesRequest::name].
@@ -1427,8 +1440,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnrollDataSources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnrollDataSources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1438,7 +1451,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::UnenrollDataSources;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1469,7 +1482,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1479,7 +1492,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .unenroll_data_sources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UnenrollDataSourcesRequest::name].
@@ -1503,8 +1516,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UnenrollDataSources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UnenrollDataSources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1514,8 +1527,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1549,7 +1562,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1559,15 +1572,15 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1576,17 +1589,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1616,8 +1629,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1627,7 +1640,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_datatransfer_v1::builder::data_transfer_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_datatransfer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1658,7 +1671,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1668,7 +1681,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1679,8 +1692,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/client.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/client.rs
index d0e3334ed4..f06d30e75a 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/client.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_datatransfer_v1::client::DataTransferService;
 /// let client = DataTransferService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery Data Transfer API.
@@ -66,15 +66,13 @@ impl DataTransferService {
     /// Returns a builder for [DataTransferService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_datatransfer_v1::client::DataTransferService;
     /// let client = DataTransferService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_transfer_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_transfer_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_transfer_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl DataTransferService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataTransferService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataTransferService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl DataTransferService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataTransferService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataTransferService> {
         super::transport::DataTransferService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataTransferService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataTransferService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataTransferService::new)
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/lib.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/lib.rs
index 42294e49a3..00575d8a87 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/lib.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs
index 376b7f944a..e52ab1f33d 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
@@ -1364,7 +1364,7 @@ impl wkt::message::Message for ListDataSourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataSourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataSourcesResponse {
     type PageItem = crate::model::DataSource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2034,7 +2034,7 @@ impl wkt::message::Message for ListTransferConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTransferConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTransferConfigsResponse {
     type PageItem = crate::model::TransferConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2358,7 +2358,7 @@ impl wkt::message::Message for ListTransferRunsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTransferRunsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTransferRunsResponse {
     type PageItem = crate::model::TransferRun;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2530,7 +2530,7 @@ impl wkt::message::Message for ListTransferLogsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTransferLogsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTransferLogsResponse {
     type PageItem = crate::model::TransferMessage;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/stub.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/stub.rs
index 41cf144a6d..958470e135 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/stub.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_data_source(
         &self,
         _req: crate::model::GetDataSourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataSource>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataSource>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_data_sources(
         &self,
         _req: crate::model::ListDataSourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataSourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataSourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +63,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn create_transfer_config(
         &self,
         _req: crate::model::CreateTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransferConfig>>,
+        Output = crate::Result<crate::Response<crate::model::TransferConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn update_transfer_config(
         &self,
         _req: crate::model::UpdateTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransferConfig>>,
+        Output = crate::Result<crate::Response<crate::model::TransferConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,8 +85,8 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn delete_transfer_config(
         &self,
         _req: crate::model::DeleteTransferConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +94,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_transfer_config(
         &self,
         _req: crate::model::GetTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransferConfig>>,
+        Output = crate::Result<crate::Response<crate::model::TransferConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,9 +105,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_transfer_configs(
         &self,
         _req: crate::model::ListTransferConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTransferConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTransferConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,9 +116,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn schedule_transfer_runs(
         &self,
         _req: crate::model::ScheduleTransferRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ScheduleTransferRunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ScheduleTransferRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,11 +127,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn start_manual_transfer_runs(
         &self,
         _req: crate::model::StartManualTransferRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::StartManualTransferRunsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::StartManualTransferRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,10 +138,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_transfer_run(
         &self,
         _req: crate::model::GetTransferRunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransferRun>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TransferRun>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -152,8 +148,8 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn delete_transfer_run(
         &self,
         _req: crate::model::DeleteTransferRunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -161,9 +157,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_transfer_runs(
         &self,
         _req: crate::model::ListTransferRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTransferRunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTransferRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -172,9 +168,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_transfer_logs(
         &self,
         _req: crate::model::ListTransferLogsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTransferLogsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTransferLogsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -183,9 +179,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn check_valid_creds(
         &self,
         _req: crate::model::CheckValidCredsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CheckValidCredsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CheckValidCredsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -194,8 +190,8 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn enroll_data_sources(
         &self,
         _req: crate::model::EnrollDataSourcesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -203,8 +199,8 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn unenroll_data_sources(
         &self,
         _req: crate::model::UnenrollDataSourcesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -212,10 +208,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -225,9 +221,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/stub/dynamic.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/stub/dynamic.rs
index 8464c431e3..34ea4f61a0 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/stub/dynamic.rs
@@ -20,110 +20,110 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataSource>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataSource>>;
 
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataSourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataSourcesResponse>>;
 
     async fn create_transfer_config(
         &self,
         req: crate::model::CreateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferConfig>>;
 
     async fn update_transfer_config(
         &self,
         req: crate::model::UpdateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferConfig>>;
 
     async fn delete_transfer_config(
         &self,
         req: crate::model::DeleteTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_transfer_config(
         &self,
         req: crate::model::GetTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferConfig>>;
 
     async fn list_transfer_configs(
         &self,
         req: crate::model::ListTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransferConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransferConfigsResponse>>;
 
     async fn schedule_transfer_runs(
         &self,
         req: crate::model::ScheduleTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ScheduleTransferRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ScheduleTransferRunsResponse>>;
 
     async fn start_manual_transfer_runs(
         &self,
         req: crate::model::StartManualTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StartManualTransferRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StartManualTransferRunsResponse>>;
 
     async fn get_transfer_run(
         &self,
         req: crate::model::GetTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferRun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferRun>>;
 
     async fn delete_transfer_run(
         &self,
         req: crate::model::DeleteTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_transfer_runs(
         &self,
         req: crate::model::ListTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransferRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransferRunsResponse>>;
 
     async fn list_transfer_logs(
         &self,
         req: crate::model::ListTransferLogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransferLogsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransferLogsResponse>>;
 
     async fn check_valid_creds(
         &self,
         req: crate::model::CheckValidCredsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckValidCredsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckValidCredsResponse>>;
 
     async fn enroll_data_sources(
         &self,
         req: crate::model::EnrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn unenroll_data_sources(
         &self,
         req: crate::model::UnenrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 }
 
 /// All implementations of [super::DataTransferService] also implement [DataTransferService].
@@ -133,8 +133,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataSource>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataSource>> {
         T::get_data_source(self, req, options).await
     }
 
@@ -142,8 +142,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataSourcesResponse>> {
         T::list_data_sources(self, req, options).await
     }
 
@@ -151,8 +151,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn create_transfer_config(
         &self,
         req: crate::model::CreateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferConfig>> {
         T::create_transfer_config(self, req, options).await
     }
 
@@ -160,8 +160,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn update_transfer_config(
         &self,
         req: crate::model::UpdateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferConfig>> {
         T::update_transfer_config(self, req, options).await
     }
 
@@ -169,8 +169,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn delete_transfer_config(
         &self,
         req: crate::model::DeleteTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_transfer_config(self, req, options).await
     }
 
@@ -178,8 +178,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_transfer_config(
         &self,
         req: crate::model::GetTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferConfig>> {
         T::get_transfer_config(self, req, options).await
     }
 
@@ -187,8 +187,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_transfer_configs(
         &self,
         req: crate::model::ListTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransferConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransferConfigsResponse>> {
         T::list_transfer_configs(self, req, options).await
     }
 
@@ -196,8 +196,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn schedule_transfer_runs(
         &self,
         req: crate::model::ScheduleTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ScheduleTransferRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ScheduleTransferRunsResponse>> {
         T::schedule_transfer_runs(self, req, options).await
     }
 
@@ -205,8 +205,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn start_manual_transfer_runs(
         &self,
         req: crate::model::StartManualTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StartManualTransferRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StartManualTransferRunsResponse>> {
         T::start_manual_transfer_runs(self, req, options).await
     }
 
@@ -214,8 +214,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_transfer_run(
         &self,
         req: crate::model::GetTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransferRun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransferRun>> {
         T::get_transfer_run(self, req, options).await
     }
 
@@ -223,8 +223,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn delete_transfer_run(
         &self,
         req: crate::model::DeleteTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_transfer_run(self, req, options).await
     }
 
@@ -232,8 +232,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_transfer_runs(
         &self,
         req: crate::model::ListTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransferRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransferRunsResponse>> {
         T::list_transfer_runs(self, req, options).await
     }
 
@@ -241,8 +241,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_transfer_logs(
         &self,
         req: crate::model::ListTransferLogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransferLogsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransferLogsResponse>> {
         T::list_transfer_logs(self, req, options).await
     }
 
@@ -250,8 +250,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn check_valid_creds(
         &self,
         req: crate::model::CheckValidCredsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckValidCredsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckValidCredsResponse>> {
         T::check_valid_creds(self, req, options).await
     }
 
@@ -259,8 +259,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn enroll_data_sources(
         &self,
         req: crate::model::EnrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::enroll_data_sources(self, req, options).await
     }
 
@@ -268,8 +268,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn unenroll_data_sources(
         &self,
         req: crate::model::UnenrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::unenroll_data_sources(self, req, options).await
     }
 
@@ -277,9 +277,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -287,8 +286,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/tracing.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/tracing.rs
index d81639fa24..e408681c3f 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/tracing.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataSource>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataSource>> {
         self.inner.get_data_source(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataSourcesResponse>> {
         self.inner.list_data_sources(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_transfer_config(
         &self,
         req: crate::model::CreateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferConfig>> {
         self.inner.create_transfer_config(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_transfer_config(
         &self,
         req: crate::model::UpdateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferConfig>> {
         self.inner.update_transfer_config(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_transfer_config(
         &self,
         req: crate::model::DeleteTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_transfer_config(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_transfer_config(
         &self,
         req: crate::model::GetTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferConfig>> {
         self.inner.get_transfer_config(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_transfer_configs(
         &self,
         req: crate::model::ListTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransferConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransferConfigsResponse>> {
         self.inner.list_transfer_configs(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn schedule_transfer_runs(
         &self,
         req: crate::model::ScheduleTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ScheduleTransferRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ScheduleTransferRunsResponse>> {
         self.inner.schedule_transfer_runs(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn start_manual_transfer_runs(
         &self,
         req: crate::model::StartManualTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StartManualTransferRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StartManualTransferRunsResponse>> {
         self.inner.start_manual_transfer_runs(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_transfer_run(
         &self,
         req: crate::model::GetTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferRun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferRun>> {
         self.inner.get_transfer_run(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_transfer_run(
         &self,
         req: crate::model::DeleteTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_transfer_run(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn list_transfer_runs(
         &self,
         req: crate::model::ListTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransferRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransferRunsResponse>> {
         self.inner.list_transfer_runs(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn list_transfer_logs(
         &self,
         req: crate::model::ListTransferLogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransferLogsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransferLogsResponse>> {
         self.inner.list_transfer_logs(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn check_valid_creds(
         &self,
         req: crate::model::CheckValidCredsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckValidCredsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckValidCredsResponse>> {
         self.inner.check_valid_creds(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn enroll_data_sources(
         &self,
         req: crate::model::EnrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.enroll_data_sources(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn unenroll_data_sources(
         &self,
         req: crate::model::UnenrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.unenroll_data_sources(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs
index 3f493d0a57..80ee4a000b 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataTransferService](super::stub::DataTransferService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataTransferService {
 }
 
 impl DataTransferService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn get_data_source(
         &self,
         req: crate::model::GetDataSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataSource>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataSource>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -123,9 +123,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -140,13 +140,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn list_data_sources(
         &self,
         req: crate::model::ListDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataSourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataSourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -210,9 +210,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -227,13 +227,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn create_transfer_config(
         &self,
         req: crate::model::CreateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn update_transfer_config(
         &self,
         req: crate::model::UpdateTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -440,9 +440,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -457,13 +457,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn delete_transfer_config(
         &self,
         req: crate::model::DeleteTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -537,9 +537,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -548,24 +548,25 @@ impl super::stub::DataTransferService for DataTransferService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_transfer_config(
         &self,
         req: crate::model::GetTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -639,9 +640,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -656,13 +657,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn list_transfer_configs(
         &self,
         req: crate::model::ListTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransferConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransferConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -734,9 +735,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -751,13 +752,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn schedule_transfer_runs(
         &self,
         req: crate::model::ScheduleTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ScheduleTransferRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ScheduleTransferRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -831,9 +832,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -848,13 +849,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn start_manual_transfer_runs(
         &self,
         req: crate::model::StartManualTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StartManualTransferRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StartManualTransferRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -928,9 +929,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -945,13 +946,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn get_transfer_run(
         &self,
         req: crate::model::GetTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransferRun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransferRun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1033,9 +1034,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1050,13 +1051,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn delete_transfer_run(
         &self,
         req: crate::model::DeleteTransferRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1138,9 +1139,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1149,24 +1150,25 @@ impl super::stub::DataTransferService for DataTransferService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_transfer_runs(
         &self,
         req: crate::model::ListTransferRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransferRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransferRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1254,9 +1256,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1271,13 +1273,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn list_transfer_logs(
         &self,
         req: crate::model::ListTransferLogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransferLogsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransferLogsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1371,9 +1373,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1388,13 +1390,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn check_valid_creds(
         &self,
         req: crate::model::CheckValidCredsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckValidCredsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckValidCredsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1468,9 +1470,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1485,13 +1487,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn enroll_data_sources(
         &self,
         req: crate::model::EnrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1551,9 +1553,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1562,24 +1564,25 @@ impl super::stub::DataTransferService for DataTransferService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn unenroll_data_sources(
         &self,
         req: crate::model::UnenrollDataSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1616,9 +1619,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1627,24 +1630,25 @@ impl super::stub::DataTransferService for DataTransferService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1674,9 +1678,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1691,13 +1695,13 @@ impl super::stub::DataTransferService for DataTransferService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1734,9 +1738,9 @@ impl super::stub::DataTransferService for DataTransferService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/migration/v2/Cargo.toml b/src/generated/cloud/bigquery/migration/v2/Cargo.toml
index 696f17796c..86df750bea 100644
--- a/src/generated/cloud/bigquery/migration/v2/Cargo.toml
+++ b/src/generated/cloud/bigquery/migration/v2/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace      = true
 bytes.workspace            = true
-gax.workspace              = true
 gaxi                       = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace = true
+google-cloud-gax.workspace = true
 google-cloud-rpc.workspace = true
 lazy_static.workspace      = true
 serde.workspace            = true
diff --git a/src/generated/cloud/bigquery/migration/v2/src/builder.rs b/src/generated/cloud/bigquery/migration/v2/src/builder.rs
index dedd47fce0..92518660ae 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/builder.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod migration_service {
     /// A builder for [MigrationService][crate::client::MigrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_migration_v2::*;
     /// # use builder::migration_service::ClientBuilder;
     /// # use client::MigrationService;
@@ -30,19 +30,18 @@ pub mod migration_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MigrationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MigrationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod migration_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MigrationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod migration_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::CreateMigrationWorkflow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109,7 +108,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119,7 +118,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .create_migration_workflow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateMigrationWorkflowRequest::parent].
@@ -154,8 +153,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMigrationWorkflow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMigrationWorkflow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -165,7 +164,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::GetMigrationWorkflow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -196,7 +195,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -206,7 +205,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .get_migration_workflow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMigrationWorkflowRequest::name].
@@ -237,8 +236,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMigrationWorkflow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMigrationWorkflow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -248,8 +247,8 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::ListMigrationWorkflows;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -283,7 +282,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -293,15 +292,15 @@ pub mod migration_service {
             (*self.0.stub)
                 .list_migration_workflows(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListMigrationWorkflowsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -310,17 +309,17 @@ pub mod migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMigrationWorkflowsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -364,8 +363,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMigrationWorkflows {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMigrationWorkflows {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -375,7 +374,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::DeleteMigrationWorkflow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -408,7 +407,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -418,7 +417,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .delete_migration_workflow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteMigrationWorkflowRequest::name].
@@ -431,8 +430,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMigrationWorkflow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMigrationWorkflow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -442,7 +441,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::StartMigrationWorkflow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -473,7 +472,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -483,7 +482,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .start_migration_workflow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::StartMigrationWorkflowRequest::name].
@@ -496,8 +495,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartMigrationWorkflow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartMigrationWorkflow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -507,7 +506,7 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::GetMigrationSubtask;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -538,7 +537,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -548,7 +547,7 @@ pub mod migration_service {
             (*self.0.stub)
                 .get_migration_subtask(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMigrationSubtaskRequest::name].
@@ -579,8 +578,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMigrationSubtask {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMigrationSubtask {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -590,8 +589,8 @@ pub mod migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_migration_v2::builder::migration_service::ListMigrationSubtasks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_migration_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -625,7 +624,7 @@ pub mod migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -635,14 +634,16 @@ pub mod migration_service {
             (*self.0.stub)
                 .list_migration_subtasks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMigrationSubtasksResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMigrationSubtasksResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -650,17 +651,17 @@ pub mod migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMigrationSubtasksResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -710,8 +711,8 @@ pub mod migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMigrationSubtasks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMigrationSubtasks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/migration/v2/src/client.rs b/src/generated/cloud/bigquery/migration/v2/src/client.rs
index 4f7584cdb8..f8e9ebb4b4 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/client.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_migration_v2::client::MigrationService;
 /// let client = MigrationService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery Migration API.
@@ -66,15 +66,13 @@ impl MigrationService {
     /// Returns a builder for [MigrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_migration_v2::client::MigrationService;
     /// let client = MigrationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::migration_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::migration_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::migration_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl MigrationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MigrationService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MigrationService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl MigrationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MigrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MigrationService> {
         super::transport::MigrationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MigrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MigrationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MigrationService::new)
diff --git a/src/generated/cloud/bigquery/migration/v2/src/lib.rs b/src/generated/cloud/bigquery/migration/v2/src/lib.rs
index de8e3ce7fd..cc6aa815e7 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/lib.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/migration/v2/src/model.rs b/src/generated/cloud/bigquery/migration/v2/src/model.rs
index be1c8ff2b3..331a8c6bb1 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/model.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
 extern crate serde;
@@ -2682,7 +2682,7 @@ impl wkt::message::Message for ListMigrationWorkflowsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMigrationWorkflowsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMigrationWorkflowsResponse {
     type PageItem = crate::model::MigrationWorkflow;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3020,7 +3020,7 @@ impl wkt::message::Message for ListMigrationSubtasksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMigrationSubtasksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMigrationSubtasksResponse {
     type PageItem = crate::model::MigrationSubtask;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/migration/v2/src/stub.rs b/src/generated/cloud/bigquery/migration/v2/src/stub.rs
index 06b11c469d..f85cebdf70 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/stub.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/stub.rs
@@ -42,9 +42,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn create_migration_workflow(
         &self,
         _req: crate::model::CreateMigrationWorkflowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MigrationWorkflow>>,
+        Output = crate::Result<crate::Response<crate::model::MigrationWorkflow>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn get_migration_workflow(
         &self,
         _req: crate::model::GetMigrationWorkflowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MigrationWorkflow>>,
+        Output = crate::Result<crate::Response<crate::model::MigrationWorkflow>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,11 +64,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn list_migration_workflows(
         &self,
         _req: crate::model::ListMigrationWorkflowsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListMigrationWorkflowsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListMigrationWorkflowsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,8 +75,8 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn delete_migration_workflow(
         &self,
         _req: crate::model::DeleteMigrationWorkflowRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +84,8 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn start_migration_workflow(
         &self,
         _req: crate::model::StartMigrationWorkflowRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +93,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn get_migration_subtask(
         &self,
         _req: crate::model::GetMigrationSubtaskRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MigrationSubtask>>,
+        Output = crate::Result<crate::Response<crate::model::MigrationSubtask>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,11 +104,9 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     fn list_migration_subtasks(
         &self,
         _req: crate::model::ListMigrationSubtasksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListMigrationSubtasksResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListMigrationSubtasksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/bigquery/migration/v2/src/stub/dynamic.rs b/src/generated/cloud/bigquery/migration/v2/src/stub/dynamic.rs
index 2c7d07111f..c304921c8c 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/stub/dynamic.rs
@@ -20,44 +20,44 @@ pub trait MigrationService: std::fmt::Debug + Send + Sync {
     async fn create_migration_workflow(
         &self,
         req: crate::model::CreateMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationWorkflow>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationWorkflow>>;
 
     async fn get_migration_workflow(
         &self,
         req: crate::model::GetMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationWorkflow>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationWorkflow>>;
 
     async fn list_migration_workflows(
         &self,
         req: crate::model::ListMigrationWorkflowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMigrationWorkflowsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMigrationWorkflowsResponse>>;
 
     async fn delete_migration_workflow(
         &self,
         req: crate::model::DeleteMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn start_migration_workflow(
         &self,
         req: crate::model::StartMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_migration_subtask(
         &self,
         req: crate::model::GetMigrationSubtaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationSubtask>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationSubtask>>;
 
     async fn list_migration_subtasks(
         &self,
         req: crate::model::ListMigrationSubtasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMigrationSubtasksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMigrationSubtasksResponse>>;
 }
 
 /// All implementations of [super::MigrationService] also implement [MigrationService].
@@ -67,8 +67,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn create_migration_workflow(
         &self,
         req: crate::model::CreateMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationWorkflow>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationWorkflow>> {
         T::create_migration_workflow(self, req, options).await
     }
 
@@ -76,8 +76,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn get_migration_workflow(
         &self,
         req: crate::model::GetMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationWorkflow>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationWorkflow>> {
         T::get_migration_workflow(self, req, options).await
     }
 
@@ -85,8 +85,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn list_migration_workflows(
         &self,
         req: crate::model::ListMigrationWorkflowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMigrationWorkflowsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMigrationWorkflowsResponse>> {
         T::list_migration_workflows(self, req, options).await
     }
 
@@ -94,8 +94,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn delete_migration_workflow(
         &self,
         req: crate::model::DeleteMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_migration_workflow(self, req, options).await
     }
 
@@ -103,8 +103,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn start_migration_workflow(
         &self,
         req: crate::model::StartMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::start_migration_workflow(self, req, options).await
     }
 
@@ -112,8 +112,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn get_migration_subtask(
         &self,
         req: crate::model::GetMigrationSubtaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationSubtask>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationSubtask>> {
         T::get_migration_subtask(self, req, options).await
     }
 
@@ -121,8 +121,8 @@ impl<T: super::MigrationService> MigrationService for T {
     async fn list_migration_subtasks(
         &self,
         req: crate::model::ListMigrationSubtasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMigrationSubtasksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMigrationSubtasksResponse>> {
         T::list_migration_subtasks(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/migration/v2/src/tracing.rs b/src/generated/cloud/bigquery/migration/v2/src/tracing.rs
index 7cf6965231..e24d3d0cb3 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/tracing.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_migration_workflow(
         &self,
         req: crate::model::CreateMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationWorkflow>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationWorkflow>> {
         self.inner.create_migration_workflow(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_migration_workflow(
         &self,
         req: crate::model::GetMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationWorkflow>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationWorkflow>> {
         self.inner.get_migration_workflow(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_migration_workflows(
         &self,
         req: crate::model::ListMigrationWorkflowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMigrationWorkflowsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMigrationWorkflowsResponse>> {
         self.inner.list_migration_workflows(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_migration_workflow(
         &self,
         req: crate::model::DeleteMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_migration_workflow(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn start_migration_workflow(
         &self,
         req: crate::model::StartMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.start_migration_workflow(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_migration_subtask(
         &self,
         req: crate::model::GetMigrationSubtaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationSubtask>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationSubtask>> {
         self.inner.get_migration_subtask(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_migration_subtasks(
         &self,
         req: crate::model::ListMigrationSubtasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMigrationSubtasksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMigrationSubtasksResponse>> {
         self.inner.list_migration_subtasks(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/migration/v2/src/transport.rs b/src/generated/cloud/bigquery/migration/v2/src/transport.rs
index 2f0f11def9..f4d9dd5871 100644
--- a/src/generated/cloud/bigquery/migration/v2/src/transport.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [MigrationService](super::stub::MigrationService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for MigrationService {
 }
 
 impl MigrationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn create_migration_workflow(
         &self,
         req: crate::model::CreateMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationWorkflow>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationWorkflow>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -86,9 +86,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103,13 +103,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn get_migration_workflow(
         &self,
         req: crate::model::GetMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationWorkflow>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationWorkflow>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162,9 +162,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -179,13 +179,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn list_migration_workflows(
         &self,
         req: crate::model::ListMigrationWorkflowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMigrationWorkflowsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMigrationWorkflowsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -236,9 +236,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253,13 +253,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn delete_migration_workflow(
         &self,
         req: crate::model::DeleteMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -300,9 +300,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -311,24 +311,25 @@ impl super::stub::MigrationService for MigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn start_migration_workflow(
         &self,
         req: crate::model::StartMigrationWorkflowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -369,9 +370,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -380,24 +381,25 @@ impl super::stub::MigrationService for MigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_migration_subtask(
         &self,
         req: crate::model::GetMigrationSubtaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationSubtask>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationSubtask>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -454,9 +456,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -471,13 +473,13 @@ impl super::stub::MigrationService for MigrationService {
     async fn list_migration_subtasks(
         &self,
         req: crate::model::ListMigrationSubtasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMigrationSubtasksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMigrationSubtasksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -533,9 +535,9 @@ impl super::stub::MigrationService for MigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/reservation/v1/Cargo.toml b/src/generated/cloud/bigquery/reservation/v1/Cargo.toml
index e154dcb756..dcbc8376a1 100644
--- a/src/generated/cloud/bigquery/reservation/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/reservation/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-iam-v1.workspace = true
 google-cloud-rpc.workspace    = true
 lazy_static.workspace         = true
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/builder.rs b/src/generated/cloud/bigquery/reservation/v1/src/builder.rs
index 7cbf2a08e6..da37af8ae3 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/builder.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod reservation_service {
     /// A builder for [ReservationService][crate::client::ReservationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_reservation_v1::*;
     /// # use builder::reservation_service::ClientBuilder;
     /// # use client::ReservationService;
@@ -30,19 +30,18 @@ pub mod reservation_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReservationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReservationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod reservation_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReservationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod reservation_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::CreateReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .create_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateReservationRequest::parent].
@@ -154,8 +153,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -165,8 +164,8 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::ListReservations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -200,7 +199,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -210,14 +209,16 @@ pub mod reservation_service {
             (*self.0.stub)
                 .list_reservations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReservationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReservationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -225,15 +226,17 @@ pub mod reservation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListReservationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListReservationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -259,8 +262,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReservations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReservations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -270,7 +273,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::GetReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -298,7 +301,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -308,7 +311,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .get_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReservationRequest::name].
@@ -321,8 +324,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -332,7 +335,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::DeleteReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -363,7 +366,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -373,7 +376,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .delete_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteReservationRequest::name].
@@ -386,8 +389,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -397,7 +400,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::UpdateReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -428,7 +431,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -438,7 +441,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .update_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [reservation][crate::model::UpdateReservationRequest::reservation].
@@ -479,8 +482,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -490,7 +493,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::FailoverReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -521,7 +524,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -531,7 +534,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .failover_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FailoverReservationRequest::name].
@@ -550,8 +553,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FailoverReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FailoverReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -561,7 +564,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::CreateCapacityCommitment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -594,7 +597,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -604,7 +607,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .create_capacity_commitment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCapacityCommitmentRequest::parent].
@@ -647,8 +650,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCapacityCommitment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCapacityCommitment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -658,8 +661,8 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::ListCapacityCommitments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -695,7 +698,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -705,15 +708,15 @@ pub mod reservation_service {
             (*self.0.stub)
                 .list_capacity_commitments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListCapacityCommitmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -722,17 +725,17 @@ pub mod reservation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCapacityCommitmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -758,8 +761,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCapacityCommitments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCapacityCommitments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -769,7 +772,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::GetCapacityCommitment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -800,7 +803,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -810,7 +813,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .get_capacity_commitment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCapacityCommitmentRequest::name].
@@ -823,8 +826,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCapacityCommitment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCapacityCommitment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -834,7 +837,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::DeleteCapacityCommitment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -867,7 +870,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -877,7 +880,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .delete_capacity_commitment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteCapacityCommitmentRequest::name].
@@ -896,8 +899,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCapacityCommitment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCapacityCommitment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -907,7 +910,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::UpdateCapacityCommitment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -940,7 +943,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -950,7 +953,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .update_capacity_commitment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [capacity_commitment][crate::model::UpdateCapacityCommitmentRequest::capacity_commitment].
@@ -991,8 +994,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCapacityCommitment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCapacityCommitment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1002,7 +1005,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::SplitCapacityCommitment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1035,7 +1038,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1045,7 +1048,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .split_capacity_commitment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::SplitCapacityCommitmentRequest::name].
@@ -1064,8 +1067,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SplitCapacityCommitment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SplitCapacityCommitment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1075,7 +1078,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::MergeCapacityCommitments;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1108,7 +1111,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1118,7 +1121,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .merge_capacity_commitments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::MergeCapacityCommitmentsRequest::parent].
@@ -1146,8 +1149,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MergeCapacityCommitments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MergeCapacityCommitments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1157,7 +1160,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::CreateAssignment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1188,7 +1191,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1198,7 +1201,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .create_assignment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAssignmentRequest::parent].
@@ -1235,8 +1238,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAssignment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAssignment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1246,8 +1249,8 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::ListAssignments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1278,7 +1281,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1288,14 +1291,16 @@ pub mod reservation_service {
             (*self.0.stub)
                 .list_assignments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAssignmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAssignmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1303,15 +1308,17 @@ pub mod reservation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAssignmentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAssignmentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1337,8 +1344,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssignments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssignments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1348,7 +1355,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::DeleteAssignment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1379,7 +1386,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1389,7 +1396,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .delete_assignment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAssignmentRequest::name].
@@ -1402,8 +1409,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAssignment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAssignment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1413,8 +1420,8 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::SearchAssignments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1448,7 +1455,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1458,14 +1465,16 @@ pub mod reservation_service {
             (*self.0.stub)
                 .search_assignments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchAssignmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchAssignmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1473,15 +1482,17 @@ pub mod reservation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchAssignmentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchAssignmentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1513,8 +1524,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchAssignments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchAssignments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1524,8 +1535,8 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::SearchAllAssignments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1559,7 +1570,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1569,14 +1580,16 @@ pub mod reservation_service {
             (*self.0.stub)
                 .search_all_assignments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchAllAssignmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchAllAssignmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1584,17 +1597,17 @@ pub mod reservation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchAllAssignmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1626,8 +1639,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchAllAssignments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchAllAssignments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1637,7 +1650,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::MoveAssignment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1665,7 +1678,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1675,7 +1688,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .move_assignment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::MoveAssignmentRequest::name].
@@ -1700,8 +1713,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveAssignment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveAssignment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1711,7 +1724,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::UpdateAssignment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1742,7 +1755,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1752,7 +1765,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .update_assignment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [assignment][crate::model::UpdateAssignmentRequest::assignment].
@@ -1793,8 +1806,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAssignment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAssignment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1804,7 +1817,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::GetBiReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1835,7 +1848,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1845,7 +1858,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .get_bi_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBiReservationRequest::name].
@@ -1858,8 +1871,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBiReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBiReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1869,7 +1882,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::UpdateBiReservation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1900,7 +1913,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1910,7 +1923,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .update_bi_reservation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [bi_reservation][crate::model::UpdateBiReservationRequest::bi_reservation].
@@ -1951,8 +1964,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBiReservation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBiReservation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1962,7 +1975,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1993,7 +2006,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2003,7 +2016,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -2034,8 +2047,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2045,7 +2058,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2076,7 +2089,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2086,7 +2099,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2139,8 +2152,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2150,7 +2163,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2183,7 +2196,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2193,7 +2206,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2219,8 +2232,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2230,7 +2243,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::CreateReservationGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2261,7 +2274,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2271,7 +2284,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .create_reservation_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateReservationGroupRequest::parent].
@@ -2314,8 +2327,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReservationGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReservationGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2325,7 +2338,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::GetReservationGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2356,7 +2369,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2366,7 +2379,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .get_reservation_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReservationGroupRequest::name].
@@ -2379,8 +2392,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReservationGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReservationGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2390,7 +2403,7 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::DeleteReservationGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2421,7 +2434,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2431,7 +2444,7 @@ pub mod reservation_service {
             (*self.0.stub)
                 .delete_reservation_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteReservationGroupRequest::name].
@@ -2444,8 +2457,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReservationGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReservationGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2455,8 +2468,8 @@ pub mod reservation_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_reservation_v1::builder::reservation_service::ListReservationGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_reservation_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2490,7 +2503,7 @@ pub mod reservation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2500,14 +2513,16 @@ pub mod reservation_service {
             (*self.0.stub)
                 .list_reservation_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReservationGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReservationGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2515,17 +2530,17 @@ pub mod reservation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListReservationGroupsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2551,8 +2566,8 @@ pub mod reservation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReservationGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReservationGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/client.rs b/src/generated/cloud/bigquery/reservation/v1/src/client.rs
index b4caffad09..3350b46dd0 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/client.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_reservation_v1::client::ReservationService;
 /// let client = ReservationService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery Reservation API.
@@ -80,15 +80,13 @@ impl ReservationService {
     /// Returns a builder for [ReservationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_reservation_v1::client::ReservationService;
     /// let client = ReservationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reservation_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::reservation_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::reservation_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -106,14 +104,14 @@ impl ReservationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ReservationService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ReservationService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -123,13 +121,13 @@ impl ReservationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationService> {
         super::transport::ReservationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReservationService::new)
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/lib.rs b/src/generated/cloud/bigquery/reservation/v1/src/lib.rs
index 3d06d212b1..750779b053 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/lib.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/model.rs b/src/generated/cloud/bigquery/reservation/v1/src/model.rs
index b4b6f69d5b..307f137e81 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
@@ -2015,7 +2015,7 @@ impl wkt::message::Message for ListReservationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReservationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReservationsResponse {
     type PageItem = crate::model::Reservation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2519,7 +2519,7 @@ impl wkt::message::Message for ListReservationGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReservationGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReservationGroupsResponse {
     type PageItem = crate::model::ReservationGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2817,7 +2817,7 @@ impl wkt::message::Message for ListCapacityCommitmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCapacityCommitmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCapacityCommitmentsResponse {
     type PageItem = crate::model::CapacityCommitment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3967,7 +3967,7 @@ impl wkt::message::Message for ListAssignmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAssignmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAssignmentsResponse {
     type PageItem = crate::model::Assignment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4268,7 +4268,7 @@ impl wkt::message::Message for SearchAssignmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchAssignmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchAssignmentsResponse {
     type PageItem = crate::model::Assignment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4345,7 +4345,7 @@ impl wkt::message::Message for SearchAllAssignmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchAllAssignmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchAllAssignmentsResponse {
     type PageItem = crate::model::Assignment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/stub.rs b/src/generated/cloud/bigquery/reservation/v1/src/stub.rs
index 1c23fa9541..968a074f47 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/stub.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn create_reservation(
         &self,
         _req: crate::model::CreateReservationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Reservation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Reservation>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn list_reservations(
         &self,
         _req: crate::model::ListReservationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReservationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReservationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +63,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn get_reservation(
         &self,
         _req: crate::model::GetReservationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Reservation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Reservation>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,8 +73,8 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn delete_reservation(
         &self,
         _req: crate::model::DeleteReservationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -84,10 +82,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn update_reservation(
         &self,
         _req: crate::model::UpdateReservationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Reservation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Reservation>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,10 +92,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn failover_reservation(
         &self,
         _req: crate::model::FailoverReservationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Reservation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Reservation>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,9 +102,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn create_capacity_commitment(
         &self,
         _req: crate::model::CreateCapacityCommitmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CapacityCommitment>>,
+        Output = crate::Result<crate::Response<crate::model::CapacityCommitment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,11 +113,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn list_capacity_commitments(
         &self,
         _req: crate::model::ListCapacityCommitmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListCapacityCommitmentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListCapacityCommitmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +124,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn get_capacity_commitment(
         &self,
         _req: crate::model::GetCapacityCommitmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CapacityCommitment>>,
+        Output = crate::Result<crate::Response<crate::model::CapacityCommitment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,8 +135,8 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn delete_capacity_commitment(
         &self,
         _req: crate::model::DeleteCapacityCommitmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -150,9 +144,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn update_capacity_commitment(
         &self,
         _req: crate::model::UpdateCapacityCommitmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CapacityCommitment>>,
+        Output = crate::Result<crate::Response<crate::model::CapacityCommitment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -161,11 +155,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn split_capacity_commitment(
         &self,
         _req: crate::model::SplitCapacityCommitmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SplitCapacityCommitmentResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SplitCapacityCommitmentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +166,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn merge_capacity_commitments(
         &self,
         _req: crate::model::MergeCapacityCommitmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CapacityCommitment>>,
+        Output = crate::Result<crate::Response<crate::model::CapacityCommitment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,10 +177,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn create_assignment(
         &self,
         _req: crate::model::CreateAssignmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Assignment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Assignment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -196,9 +187,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn list_assignments(
         &self,
         _req: crate::model::ListAssignmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAssignmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAssignmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,8 +198,8 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn delete_assignment(
         &self,
         _req: crate::model::DeleteAssignmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -216,9 +207,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn search_assignments(
         &self,
         _req: crate::model::SearchAssignmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchAssignmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchAssignmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -227,9 +218,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn search_all_assignments(
         &self,
         _req: crate::model::SearchAllAssignmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchAllAssignmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchAllAssignmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -238,10 +229,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn move_assignment(
         &self,
         _req: crate::model::MoveAssignmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Assignment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Assignment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -249,10 +239,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn update_assignment(
         &self,
         _req: crate::model::UpdateAssignmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Assignment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Assignment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -260,9 +249,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn get_bi_reservation(
         &self,
         _req: crate::model::GetBiReservationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BiReservation>>,
+        Output = crate::Result<crate::Response<crate::model::BiReservation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -271,9 +260,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn update_bi_reservation(
         &self,
         _req: crate::model::UpdateBiReservationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BiReservation>>,
+        Output = crate::Result<crate::Response<crate::model::BiReservation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -282,9 +271,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -293,9 +282,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -304,10 +293,10 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -317,9 +306,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn create_reservation_group(
         &self,
         _req: crate::model::CreateReservationGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationGroup>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -328,9 +317,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn get_reservation_group(
         &self,
         _req: crate::model::GetReservationGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationGroup>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -339,8 +328,8 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn delete_reservation_group(
         &self,
         _req: crate::model::DeleteReservationGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -348,11 +337,9 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     fn list_reservation_groups(
         &self,
         _req: crate::model::ListReservationGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListReservationGroupsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListReservationGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/stub/dynamic.rs b/src/generated/cloud/bigquery/reservation/v1/src/stub/dynamic.rs
index 4868b63ca0..7f5f36532e 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/stub/dynamic.rs
@@ -20,178 +20,176 @@ pub trait ReservationService: std::fmt::Debug + Send + Sync {
     async fn create_reservation(
         &self,
         req: crate::model::CreateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>>;
 
     async fn list_reservations(
         &self,
         req: crate::model::ListReservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReservationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReservationsResponse>>;
 
     async fn get_reservation(
         &self,
         req: crate::model::GetReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>>;
 
     async fn delete_reservation(
         &self,
         req: crate::model::DeleteReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_reservation(
         &self,
         req: crate::model::UpdateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>>;
 
     async fn failover_reservation(
         &self,
         req: crate::model::FailoverReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>>;
 
     async fn create_capacity_commitment(
         &self,
         req: crate::model::CreateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>>;
 
     async fn list_capacity_commitments(
         &self,
         req: crate::model::ListCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCapacityCommitmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCapacityCommitmentsResponse>>;
 
     async fn get_capacity_commitment(
         &self,
         req: crate::model::GetCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>>;
 
     async fn delete_capacity_commitment(
         &self,
         req: crate::model::DeleteCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_capacity_commitment(
         &self,
         req: crate::model::UpdateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>>;
 
     async fn split_capacity_commitment(
         &self,
         req: crate::model::SplitCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SplitCapacityCommitmentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SplitCapacityCommitmentResponse>>;
 
     async fn merge_capacity_commitments(
         &self,
         req: crate::model::MergeCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>>;
 
     async fn create_assignment(
         &self,
         req: crate::model::CreateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Assignment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Assignment>>;
 
     async fn list_assignments(
         &self,
         req: crate::model::ListAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssignmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssignmentsResponse>>;
 
     async fn delete_assignment(
         &self,
         req: crate::model::DeleteAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn search_assignments(
         &self,
         req: crate::model::SearchAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAssignmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAssignmentsResponse>>;
 
     async fn search_all_assignments(
         &self,
         req: crate::model::SearchAllAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAllAssignmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAllAssignmentsResponse>>;
 
     async fn move_assignment(
         &self,
         req: crate::model::MoveAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Assignment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Assignment>>;
 
     async fn update_assignment(
         &self,
         req: crate::model::UpdateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Assignment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Assignment>>;
 
     async fn get_bi_reservation(
         &self,
         req: crate::model::GetBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BiReservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BiReservation>>;
 
     async fn update_bi_reservation(
         &self,
         req: crate::model::UpdateBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BiReservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BiReservation>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn create_reservation_group(
         &self,
         req: crate::model::CreateReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationGroup>>;
 
     async fn get_reservation_group(
         &self,
         req: crate::model::GetReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationGroup>>;
 
     async fn delete_reservation_group(
         &self,
         req: crate::model::DeleteReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_reservation_groups(
         &self,
         req: crate::model::ListReservationGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReservationGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReservationGroupsResponse>>;
 }
 
 /// All implementations of [super::ReservationService] also implement [ReservationService].
@@ -201,8 +199,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn create_reservation(
         &self,
         req: crate::model::CreateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>> {
         T::create_reservation(self, req, options).await
     }
 
@@ -210,8 +208,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn list_reservations(
         &self,
         req: crate::model::ListReservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReservationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReservationsResponse>> {
         T::list_reservations(self, req, options).await
     }
 
@@ -219,8 +217,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn get_reservation(
         &self,
         req: crate::model::GetReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>> {
         T::get_reservation(self, req, options).await
     }
 
@@ -228,8 +226,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn delete_reservation(
         &self,
         req: crate::model::DeleteReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_reservation(self, req, options).await
     }
 
@@ -237,8 +235,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn update_reservation(
         &self,
         req: crate::model::UpdateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>> {
         T::update_reservation(self, req, options).await
     }
 
@@ -246,8 +244,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn failover_reservation(
         &self,
         req: crate::model::FailoverReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>> {
         T::failover_reservation(self, req, options).await
     }
 
@@ -255,8 +253,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn create_capacity_commitment(
         &self,
         req: crate::model::CreateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>> {
         T::create_capacity_commitment(self, req, options).await
     }
 
@@ -264,8 +262,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn list_capacity_commitments(
         &self,
         req: crate::model::ListCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCapacityCommitmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCapacityCommitmentsResponse>> {
         T::list_capacity_commitments(self, req, options).await
     }
 
@@ -273,8 +271,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn get_capacity_commitment(
         &self,
         req: crate::model::GetCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>> {
         T::get_capacity_commitment(self, req, options).await
     }
 
@@ -282,8 +280,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn delete_capacity_commitment(
         &self,
         req: crate::model::DeleteCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_capacity_commitment(self, req, options).await
     }
 
@@ -291,8 +289,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn update_capacity_commitment(
         &self,
         req: crate::model::UpdateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>> {
         T::update_capacity_commitment(self, req, options).await
     }
 
@@ -300,8 +298,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn split_capacity_commitment(
         &self,
         req: crate::model::SplitCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SplitCapacityCommitmentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SplitCapacityCommitmentResponse>> {
         T::split_capacity_commitment(self, req, options).await
     }
 
@@ -309,8 +307,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn merge_capacity_commitments(
         &self,
         req: crate::model::MergeCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CapacityCommitment>> {
         T::merge_capacity_commitments(self, req, options).await
     }
 
@@ -318,8 +316,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn create_assignment(
         &self,
         req: crate::model::CreateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Assignment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Assignment>> {
         T::create_assignment(self, req, options).await
     }
 
@@ -327,8 +325,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn list_assignments(
         &self,
         req: crate::model::ListAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssignmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssignmentsResponse>> {
         T::list_assignments(self, req, options).await
     }
 
@@ -336,8 +334,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn delete_assignment(
         &self,
         req: crate::model::DeleteAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_assignment(self, req, options).await
     }
 
@@ -345,8 +343,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn search_assignments(
         &self,
         req: crate::model::SearchAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAssignmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAssignmentsResponse>> {
         T::search_assignments(self, req, options).await
     }
 
@@ -354,8 +352,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn search_all_assignments(
         &self,
         req: crate::model::SearchAllAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAllAssignmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAllAssignmentsResponse>> {
         T::search_all_assignments(self, req, options).await
     }
 
@@ -363,8 +361,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn move_assignment(
         &self,
         req: crate::model::MoveAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Assignment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Assignment>> {
         T::move_assignment(self, req, options).await
     }
 
@@ -372,8 +370,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn update_assignment(
         &self,
         req: crate::model::UpdateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Assignment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Assignment>> {
         T::update_assignment(self, req, options).await
     }
 
@@ -381,8 +379,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn get_bi_reservation(
         &self,
         req: crate::model::GetBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BiReservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BiReservation>> {
         T::get_bi_reservation(self, req, options).await
     }
 
@@ -390,8 +388,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn update_bi_reservation(
         &self,
         req: crate::model::UpdateBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BiReservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BiReservation>> {
         T::update_bi_reservation(self, req, options).await
     }
 
@@ -399,8 +397,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -408,8 +406,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -417,10 +415,9 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -428,8 +425,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn create_reservation_group(
         &self,
         req: crate::model::CreateReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationGroup>> {
         T::create_reservation_group(self, req, options).await
     }
 
@@ -437,8 +434,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn get_reservation_group(
         &self,
         req: crate::model::GetReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationGroup>> {
         T::get_reservation_group(self, req, options).await
     }
 
@@ -446,8 +443,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn delete_reservation_group(
         &self,
         req: crate::model::DeleteReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_reservation_group(self, req, options).await
     }
 
@@ -455,8 +452,8 @@ impl<T: super::ReservationService> ReservationService for T {
     async fn list_reservation_groups(
         &self,
         req: crate::model::ListReservationGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReservationGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReservationGroupsResponse>> {
         T::list_reservation_groups(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/tracing.rs b/src/generated/cloud/bigquery/reservation/v1/src/tracing.rs
index e49ad34de6..6a6d5d62c4 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/tracing.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_reservation(
         &self,
         req: crate::model::CreateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         self.inner.create_reservation(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_reservations(
         &self,
         req: crate::model::ListReservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReservationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReservationsResponse>> {
         self.inner.list_reservations(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_reservation(
         &self,
         req: crate::model::GetReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         self.inner.get_reservation(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_reservation(
         &self,
         req: crate::model::DeleteReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_reservation(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_reservation(
         &self,
         req: crate::model::UpdateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         self.inner.update_reservation(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn failover_reservation(
         &self,
         req: crate::model::FailoverReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         self.inner.failover_reservation(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn create_capacity_commitment(
         &self,
         req: crate::model::CreateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         self.inner.create_capacity_commitment(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_capacity_commitments(
         &self,
         req: crate::model::ListCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCapacityCommitmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCapacityCommitmentsResponse>> {
         self.inner.list_capacity_commitments(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_capacity_commitment(
         &self,
         req: crate::model::GetCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         self.inner.get_capacity_commitment(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_capacity_commitment(
         &self,
         req: crate::model::DeleteCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_capacity_commitment(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn update_capacity_commitment(
         &self,
         req: crate::model::UpdateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         self.inner.update_capacity_commitment(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn split_capacity_commitment(
         &self,
         req: crate::model::SplitCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SplitCapacityCommitmentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SplitCapacityCommitmentResponse>> {
         self.inner.split_capacity_commitment(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn merge_capacity_commitments(
         &self,
         req: crate::model::MergeCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         self.inner.merge_capacity_commitments(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn create_assignment(
         &self,
         req: crate::model::CreateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Assignment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Assignment>> {
         self.inner.create_assignment(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn list_assignments(
         &self,
         req: crate::model::ListAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssignmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssignmentsResponse>> {
         self.inner.list_assignments(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn delete_assignment(
         &self,
         req: crate::model::DeleteAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_assignment(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn search_assignments(
         &self,
         req: crate::model::SearchAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAssignmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAssignmentsResponse>> {
         self.inner.search_assignments(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn search_all_assignments(
         &self,
         req: crate::model::SearchAllAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAllAssignmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAllAssignmentsResponse>> {
         self.inner.search_all_assignments(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn move_assignment(
         &self,
         req: crate::model::MoveAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Assignment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Assignment>> {
         self.inner.move_assignment(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn update_assignment(
         &self,
         req: crate::model::UpdateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Assignment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Assignment>> {
         self.inner.update_assignment(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn get_bi_reservation(
         &self,
         req: crate::model::GetBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BiReservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BiReservation>> {
         self.inner.get_bi_reservation(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn update_bi_reservation(
         &self,
         req: crate::model::UpdateBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BiReservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BiReservation>> {
         self.inner.update_bi_reservation(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -257,9 +257,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -267,8 +266,8 @@ where
     async fn create_reservation_group(
         &self,
         req: crate::model::CreateReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationGroup>> {
         self.inner.create_reservation_group(req, options).await
     }
 
@@ -276,8 +275,8 @@ where
     async fn get_reservation_group(
         &self,
         req: crate::model::GetReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationGroup>> {
         self.inner.get_reservation_group(req, options).await
     }
 
@@ -285,8 +284,8 @@ where
     async fn delete_reservation_group(
         &self,
         req: crate::model::DeleteReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_reservation_group(req, options).await
     }
 
@@ -294,8 +293,8 @@ where
     async fn list_reservation_groups(
         &self,
         req: crate::model::ListReservationGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReservationGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReservationGroupsResponse>> {
         self.inner.list_reservation_groups(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/transport.rs b/src/generated/cloud/bigquery/reservation/v1/src/transport.rs
index 7e63cdafaf..d750caf102 100644
--- a/src/generated/cloud/bigquery/reservation/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ReservationService](super::stub::ReservationService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ReservationService {
 }
 
 impl ReservationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn create_reservation(
         &self,
         req: crate::model::CreateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn list_reservations(
         &self,
         req: crate::model::ListReservationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReservationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReservationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -149,9 +149,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -166,13 +166,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn get_reservation(
         &self,
         req: crate::model::GetReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -213,9 +213,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -230,13 +230,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn delete_reservation(
         &self,
         req: crate::model::DeleteReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -277,9 +277,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -288,24 +288,25 @@ impl super::stub::ReservationService for ReservationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_reservation(
         &self,
         req: crate::model::UpdateReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +365,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +382,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn failover_reservation(
         &self,
         req: crate::model::FailoverReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +429,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +446,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn create_capacity_commitment(
         &self,
         req: crate::model::CreateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -494,9 +495,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -511,13 +512,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn list_capacity_commitments(
         &self,
         req: crate::model::ListCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCapacityCommitmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCapacityCommitmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -556,9 +557,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -573,13 +574,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn get_capacity_commitment(
         &self,
         req: crate::model::GetCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -620,9 +621,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -637,13 +638,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn delete_capacity_commitment(
         &self,
         req: crate::model::DeleteCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -685,9 +686,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -696,24 +697,25 @@ impl super::stub::ReservationService for ReservationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_capacity_commitment(
         &self,
         req: crate::model::UpdateCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -772,9 +774,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -789,13 +791,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn split_capacity_commitment(
         &self,
         req: crate::model::SplitCapacityCommitmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SplitCapacityCommitmentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SplitCapacityCommitmentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -836,9 +838,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -853,13 +855,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn merge_capacity_commitments(
         &self,
         req: crate::model::MergeCapacityCommitmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CapacityCommitment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CapacityCommitment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -896,9 +898,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -913,13 +915,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn create_assignment(
         &self,
         req: crate::model::CreateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Assignment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Assignment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -961,9 +963,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -978,13 +980,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn list_assignments(
         &self,
         req: crate::model::ListAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssignmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssignmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1027,9 +1029,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1044,13 +1046,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn delete_assignment(
         &self,
         req: crate::model::DeleteAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1095,9 +1097,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1106,24 +1108,25 @@ impl super::stub::ReservationService for ReservationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn search_assignments(
         &self,
         req: crate::model::SearchAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAssignmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAssignmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1163,9 +1166,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1180,13 +1183,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn search_all_assignments(
         &self,
         req: crate::model::SearchAllAssignmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAllAssignmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAllAssignmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1226,9 +1229,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1243,13 +1246,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn move_assignment(
         &self,
         req: crate::model::MoveAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Assignment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Assignment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1294,9 +1297,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1311,13 +1314,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn update_assignment(
         &self,
         req: crate::model::UpdateAssignmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Assignment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Assignment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1380,9 +1383,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1397,13 +1400,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn get_bi_reservation(
         &self,
         req: crate::model::GetBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BiReservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BiReservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1442,9 +1445,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1459,13 +1462,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn update_bi_reservation(
         &self,
         req: crate::model::UpdateBiReservationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BiReservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BiReservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1522,9 +1525,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1539,13 +1542,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1651,9 +1654,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1668,13 +1671,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1756,9 +1759,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1773,14 +1776,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1862,9 +1864,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1879,13 +1881,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn create_reservation_group(
         &self,
         req: crate::model::CreateReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1923,9 +1925,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1940,13 +1942,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn get_reservation_group(
         &self,
         req: crate::model::GetReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1987,9 +1989,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2004,13 +2006,13 @@ impl super::stub::ReservationService for ReservationService {
     async fn delete_reservation_group(
         &self,
         req: crate::model::DeleteReservationGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2051,9 +2053,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2062,24 +2064,25 @@ impl super::stub::ReservationService for ReservationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_reservation_groups(
         &self,
         req: crate::model::ListReservationGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReservationGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReservationGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2118,9 +2121,9 @@ impl super::stub::ReservationService for ReservationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/bigquery/v2/Cargo.toml b/src/generated/cloud/bigquery/v2/Cargo.toml
index 135a0361d1..2684680b2e 100644
--- a/src/generated/cloud/bigquery/v2/Cargo.toml
+++ b/src/generated/cloud/bigquery/v2/Cargo.toml
@@ -41,8 +41,8 @@ all-features = true
 [dependencies]
 async-trait.workspace       = true
 bytes.workspace             = true
-gax.workspace               = true
 gaxi                        = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace  = true
 google-cloud-type.workspace = true
 lazy_static.workspace       = true
 serde.workspace             = true
diff --git a/src/generated/cloud/bigquery/v2/src/builder.rs b/src/generated/cloud/bigquery/v2/src/builder.rs
index fc1f21e8a7..2d4e16c2dd 100644
--- a/src/generated/cloud/bigquery/v2/src/builder.rs
+++ b/src/generated/cloud/bigquery/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod dataset_service {
     /// A builder for [DatasetService][crate::client::DatasetService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::dataset_service::ClientBuilder;
     /// # use client::DatasetService;
@@ -30,19 +30,18 @@ pub mod dataset_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DatasetService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DatasetService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod dataset_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DatasetService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod dataset_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::GetDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .get_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetDatasetRequest::project_id].
@@ -150,8 +149,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -161,7 +160,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::InsertDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -189,7 +188,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -199,7 +198,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .insert_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::InsertDatasetRequest::project_id].
@@ -240,8 +239,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InsertDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InsertDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -251,7 +250,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::PatchDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -282,7 +281,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -292,7 +291,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .patch_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateOrPatchDatasetRequest::project_id].
@@ -352,8 +351,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -363,7 +362,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::UpdateDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -394,7 +393,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -404,7 +403,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .update_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateOrPatchDatasetRequest::project_id].
@@ -464,8 +463,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -475,7 +474,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::DeleteDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -503,7 +502,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -513,7 +512,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .delete_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteDatasetRequest::project_id].
@@ -540,8 +539,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -551,8 +550,8 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::ListDatasets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -583,7 +582,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -593,13 +592,14 @@ pub mod dataset_service {
             (*self.0.stub)
                 .list_datasets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DatasetList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::DatasetList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -607,15 +607,15 @@ pub mod dataset_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DatasetList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::DatasetList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -665,8 +665,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDatasets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDatasets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -676,7 +676,7 @@ pub mod dataset_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::dataset_service::UndeleteDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -704,7 +704,7 @@ pub mod dataset_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -714,7 +714,7 @@ pub mod dataset_service {
             (*self.0.stub)
                 .undelete_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UndeleteDatasetRequest::project_id].
@@ -753,8 +753,8 @@ pub mod dataset_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeleteDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeleteDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -766,7 +766,7 @@ pub mod job_service {
     /// A builder for [JobService][crate::client::JobService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::job_service::ClientBuilder;
     /// # use client::JobService;
@@ -776,19 +776,18 @@ pub mod job_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::JobService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = JobService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -799,7 +798,7 @@ pub mod job_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::JobService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -812,7 +811,7 @@ pub mod job_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -822,7 +821,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::CancelJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -850,7 +849,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -860,7 +859,7 @@ pub mod job_service {
             (*self.0.stub)
                 .cancel_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::CancelJobRequest::project_id].
@@ -887,8 +886,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -898,7 +897,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::GetJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -926,7 +925,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -936,7 +935,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetJobRequest::project_id].
@@ -963,8 +962,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -974,7 +973,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::InsertJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1002,7 +1001,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1012,7 +1011,7 @@ pub mod job_service {
             (*self.0.stub)
                 .insert_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::InsertJobRequest::project_id].
@@ -1041,8 +1040,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InsertJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InsertJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1052,7 +1051,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::DeleteJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1080,7 +1079,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1090,7 +1089,7 @@ pub mod job_service {
             (*self.0.stub)
                 .delete_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteJobRequest::project_id].
@@ -1117,8 +1116,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1128,8 +1127,8 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::ListJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1160,7 +1159,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1170,13 +1169,14 @@ pub mod job_service {
             (*self.0.stub)
                 .list_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::JobList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::JobList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1184,14 +1184,15 @@ pub mod job_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::JobList, gax::error::Error> {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::JobList, crate::Error>
+        {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1283,8 +1284,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1294,7 +1295,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::GetQueryResults;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1322,7 +1323,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1332,7 +1333,7 @@ pub mod job_service {
             (*self.0.stub)
                 .get_query_results(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetQueryResultsRequest::project_id].
@@ -1437,8 +1438,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQueryResults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQueryResults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1448,7 +1449,7 @@ pub mod job_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::job_service::Query;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1476,7 +1477,7 @@ pub mod job_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1486,7 +1487,7 @@ pub mod job_service {
             (*self.0.stub)
                 .query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::PostQueryRequest::project_id].
@@ -1517,8 +1518,8 @@ pub mod job_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Query {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Query {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1530,7 +1531,7 @@ pub mod model_service {
     /// A builder for [ModelService][crate::client::ModelService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::model_service::ClientBuilder;
     /// # use client::ModelService;
@@ -1540,19 +1541,18 @@ pub mod model_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ModelService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ModelService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1563,7 +1563,7 @@ pub mod model_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ModelService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1576,7 +1576,7 @@ pub mod model_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1586,7 +1586,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::model_service::GetModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1614,7 +1614,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1624,7 +1624,7 @@ pub mod model_service {
             (*self.0.stub)
                 .get_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetModelRequest::project_id].
@@ -1653,8 +1653,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1664,8 +1664,8 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::model_service::ListModels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1696,7 +1696,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1706,13 +1706,13 @@ pub mod model_service {
             (*self.0.stub)
                 .list_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListModelsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListModelsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1721,15 +1721,17 @@ pub mod model_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListModelsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListModelsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1775,8 +1777,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1786,7 +1788,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::model_service::PatchModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1814,7 +1816,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1824,7 +1826,7 @@ pub mod model_service {
             (*self.0.stub)
                 .patch_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::PatchModelRequest::project_id].
@@ -1875,8 +1877,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1886,7 +1888,7 @@ pub mod model_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::model_service::DeleteModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1914,7 +1916,7 @@ pub mod model_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1924,7 +1926,7 @@ pub mod model_service {
             (*self.0.stub)
                 .delete_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteModelRequest::project_id].
@@ -1953,8 +1955,8 @@ pub mod model_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1966,7 +1968,7 @@ pub mod project_service {
     /// A builder for [ProjectService][crate::client::ProjectService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::project_service::ClientBuilder;
     /// # use client::ProjectService;
@@ -1976,19 +1978,18 @@ pub mod project_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ProjectService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ProjectService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1999,7 +2000,7 @@ pub mod project_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ProjectService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2012,7 +2013,7 @@ pub mod project_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2022,7 +2023,7 @@ pub mod project_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::project_service::GetServiceAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2053,7 +2054,7 @@ pub mod project_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2063,7 +2064,7 @@ pub mod project_service {
             (*self.0.stub)
                 .get_service_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetServiceAccountRequest::project_id].
@@ -2076,8 +2077,8 @@ pub mod project_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2089,7 +2090,7 @@ pub mod routine_service {
     /// A builder for [RoutineService][crate::client::RoutineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::routine_service::ClientBuilder;
     /// # use client::RoutineService;
@@ -2099,19 +2100,18 @@ pub mod routine_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RoutineService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RoutineService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2122,7 +2122,7 @@ pub mod routine_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RoutineService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2135,7 +2135,7 @@ pub mod routine_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2145,7 +2145,7 @@ pub mod routine_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::routine_service::GetRoutine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2173,7 +2173,7 @@ pub mod routine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2183,7 +2183,7 @@ pub mod routine_service {
             (*self.0.stub)
                 .get_routine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetRoutineRequest::project_id].
@@ -2212,8 +2212,8 @@ pub mod routine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRoutine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRoutine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2223,7 +2223,7 @@ pub mod routine_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::routine_service::InsertRoutine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2251,7 +2251,7 @@ pub mod routine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2261,7 +2261,7 @@ pub mod routine_service {
             (*self.0.stub)
                 .insert_routine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::InsertRoutineRequest::project_id].
@@ -2304,8 +2304,8 @@ pub mod routine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InsertRoutine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InsertRoutine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2315,7 +2315,7 @@ pub mod routine_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::routine_service::UpdateRoutine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2343,7 +2343,7 @@ pub mod routine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2353,7 +2353,7 @@ pub mod routine_service {
             (*self.0.stub)
                 .update_routine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateRoutineRequest::project_id].
@@ -2404,8 +2404,8 @@ pub mod routine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRoutine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRoutine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2415,7 +2415,7 @@ pub mod routine_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::routine_service::DeleteRoutine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2443,7 +2443,7 @@ pub mod routine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2453,7 +2453,7 @@ pub mod routine_service {
             (*self.0.stub)
                 .delete_routine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteRoutineRequest::project_id].
@@ -2482,8 +2482,8 @@ pub mod routine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRoutine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRoutine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2493,8 +2493,8 @@ pub mod routine_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::routine_service::ListRoutines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2525,7 +2525,7 @@ pub mod routine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2535,13 +2535,13 @@ pub mod routine_service {
             (*self.0.stub)
                 .list_routines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRoutinesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRoutinesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2550,15 +2550,17 @@ pub mod routine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRoutinesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRoutinesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2610,8 +2612,8 @@ pub mod routine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRoutines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRoutines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2623,7 +2625,7 @@ pub mod row_access_policy_service {
     /// A builder for [RowAccessPolicyService][crate::client::RowAccessPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::row_access_policy_service::ClientBuilder;
     /// # use client::RowAccessPolicyService;
@@ -2633,19 +2635,18 @@ pub mod row_access_policy_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RowAccessPolicyService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RowAccessPolicyService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2656,7 +2657,7 @@ pub mod row_access_policy_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RowAccessPolicyService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2669,7 +2670,7 @@ pub mod row_access_policy_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2679,8 +2680,8 @@ pub mod row_access_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::row_access_policy_service::ListRowAccessPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2714,7 +2715,7 @@ pub mod row_access_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2724,14 +2725,16 @@ pub mod row_access_policy_service {
             (*self.0.stub)
                 .list_row_access_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRowAccessPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRowAccessPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2739,17 +2742,17 @@ pub mod row_access_policy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRowAccessPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2791,8 +2794,8 @@ pub mod row_access_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRowAccessPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRowAccessPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2802,7 +2805,7 @@ pub mod row_access_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::row_access_policy_service::GetRowAccessPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2833,7 +2836,7 @@ pub mod row_access_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2843,7 +2846,7 @@ pub mod row_access_policy_service {
             (*self.0.stub)
                 .get_row_access_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetRowAccessPolicyRequest::project_id].
@@ -2880,8 +2883,8 @@ pub mod row_access_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRowAccessPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRowAccessPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2891,7 +2894,7 @@ pub mod row_access_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::row_access_policy_service::CreateRowAccessPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2922,7 +2925,7 @@ pub mod row_access_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2932,7 +2935,7 @@ pub mod row_access_policy_service {
             (*self.0.stub)
                 .create_row_access_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::CreateRowAccessPolicyRequest::project_id].
@@ -2983,8 +2986,8 @@ pub mod row_access_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRowAccessPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRowAccessPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2994,7 +2997,7 @@ pub mod row_access_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::row_access_policy_service::UpdateRowAccessPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3025,7 +3028,7 @@ pub mod row_access_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3035,7 +3038,7 @@ pub mod row_access_policy_service {
             (*self.0.stub)
                 .update_row_access_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateRowAccessPolicyRequest::project_id].
@@ -3094,8 +3097,8 @@ pub mod row_access_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRowAccessPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRowAccessPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3105,7 +3108,7 @@ pub mod row_access_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::row_access_policy_service::DeleteRowAccessPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3136,7 +3139,7 @@ pub mod row_access_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3146,7 +3149,7 @@ pub mod row_access_policy_service {
             (*self.0.stub)
                 .delete_row_access_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteRowAccessPolicyRequest::project_id].
@@ -3201,8 +3204,8 @@ pub mod row_access_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRowAccessPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRowAccessPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3212,7 +3215,7 @@ pub mod row_access_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::row_access_policy_service::BatchDeleteRowAccessPolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3245,7 +3248,7 @@ pub mod row_access_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3255,7 +3258,7 @@ pub mod row_access_policy_service {
             (*self.0.stub)
                 .batch_delete_row_access_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::BatchDeleteRowAccessPoliciesRequest::project_id].
@@ -3315,8 +3318,8 @@ pub mod row_access_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeleteRowAccessPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeleteRowAccessPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3328,7 +3331,7 @@ pub mod table_service {
     /// A builder for [TableService][crate::client::TableService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::*;
     /// # use builder::table_service::ClientBuilder;
     /// # use client::TableService;
@@ -3338,19 +3341,18 @@ pub mod table_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TableService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TableService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3361,7 +3363,7 @@ pub mod table_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TableService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3374,7 +3376,7 @@ pub mod table_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3384,7 +3386,7 @@ pub mod table_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::table_service::GetTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3412,7 +3414,7 @@ pub mod table_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3422,7 +3424,7 @@ pub mod table_service {
             (*self.0.stub)
                 .get_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetTableRequest::project_id].
@@ -3466,8 +3468,8 @@ pub mod table_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3477,7 +3479,7 @@ pub mod table_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::table_service::InsertTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3505,7 +3507,7 @@ pub mod table_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3515,7 +3517,7 @@ pub mod table_service {
             (*self.0.stub)
                 .insert_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::InsertTableRequest::project_id].
@@ -3558,8 +3560,8 @@ pub mod table_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InsertTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InsertTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3569,7 +3571,7 @@ pub mod table_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::table_service::PatchTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3600,7 +3602,7 @@ pub mod table_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3610,7 +3612,7 @@ pub mod table_service {
             (*self.0.stub)
                 .patch_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateOrPatchTableRequest::project_id].
@@ -3667,8 +3669,8 @@ pub mod table_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3678,7 +3680,7 @@ pub mod table_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::table_service::UpdateTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3709,7 +3711,7 @@ pub mod table_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3719,7 +3721,7 @@ pub mod table_service {
             (*self.0.stub)
                 .update_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateOrPatchTableRequest::project_id].
@@ -3776,8 +3778,8 @@ pub mod table_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3787,7 +3789,7 @@ pub mod table_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::table_service::DeleteTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3815,7 +3817,7 @@ pub mod table_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3825,7 +3827,7 @@ pub mod table_service {
             (*self.0.stub)
                 .delete_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteTableRequest::project_id].
@@ -3854,8 +3856,8 @@ pub mod table_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3865,8 +3867,8 @@ pub mod table_service {
     /// # Example
     /// ```
     /// # use google_cloud_bigquery_v2::builder::table_service::ListTables;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_bigquery_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3897,7 +3899,7 @@ pub mod table_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3907,13 +3909,14 @@ pub mod table_service {
             (*self.0.stub)
                 .list_tables(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TableList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TableList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3921,15 +3924,15 @@ pub mod table_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TableList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::TableList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3975,8 +3978,8 @@ pub mod table_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTables {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTables {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/bigquery/v2/src/client.rs b/src/generated/cloud/bigquery/v2/src/client.rs
index 1ad14ec63b..6b8c24fd35 100644
--- a/src/generated/cloud/bigquery/v2/src/client.rs
+++ b/src/generated/cloud/bigquery/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::DatasetService;
 /// let client = DatasetService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -66,13 +66,13 @@ impl DatasetService {
     /// Returns a builder for [DatasetService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::DatasetService;
     /// let client = DatasetService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dataset_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::dataset_service::client::Factory)
+        crate::new_client_builder(super::builder::dataset_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl DatasetService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DatasetService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DatasetService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl DatasetService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DatasetService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DatasetService> {
         super::transport::DatasetService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DatasetService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DatasetService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DatasetService::new)
@@ -169,7 +169,7 @@ impl DatasetService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::JobService;
 /// let client = JobService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -214,13 +214,13 @@ impl JobService {
     /// Returns a builder for [JobService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::JobService;
     /// let client = JobService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::job_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::job_service::client::Factory)
+        crate::new_client_builder(super::builder::job_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -238,14 +238,14 @@ impl JobService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::JobService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::JobService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -254,13 +254,13 @@ impl JobService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::JobService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::JobService> {
         super::transport::JobService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::JobService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::JobService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::JobService::new)
@@ -326,7 +326,7 @@ impl JobService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::ModelService;
 /// let client = ModelService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -372,13 +372,13 @@ impl ModelService {
     /// Returns a builder for [ModelService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::ModelService;
     /// let client = ModelService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::model_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::model_service::client::Factory)
+        crate::new_client_builder(super::builder::model_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -396,14 +396,14 @@ impl ModelService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ModelService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ModelService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -412,13 +412,13 @@ impl ModelService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelService> {
         super::transport::ModelService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ModelService::new)
@@ -451,7 +451,7 @@ impl ModelService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::ProjectService;
 /// let client = ProjectService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -497,13 +497,13 @@ impl ProjectService {
     /// Returns a builder for [ProjectService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::ProjectService;
     /// let client = ProjectService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::project_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::project_service::client::Factory)
+        crate::new_client_builder(super::builder::project_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -521,14 +521,14 @@ impl ProjectService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ProjectService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ProjectService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -537,13 +537,13 @@ impl ProjectService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ProjectService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ProjectService> {
         super::transport::ProjectService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ProjectService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ProjectService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ProjectService::new)
@@ -560,7 +560,7 @@ impl ProjectService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::RoutineService;
 /// let client = RoutineService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -606,13 +606,13 @@ impl RoutineService {
     /// Returns a builder for [RoutineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::RoutineService;
     /// let client = RoutineService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::routine_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::routine_service::client::Factory)
+        crate::new_client_builder(super::builder::routine_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -630,14 +630,14 @@ impl RoutineService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RoutineService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RoutineService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -646,13 +646,13 @@ impl RoutineService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RoutineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RoutineService> {
         super::transport::RoutineService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RoutineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RoutineService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RoutineService::new)
@@ -690,7 +690,7 @@ impl RoutineService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::RowAccessPolicyService;
 /// let client = RowAccessPolicyService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -736,15 +736,13 @@ impl RowAccessPolicyService {
     /// Returns a builder for [RowAccessPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::RowAccessPolicyService;
     /// let client = RowAccessPolicyService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::row_access_policy_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::row_access_policy_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::row_access_policy_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -762,14 +760,14 @@ impl RowAccessPolicyService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RowAccessPolicyService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RowAccessPolicyService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -779,13 +777,13 @@ impl RowAccessPolicyService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RowAccessPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RowAccessPolicyService> {
         super::transport::RowAccessPolicyService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RowAccessPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RowAccessPolicyService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RowAccessPolicyService::new)
@@ -840,7 +838,7 @@ impl RowAccessPolicyService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_bigquery_v2::client::TableService;
 /// let client = TableService::builder().build().await?;
 /// // use `client` to make requests to the BigQuery API.
@@ -887,13 +885,13 @@ impl TableService {
     /// Returns a builder for [TableService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_bigquery_v2::client::TableService;
     /// let client = TableService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::table_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::table_service::client::Factory)
+        crate::new_client_builder(super::builder::table_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -911,14 +909,14 @@ impl TableService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TableService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TableService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -927,13 +925,13 @@ impl TableService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TableService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TableService> {
         super::transport::TableService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TableService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TableService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TableService::new)
diff --git a/src/generated/cloud/bigquery/v2/src/lib.rs b/src/generated/cloud/bigquery/v2/src/lib.rs
index 2e8d0ef92d..fbd130d926 100644
--- a/src/generated/cloud/bigquery/v2/src/lib.rs
+++ b/src/generated/cloud/bigquery/v2/src/lib.rs
@@ -52,8 +52,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -88,3 +88,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/bigquery/v2/src/model.rs b/src/generated/cloud/bigquery/v2/src/model.rs
index 2e6a3b51f8..b831e6147f 100644
--- a/src/generated/cloud/bigquery/v2/src/model.rs
+++ b/src/generated/cloud/bigquery/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_type;
 extern crate lazy_static;
 extern crate serde;
@@ -3715,7 +3715,7 @@ impl wkt::message::Message for DatasetList {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DatasetList {
+impl google_cloud_gax::paginator::internal::PageableResponse for DatasetList {
     type PageItem = crate::model::ListFormatDataset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8651,7 +8651,7 @@ impl wkt::message::Message for JobList {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for JobList {
+impl google_cloud_gax::paginator::internal::PageableResponse for JobList {
     type PageItem = crate::model::ListFormatJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -40058,7 +40058,7 @@ impl wkt::message::Message for ListModelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListModelsResponse {
     type PageItem = crate::model::Model;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -44823,7 +44823,7 @@ impl wkt::message::Message for ListRoutinesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRoutinesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRoutinesResponse {
     type PageItem = crate::model::Routine;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -45058,7 +45058,7 @@ impl wkt::message::Message for ListRowAccessPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRowAccessPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRowAccessPoliciesResponse {
     type PageItem = crate::model::RowAccessPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -50616,7 +50616,7 @@ impl wkt::message::Message for TableList {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TableList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TableList {
     type PageItem = crate::model::ListFormatTable;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/bigquery/v2/src/stub.rs b/src/generated/cloud/bigquery/v2/src/stub.rs
index 58c11504fc..d61bd81c70 100644
--- a/src/generated/cloud/bigquery/v2/src/stub.rs
+++ b/src/generated/cloud/bigquery/v2/src/stub.rs
@@ -42,10 +42,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn get_dataset(
         &self,
         _req: crate::model::GetDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn insert_dataset(
         &self,
         _req: crate::model::InsertDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +62,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn patch_dataset(
         &self,
         _req: crate::model::UpdateOrPatchDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +72,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn update_dataset(
         &self,
         _req: crate::model::UpdateOrPatchDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +82,8 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn delete_dataset(
         &self,
         _req: crate::model::DeleteDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,10 +91,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn list_datasets(
         &self,
         _req: crate::model::ListDatasetsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DatasetList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DatasetList>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,10 +101,9 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     fn undelete_dataset(
         &self,
         _req: crate::model::UndeleteDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -130,9 +124,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn cancel_job(
         &self,
         _req: crate::model::CancelJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::JobCancelResponse>>,
+        Output = crate::Result<crate::Response<crate::model::JobCancelResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +135,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_job(
         &self,
         _req: crate::model::GetJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -151,9 +145,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn insert_job(
         &self,
         _req: crate::model::InsertJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -161,8 +155,8 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn delete_job(
         &self,
         _req: crate::model::DeleteJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -170,10 +164,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn list_jobs(
         &self,
         _req: crate::model::ListJobsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::JobList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::JobList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -181,9 +174,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn get_query_results(
         &self,
         _req: crate::model::GetQueryResultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GetQueryResultsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GetQueryResultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -192,9 +185,9 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     fn query(
         &self,
         _req: crate::model::PostQueryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::QueryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -216,10 +209,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn get_model(
         &self,
         _req: crate::model::GetModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Model>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Model>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -227,9 +219,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn list_models(
         &self,
         _req: crate::model::ListModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -238,10 +230,9 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn patch_model(
         &self,
         _req: crate::model::PatchModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Model>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Model>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -249,8 +240,8 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     fn delete_model(
         &self,
         _req: crate::model::DeleteModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -271,9 +262,9 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     fn get_service_account(
         &self,
         _req: crate::model::GetServiceAccountRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GetServiceAccountResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GetServiceAccountResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -295,10 +286,9 @@ pub trait RoutineService: std::fmt::Debug + Send + Sync {
     fn get_routine(
         &self,
         _req: crate::model::GetRoutineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Routine>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Routine>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -306,10 +296,9 @@ pub trait RoutineService: std::fmt::Debug + Send + Sync {
     fn insert_routine(
         &self,
         _req: crate::model::InsertRoutineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Routine>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Routine>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -317,10 +306,9 @@ pub trait RoutineService: std::fmt::Debug + Send + Sync {
     fn update_routine(
         &self,
         _req: crate::model::UpdateRoutineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Routine>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Routine>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -328,8 +316,8 @@ pub trait RoutineService: std::fmt::Debug + Send + Sync {
     fn delete_routine(
         &self,
         _req: crate::model::DeleteRoutineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -337,9 +325,9 @@ pub trait RoutineService: std::fmt::Debug + Send + Sync {
     fn list_routines(
         &self,
         _req: crate::model::ListRoutinesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRoutinesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRoutinesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -361,11 +349,9 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     fn list_row_access_policies(
         &self,
         _req: crate::model::ListRowAccessPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListRowAccessPoliciesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListRowAccessPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -374,9 +360,9 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     fn get_row_access_policy(
         &self,
         _req: crate::model::GetRowAccessPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RowAccessPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::RowAccessPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,9 +371,9 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     fn create_row_access_policy(
         &self,
         _req: crate::model::CreateRowAccessPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RowAccessPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::RowAccessPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -396,9 +382,9 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     fn update_row_access_policy(
         &self,
         _req: crate::model::UpdateRowAccessPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RowAccessPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::RowAccessPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -407,8 +393,8 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     fn delete_row_access_policy(
         &self,
         _req: crate::model::DeleteRowAccessPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -416,8 +402,8 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     fn batch_delete_row_access_policies(
         &self,
         _req: crate::model::BatchDeleteRowAccessPoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -438,10 +424,9 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     fn get_table(
         &self,
         _req: crate::model::GetTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -449,10 +434,9 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     fn insert_table(
         &self,
         _req: crate::model::InsertTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -460,10 +444,9 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     fn patch_table(
         &self,
         _req: crate::model::UpdateOrPatchTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -471,10 +454,9 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     fn update_table(
         &self,
         _req: crate::model::UpdateOrPatchTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Table>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Table>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -482,8 +464,8 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     fn delete_table(
         &self,
         _req: crate::model::DeleteTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -491,10 +473,9 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     fn list_tables(
         &self,
         _req: crate::model::ListTablesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TableList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TableList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/bigquery/v2/src/stub/dynamic.rs b/src/generated/cloud/bigquery/v2/src/stub/dynamic.rs
index 85d6d7bcc5..8815d14bea 100644
--- a/src/generated/cloud/bigquery/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/bigquery/v2/src/stub/dynamic.rs
@@ -20,44 +20,44 @@ pub trait DatasetService: std::fmt::Debug + Send + Sync {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn insert_dataset(
         &self,
         req: crate::model::InsertDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn patch_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn update_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DatasetList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DatasetList>>;
 
     async fn undelete_dataset(
         &self,
         req: crate::model::UndeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 }
 
 /// All implementations of [super::DatasetService] also implement [DatasetService].
@@ -67,8 +67,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::get_dataset(self, req, options).await
     }
 
@@ -76,8 +76,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn insert_dataset(
         &self,
         req: crate::model::InsertDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::insert_dataset(self, req, options).await
     }
 
@@ -85,8 +85,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn patch_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::patch_dataset(self, req, options).await
     }
 
@@ -94,8 +94,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn update_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::update_dataset(self, req, options).await
     }
 
@@ -103,8 +103,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_dataset(self, req, options).await
     }
 
@@ -112,8 +112,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DatasetList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DatasetList>> {
         T::list_datasets(self, req, options).await
     }
 
@@ -121,8 +121,8 @@ impl<T: super::DatasetService> DatasetService for T {
     async fn undelete_dataset(
         &self,
         req: crate::model::UndeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::undelete_dataset(self, req, options).await
     }
 }
@@ -133,44 +133,44 @@ pub trait JobService: std::fmt::Debug + Send + Sync {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::JobCancelResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::JobCancelResponse>>;
 
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn insert_job(
         &self,
         req: crate::model::InsertJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::JobList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::JobList>>;
 
     async fn get_query_results(
         &self,
         req: crate::model::GetQueryResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetQueryResultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetQueryResultsResponse>>;
 
     async fn query(
         &self,
         req: crate::model::PostQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryResponse>>;
 }
 
 /// All implementations of [super::JobService] also implement [JobService].
@@ -180,8 +180,8 @@ impl<T: super::JobService> JobService for T {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::JobCancelResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::JobCancelResponse>> {
         T::cancel_job(self, req, options).await
     }
 
@@ -189,8 +189,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::get_job(self, req, options).await
     }
 
@@ -198,8 +198,8 @@ impl<T: super::JobService> JobService for T {
     async fn insert_job(
         &self,
         req: crate::model::InsertJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::insert_job(self, req, options).await
     }
 
@@ -207,8 +207,8 @@ impl<T: super::JobService> JobService for T {
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_job(self, req, options).await
     }
 
@@ -216,8 +216,8 @@ impl<T: super::JobService> JobService for T {
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::JobList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::JobList>> {
         T::list_jobs(self, req, options).await
     }
 
@@ -225,8 +225,8 @@ impl<T: super::JobService> JobService for T {
     async fn get_query_results(
         &self,
         req: crate::model::GetQueryResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetQueryResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetQueryResultsResponse>> {
         T::get_query_results(self, req, options).await
     }
 
@@ -234,8 +234,8 @@ impl<T: super::JobService> JobService for T {
     async fn query(
         &self,
         req: crate::model::PostQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryResponse>> {
         T::query(self, req, options).await
     }
 }
@@ -246,26 +246,26 @@ pub trait ModelService: std::fmt::Debug + Send + Sync {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>>;
 
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelsResponse>>;
 
     async fn patch_model(
         &self,
         req: crate::model::PatchModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>>;
 
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ModelService] also implement [ModelService].
@@ -275,8 +275,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>> {
         T::get_model(self, req, options).await
     }
 
@@ -284,8 +284,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelsResponse>> {
         T::list_models(self, req, options).await
     }
 
@@ -293,8 +293,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn patch_model(
         &self,
         req: crate::model::PatchModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>> {
         T::patch_model(self, req, options).await
     }
 
@@ -302,8 +302,8 @@ impl<T: super::ModelService> ModelService for T {
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_model(self, req, options).await
     }
 }
@@ -314,8 +314,8 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     async fn get_service_account(
         &self,
         req: crate::model::GetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetServiceAccountResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetServiceAccountResponse>>;
 }
 
 /// All implementations of [super::ProjectService] also implement [ProjectService].
@@ -325,8 +325,8 @@ impl<T: super::ProjectService> ProjectService for T {
     async fn get_service_account(
         &self,
         req: crate::model::GetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetServiceAccountResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetServiceAccountResponse>> {
         T::get_service_account(self, req, options).await
     }
 }
@@ -337,32 +337,32 @@ pub trait RoutineService: std::fmt::Debug + Send + Sync {
     async fn get_routine(
         &self,
         req: crate::model::GetRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Routine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Routine>>;
 
     async fn insert_routine(
         &self,
         req: crate::model::InsertRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Routine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Routine>>;
 
     async fn update_routine(
         &self,
         req: crate::model::UpdateRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Routine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Routine>>;
 
     async fn delete_routine(
         &self,
         req: crate::model::DeleteRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_routines(
         &self,
         req: crate::model::ListRoutinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutinesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutinesResponse>>;
 }
 
 /// All implementations of [super::RoutineService] also implement [RoutineService].
@@ -372,8 +372,8 @@ impl<T: super::RoutineService> RoutineService for T {
     async fn get_routine(
         &self,
         req: crate::model::GetRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Routine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Routine>> {
         T::get_routine(self, req, options).await
     }
 
@@ -381,8 +381,8 @@ impl<T: super::RoutineService> RoutineService for T {
     async fn insert_routine(
         &self,
         req: crate::model::InsertRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Routine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Routine>> {
         T::insert_routine(self, req, options).await
     }
 
@@ -390,8 +390,8 @@ impl<T: super::RoutineService> RoutineService for T {
     async fn update_routine(
         &self,
         req: crate::model::UpdateRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Routine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Routine>> {
         T::update_routine(self, req, options).await
     }
 
@@ -399,8 +399,8 @@ impl<T: super::RoutineService> RoutineService for T {
     async fn delete_routine(
         &self,
         req: crate::model::DeleteRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_routine(self, req, options).await
     }
 
@@ -408,8 +408,8 @@ impl<T: super::RoutineService> RoutineService for T {
     async fn list_routines(
         &self,
         req: crate::model::ListRoutinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutinesResponse>> {
         T::list_routines(self, req, options).await
     }
 }
@@ -420,38 +420,38 @@ pub trait RowAccessPolicyService: std::fmt::Debug + Send + Sync {
     async fn list_row_access_policies(
         &self,
         req: crate::model::ListRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRowAccessPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRowAccessPoliciesResponse>>;
 
     async fn get_row_access_policy(
         &self,
         req: crate::model::GetRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RowAccessPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RowAccessPolicy>>;
 
     async fn create_row_access_policy(
         &self,
         req: crate::model::CreateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RowAccessPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RowAccessPolicy>>;
 
     async fn update_row_access_policy(
         &self,
         req: crate::model::UpdateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RowAccessPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RowAccessPolicy>>;
 
     async fn delete_row_access_policy(
         &self,
         req: crate::model::DeleteRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn batch_delete_row_access_policies(
         &self,
         req: crate::model::BatchDeleteRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::RowAccessPolicyService] also implement [RowAccessPolicyService].
@@ -461,8 +461,8 @@ impl<T: super::RowAccessPolicyService> RowAccessPolicyService for T {
     async fn list_row_access_policies(
         &self,
         req: crate::model::ListRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRowAccessPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRowAccessPoliciesResponse>> {
         T::list_row_access_policies(self, req, options).await
     }
 
@@ -470,8 +470,8 @@ impl<T: super::RowAccessPolicyService> RowAccessPolicyService for T {
     async fn get_row_access_policy(
         &self,
         req: crate::model::GetRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RowAccessPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RowAccessPolicy>> {
         T::get_row_access_policy(self, req, options).await
     }
 
@@ -479,8 +479,8 @@ impl<T: super::RowAccessPolicyService> RowAccessPolicyService for T {
     async fn create_row_access_policy(
         &self,
         req: crate::model::CreateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RowAccessPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RowAccessPolicy>> {
         T::create_row_access_policy(self, req, options).await
     }
 
@@ -488,8 +488,8 @@ impl<T: super::RowAccessPolicyService> RowAccessPolicyService for T {
     async fn update_row_access_policy(
         &self,
         req: crate::model::UpdateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RowAccessPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RowAccessPolicy>> {
         T::update_row_access_policy(self, req, options).await
     }
 
@@ -497,8 +497,8 @@ impl<T: super::RowAccessPolicyService> RowAccessPolicyService for T {
     async fn delete_row_access_policy(
         &self,
         req: crate::model::DeleteRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_row_access_policy(self, req, options).await
     }
 
@@ -506,8 +506,8 @@ impl<T: super::RowAccessPolicyService> RowAccessPolicyService for T {
     async fn batch_delete_row_access_policies(
         &self,
         req: crate::model::BatchDeleteRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::batch_delete_row_access_policies(self, req, options).await
     }
 }
@@ -518,38 +518,38 @@ pub trait TableService: std::fmt::Debug + Send + Sync {
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn insert_table(
         &self,
         req: crate::model::InsertTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn patch_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn update_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>>;
 
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TableList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TableList>>;
 }
 
 /// All implementations of [super::TableService] also implement [TableService].
@@ -559,8 +559,8 @@ impl<T: super::TableService> TableService for T {
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::get_table(self, req, options).await
     }
 
@@ -568,8 +568,8 @@ impl<T: super::TableService> TableService for T {
     async fn insert_table(
         &self,
         req: crate::model::InsertTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::insert_table(self, req, options).await
     }
 
@@ -577,8 +577,8 @@ impl<T: super::TableService> TableService for T {
     async fn patch_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::patch_table(self, req, options).await
     }
 
@@ -586,8 +586,8 @@ impl<T: super::TableService> TableService for T {
     async fn update_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Table>> {
         T::update_table(self, req, options).await
     }
 
@@ -595,8 +595,8 @@ impl<T: super::TableService> TableService for T {
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_table(self, req, options).await
     }
 
@@ -604,8 +604,8 @@ impl<T: super::TableService> TableService for T {
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TableList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TableList>> {
         T::list_tables(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/v2/src/tracing.rs b/src/generated/cloud/bigquery/v2/src/tracing.rs
index 937ed9ed53..ac6c0f0042 100644
--- a/src/generated/cloud/bigquery/v2/src/tracing.rs
+++ b/src/generated/cloud/bigquery/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.get_dataset(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn insert_dataset(
         &self,
         req: crate::model::InsertDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.insert_dataset(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn patch_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.patch_dataset(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.update_dataset(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_dataset(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DatasetList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DatasetList>> {
         self.inner.list_datasets(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn undelete_dataset(
         &self,
         req: crate::model::UndeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.undelete_dataset(req, options).await
     }
 }
@@ -127,8 +127,8 @@ where
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::JobCancelResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::JobCancelResponse>> {
         self.inner.cancel_job(req, options).await
     }
 
@@ -136,8 +136,8 @@ where
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.get_job(req, options).await
     }
 
@@ -145,8 +145,8 @@ where
     async fn insert_job(
         &self,
         req: crate::model::InsertJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.insert_job(req, options).await
     }
 
@@ -154,8 +154,8 @@ where
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_job(req, options).await
     }
 
@@ -163,8 +163,8 @@ where
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::JobList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::JobList>> {
         self.inner.list_jobs(req, options).await
     }
 
@@ -172,8 +172,8 @@ where
     async fn get_query_results(
         &self,
         req: crate::model::GetQueryResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetQueryResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetQueryResultsResponse>> {
         self.inner.get_query_results(req, options).await
     }
 
@@ -181,8 +181,8 @@ where
     async fn query(
         &self,
         req: crate::model::PostQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryResponse>> {
         self.inner.query(req, options).await
     }
 }
@@ -213,8 +213,8 @@ where
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         self.inner.get_model(req, options).await
     }
 
@@ -222,8 +222,8 @@ where
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelsResponse>> {
         self.inner.list_models(req, options).await
     }
 
@@ -231,8 +231,8 @@ where
     async fn patch_model(
         &self,
         req: crate::model::PatchModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         self.inner.patch_model(req, options).await
     }
 
@@ -240,8 +240,8 @@ where
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_model(req, options).await
     }
 }
@@ -272,8 +272,8 @@ where
     async fn get_service_account(
         &self,
         req: crate::model::GetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetServiceAccountResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetServiceAccountResponse>> {
         self.inner.get_service_account(req, options).await
     }
 }
@@ -304,8 +304,8 @@ where
     async fn get_routine(
         &self,
         req: crate::model::GetRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Routine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Routine>> {
         self.inner.get_routine(req, options).await
     }
 
@@ -313,8 +313,8 @@ where
     async fn insert_routine(
         &self,
         req: crate::model::InsertRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Routine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Routine>> {
         self.inner.insert_routine(req, options).await
     }
 
@@ -322,8 +322,8 @@ where
     async fn update_routine(
         &self,
         req: crate::model::UpdateRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Routine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Routine>> {
         self.inner.update_routine(req, options).await
     }
 
@@ -331,8 +331,8 @@ where
     async fn delete_routine(
         &self,
         req: crate::model::DeleteRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_routine(req, options).await
     }
 
@@ -340,8 +340,8 @@ where
     async fn list_routines(
         &self,
         req: crate::model::ListRoutinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutinesResponse>> {
         self.inner.list_routines(req, options).await
     }
 }
@@ -372,8 +372,8 @@ where
     async fn list_row_access_policies(
         &self,
         req: crate::model::ListRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRowAccessPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRowAccessPoliciesResponse>> {
         self.inner.list_row_access_policies(req, options).await
     }
 
@@ -381,8 +381,8 @@ where
     async fn get_row_access_policy(
         &self,
         req: crate::model::GetRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RowAccessPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RowAccessPolicy>> {
         self.inner.get_row_access_policy(req, options).await
     }
 
@@ -390,8 +390,8 @@ where
     async fn create_row_access_policy(
         &self,
         req: crate::model::CreateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RowAccessPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RowAccessPolicy>> {
         self.inner.create_row_access_policy(req, options).await
     }
 
@@ -399,8 +399,8 @@ where
     async fn update_row_access_policy(
         &self,
         req: crate::model::UpdateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RowAccessPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RowAccessPolicy>> {
         self.inner.update_row_access_policy(req, options).await
     }
 
@@ -408,8 +408,8 @@ where
     async fn delete_row_access_policy(
         &self,
         req: crate::model::DeleteRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_row_access_policy(req, options).await
     }
 
@@ -417,8 +417,8 @@ where
     async fn batch_delete_row_access_policies(
         &self,
         req: crate::model::BatchDeleteRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .batch_delete_row_access_policies(req, options)
             .await
@@ -451,8 +451,8 @@ where
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.get_table(req, options).await
     }
 
@@ -460,8 +460,8 @@ where
     async fn insert_table(
         &self,
         req: crate::model::InsertTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.insert_table(req, options).await
     }
 
@@ -469,8 +469,8 @@ where
     async fn patch_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.patch_table(req, options).await
     }
 
@@ -478,8 +478,8 @@ where
     async fn update_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         self.inner.update_table(req, options).await
     }
 
@@ -487,8 +487,8 @@ where
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_table(req, options).await
     }
 
@@ -496,8 +496,8 @@ where
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TableList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TableList>> {
         self.inner.list_tables(req, options).await
     }
 }
diff --git a/src/generated/cloud/bigquery/v2/src/transport.rs b/src/generated/cloud/bigquery/v2/src/transport.rs
index d2e954a8a2..1794350743 100644
--- a/src/generated/cloud/bigquery/v2/src/transport.rs
+++ b/src/generated/cloud/bigquery/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DatasetService](super::stub::DatasetService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DatasetService {
 }
 
 impl DatasetService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn insert_dataset(
         &self,
         req: crate::model::InsertDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -139,9 +139,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -156,13 +156,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn patch_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -201,9 +201,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -218,13 +218,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn update_dataset(
         &self,
         req: crate::model::UpdateOrPatchDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -263,9 +263,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -280,13 +280,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -324,9 +324,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -335,24 +335,25 @@ impl super::stub::DatasetService for DatasetService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DatasetList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DatasetList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -394,9 +395,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -411,13 +412,13 @@ impl super::stub::DatasetService for DatasetService {
     async fn undelete_dataset(
         &self,
         req: crate::model::UndeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -454,9 +455,9 @@ impl super::stub::DatasetService for DatasetService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -484,7 +485,7 @@ impl std::fmt::Debug for JobService {
 }
 
 impl JobService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -494,13 +495,13 @@ impl super::stub::JobService for JobService {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::JobCancelResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::JobCancelResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -538,9 +539,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -555,13 +556,13 @@ impl super::stub::JobService for JobService {
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -599,9 +600,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -616,13 +617,13 @@ impl super::stub::JobService for JobService {
     async fn insert_job(
         &self,
         req: crate::model::InsertJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -649,9 +650,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -666,13 +667,13 @@ impl super::stub::JobService for JobService {
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -710,9 +711,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -721,24 +722,25 @@ impl super::stub::JobService for JobService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::JobList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::JobList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -796,9 +798,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -813,13 +815,13 @@ impl super::stub::JobService for JobService {
     async fn get_query_results(
         &self,
         req: crate::model::GetQueryResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetQueryResultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetQueryResultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -900,9 +902,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -917,13 +919,13 @@ impl super::stub::JobService for JobService {
     async fn query(
         &self,
         req: crate::model::PostQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -950,9 +952,9 @@ impl super::stub::JobService for JobService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -980,7 +982,7 @@ impl std::fmt::Debug for ModelService {
 }
 
 impl ModelService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -990,13 +992,13 @@ impl super::stub::ModelService for ModelService {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1043,9 +1045,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1060,13 +1062,13 @@ impl super::stub::ModelService for ModelService {
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1116,9 +1118,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1133,13 +1135,13 @@ impl super::stub::ModelService for ModelService {
     async fn patch_model(
         &self,
         req: crate::model::PatchModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1186,9 +1188,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1203,13 +1205,13 @@ impl super::stub::ModelService for ModelService {
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1256,9 +1258,9 @@ impl super::stub::ModelService for ModelService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1267,12 +1269,13 @@ impl super::stub::ModelService for ModelService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1291,7 +1294,7 @@ impl std::fmt::Debug for ProjectService {
 }
 
 impl ProjectService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1301,13 +1304,13 @@ impl super::stub::ProjectService for ProjectService {
     async fn get_service_account(
         &self,
         req: crate::model::GetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetServiceAccountResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetServiceAccountResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1334,9 +1337,9 @@ impl super::stub::ProjectService for ProjectService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1364,7 +1367,7 @@ impl std::fmt::Debug for RoutineService {
 }
 
 impl RoutineService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1374,13 +1377,13 @@ impl super::stub::RoutineService for RoutineService {
     async fn get_routine(
         &self,
         req: crate::model::GetRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Routine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Routine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1427,9 +1430,9 @@ impl super::stub::RoutineService for RoutineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1444,13 +1447,13 @@ impl super::stub::RoutineService for RoutineService {
     async fn insert_routine(
         &self,
         req: crate::model::InsertRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Routine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Routine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1487,9 +1490,9 @@ impl super::stub::RoutineService for RoutineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1504,13 +1507,13 @@ impl super::stub::RoutineService for RoutineService {
     async fn update_routine(
         &self,
         req: crate::model::UpdateRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Routine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Routine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1557,9 +1560,9 @@ impl super::stub::RoutineService for RoutineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1574,13 +1577,13 @@ impl super::stub::RoutineService for RoutineService {
     async fn delete_routine(
         &self,
         req: crate::model::DeleteRoutineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1627,9 +1630,9 @@ impl super::stub::RoutineService for RoutineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1638,24 +1641,25 @@ impl super::stub::RoutineService for RoutineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_routines(
         &self,
         req: crate::model::ListRoutinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutinesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutinesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1706,9 +1710,9 @@ impl super::stub::RoutineService for RoutineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1736,7 +1740,7 @@ impl std::fmt::Debug for RowAccessPolicyService {
 }
 
 impl RowAccessPolicyService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1746,13 +1750,13 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
     async fn list_row_access_policies(
         &self,
         req: crate::model::ListRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRowAccessPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRowAccessPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1801,9 +1805,9 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1818,13 +1822,13 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
     async fn get_row_access_policy(
         &self,
         req: crate::model::GetRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RowAccessPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RowAccessPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1881,9 +1885,9 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1898,13 +1902,13 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
     async fn create_row_access_policy(
         &self,
         req: crate::model::CreateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RowAccessPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RowAccessPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1951,9 +1955,9 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1968,13 +1972,13 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
     async fn update_row_access_policy(
         &self,
         req: crate::model::UpdateRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RowAccessPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RowAccessPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2031,9 +2035,9 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2048,13 +2052,13 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
     async fn delete_row_access_policy(
         &self,
         req: crate::model::DeleteRowAccessPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2115,9 +2119,9 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2126,24 +2130,25 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn batch_delete_row_access_policies(
         &self,
         req: crate::model::BatchDeleteRowAccessPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2190,9 +2195,9 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2201,12 +2206,13 @@ impl super::stub::RowAccessPolicyService for RowAccessPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -2225,7 +2231,7 @@ impl std::fmt::Debug for TableService {
 }
 
 impl TableService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2235,13 +2241,13 @@ impl super::stub::TableService for TableService {
     async fn get_table(
         &self,
         req: crate::model::GetTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2290,9 +2296,9 @@ impl super::stub::TableService for TableService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2307,13 +2313,13 @@ impl super::stub::TableService for TableService {
     async fn insert_table(
         &self,
         req: crate::model::InsertTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2350,9 +2356,9 @@ impl super::stub::TableService for TableService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2367,13 +2373,13 @@ impl super::stub::TableService for TableService {
     async fn patch_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2421,9 +2427,9 @@ impl super::stub::TableService for TableService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2438,13 +2444,13 @@ impl super::stub::TableService for TableService {
     async fn update_table(
         &self,
         req: crate::model::UpdateOrPatchTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Table>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Table>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2492,9 +2498,9 @@ impl super::stub::TableService for TableService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2509,13 +2515,13 @@ impl super::stub::TableService for TableService {
     async fn delete_table(
         &self,
         req: crate::model::DeleteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2562,9 +2568,9 @@ impl super::stub::TableService for TableService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2573,24 +2579,25 @@ impl super::stub::TableService for TableService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_tables(
         &self,
         req: crate::model::ListTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TableList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TableList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2640,9 +2647,9 @@ impl super::stub::TableService for TableService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/billing/v1/Cargo.toml b/src/generated/cloud/billing/v1/Cargo.toml
index f5980b73c4..c63b871b45 100644
--- a/src/generated/cloud/billing/v1/Cargo.toml
+++ b/src/generated/cloud/billing/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-iam-v1.workspace = true
 google-cloud-type.workspace   = true
 lazy_static.workspace         = true
diff --git a/src/generated/cloud/billing/v1/src/builder.rs b/src/generated/cloud/billing/v1/src/builder.rs
index 2a69da376c..e95253bda6 100644
--- a/src/generated/cloud/billing/v1/src/builder.rs
+++ b/src/generated/cloud/billing/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_billing {
     /// A builder for [CloudBilling][crate::client::CloudBilling].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_billing_v1::*;
     /// # use builder::cloud_billing::ClientBuilder;
     /// # use client::CloudBilling;
@@ -30,19 +30,18 @@ pub mod cloud_billing {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudBilling;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudBilling;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_billing {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudBilling>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_billing {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::GetBillingAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .get_billing_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBillingAccountRequest::name].
@@ -130,8 +129,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBillingAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBillingAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -141,8 +140,8 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::ListBillingAccounts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -176,7 +175,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -186,14 +185,16 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .list_billing_accounts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBillingAccountsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBillingAccountsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -201,17 +202,17 @@ pub mod cloud_billing {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBillingAccountsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -241,8 +242,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBillingAccounts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBillingAccounts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::UpdateBillingAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -283,7 +284,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -293,7 +294,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .update_billing_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateBillingAccountRequest::name].
@@ -346,8 +347,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBillingAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBillingAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -357,7 +358,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::CreateBillingAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -388,7 +389,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -398,7 +399,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .create_billing_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [billing_account][crate::model::CreateBillingAccountRequest::billing_account].
@@ -431,8 +432,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBillingAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBillingAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -442,8 +443,8 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::ListProjectBillingInfo;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -477,7 +478,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -487,15 +488,15 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .list_project_billing_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListProjectBillingInfoResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -504,17 +505,17 @@ pub mod cloud_billing {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListProjectBillingInfoResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -540,8 +541,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProjectBillingInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProjectBillingInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -551,7 +552,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::GetProjectBillingInfo;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -582,7 +583,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -592,7 +593,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .get_project_billing_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProjectBillingInfoRequest::name].
@@ -605,8 +606,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProjectBillingInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProjectBillingInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -616,7 +617,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::UpdateProjectBillingInfo;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -649,7 +650,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -659,7 +660,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .update_project_billing_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateProjectBillingInfoRequest::name].
@@ -690,8 +691,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateProjectBillingInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateProjectBillingInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -701,7 +702,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -732,7 +733,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -742,7 +743,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -773,8 +774,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -784,7 +785,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -815,7 +816,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -825,7 +826,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -878,8 +879,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -889,7 +890,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -922,7 +923,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -932,7 +933,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -958,8 +959,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -969,7 +970,7 @@ pub mod cloud_billing {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_billing::MoveBillingAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1000,7 +1001,7 @@ pub mod cloud_billing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1010,7 +1011,7 @@ pub mod cloud_billing {
             (*self.0.stub)
                 .move_billing_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::MoveBillingAccountRequest::name].
@@ -1031,8 +1032,8 @@ pub mod cloud_billing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveBillingAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveBillingAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1044,7 +1045,7 @@ pub mod cloud_catalog {
     /// A builder for [CloudCatalog][crate::client::CloudCatalog].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_billing_v1::*;
     /// # use builder::cloud_catalog::ClientBuilder;
     /// # use client::CloudCatalog;
@@ -1054,19 +1055,18 @@ pub mod cloud_catalog {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudCatalog;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudCatalog;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1077,7 +1077,7 @@ pub mod cloud_catalog {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudCatalog>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1090,7 +1090,7 @@ pub mod cloud_catalog {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1100,8 +1100,8 @@ pub mod cloud_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_catalog::ListServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1132,7 +1132,7 @@ pub mod cloud_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1142,13 +1142,13 @@ pub mod cloud_catalog {
             (*self.0.stub)
                 .list_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServicesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListServicesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1157,15 +1157,17 @@ pub mod cloud_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListServicesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListServicesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1183,8 +1185,8 @@ pub mod cloud_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1194,8 +1196,8 @@ pub mod cloud_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_billing_v1::builder::cloud_catalog::ListSkus;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_billing_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1226,7 +1228,7 @@ pub mod cloud_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1236,13 +1238,13 @@ pub mod cloud_catalog {
             (*self.0.stub)
                 .list_skus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSkusResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSkusResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1251,15 +1253,15 @@ pub mod cloud_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSkusResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListSkusResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1327,8 +1329,8 @@ pub mod cloud_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSkus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSkus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/billing/v1/src/client.rs b/src/generated/cloud/billing/v1/src/client.rs
index 8f0b132303..7ecc57093b 100644
--- a/src/generated/cloud/billing/v1/src/client.rs
+++ b/src/generated/cloud/billing/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_billing_v1::client::CloudBilling;
 /// let client = CloudBilling::builder().build().await?;
 /// // use `client` to make requests to the Cloud Billing API.
@@ -67,13 +67,13 @@ impl CloudBilling {
     /// Returns a builder for [CloudBilling].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_billing_v1::client::CloudBilling;
     /// let client = CloudBilling::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_billing::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::cloud_billing::client::Factory)
+        crate::new_client_builder(super::builder::cloud_billing::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl CloudBilling {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudBilling>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudBilling>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl CloudBilling {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudBilling> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudBilling> {
         super::transport::CloudBilling::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudBilling> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudBilling> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudBilling::new)
@@ -253,7 +253,7 @@ impl CloudBilling {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_billing_v1::client::CloudCatalog;
 /// let client = CloudCatalog::builder().build().await?;
 /// // use `client` to make requests to the Cloud Billing API.
@@ -301,13 +301,13 @@ impl CloudCatalog {
     /// Returns a builder for [CloudCatalog].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_billing_v1::client::CloudCatalog;
     /// let client = CloudCatalog::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_catalog::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::cloud_catalog::client::Factory)
+        crate::new_client_builder(super::builder::cloud_catalog::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -325,14 +325,14 @@ impl CloudCatalog {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudCatalog>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudCatalog>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -341,13 +341,13 @@ impl CloudCatalog {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudCatalog> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudCatalog> {
         super::transport::CloudCatalog::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudCatalog> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudCatalog> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudCatalog::new)
diff --git a/src/generated/cloud/billing/v1/src/lib.rs b/src/generated/cloud/billing/v1/src/lib.rs
index e78aec62e8..47612ed7bf 100644
--- a/src/generated/cloud/billing/v1/src/lib.rs
+++ b/src/generated/cloud/billing/v1/src/lib.rs
@@ -45,8 +45,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -81,3 +81,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/billing/v1/src/model.rs b/src/generated/cloud/billing/v1/src/model.rs
index 37b4e84b88..417c53804d 100644
--- a/src/generated/cloud/billing/v1/src/model.rs
+++ b/src/generated/cloud/billing/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_type;
 extern crate lazy_static;
@@ -460,7 +460,7 @@ impl wkt::message::Message for ListBillingAccountsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBillingAccountsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBillingAccountsResponse {
     type PageItem = crate::model::BillingAccount;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -790,7 +790,7 @@ impl wkt::message::Message for ListProjectBillingInfoResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProjectBillingInfoResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProjectBillingInfoResponse {
     type PageItem = crate::model::ProjectBillingInfo;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2424,7 +2424,7 @@ impl wkt::message::Message for ListServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServicesResponse {
     type PageItem = crate::model::Service;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2665,7 +2665,7 @@ impl wkt::message::Message for ListSkusResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSkusResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSkusResponse {
     type PageItem = crate::model::Sku;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/billing/v1/src/stub.rs b/src/generated/cloud/billing/v1/src/stub.rs
index c3e57eb4e8..9409c5f513 100644
--- a/src/generated/cloud/billing/v1/src/stub.rs
+++ b/src/generated/cloud/billing/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn get_billing_account(
         &self,
         _req: crate::model::GetBillingAccountRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BillingAccount>>,
+        Output = crate::Result<crate::Response<crate::model::BillingAccount>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn list_billing_accounts(
         &self,
         _req: crate::model::ListBillingAccountsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBillingAccountsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBillingAccountsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn update_billing_account(
         &self,
         _req: crate::model::UpdateBillingAccountRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BillingAccount>>,
+        Output = crate::Result<crate::Response<crate::model::BillingAccount>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn create_billing_account(
         &self,
         _req: crate::model::CreateBillingAccountRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BillingAccount>>,
+        Output = crate::Result<crate::Response<crate::model::BillingAccount>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,11 +86,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn list_project_billing_info(
         &self,
         _req: crate::model::ListProjectBillingInfoRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListProjectBillingInfoResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListProjectBillingInfoResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +97,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn get_project_billing_info(
         &self,
         _req: crate::model::GetProjectBillingInfoRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProjectBillingInfo>>,
+        Output = crate::Result<crate::Response<crate::model::ProjectBillingInfo>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +108,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn update_project_billing_info(
         &self,
         _req: crate::model::UpdateProjectBillingInfoRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProjectBillingInfo>>,
+        Output = crate::Result<crate::Response<crate::model::ProjectBillingInfo>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,9 +119,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,9 +130,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,10 +141,10 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -156,9 +154,9 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     fn move_billing_account(
         &self,
         _req: crate::model::MoveBillingAccountRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BillingAccount>>,
+        Output = crate::Result<crate::Response<crate::model::BillingAccount>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -180,9 +178,9 @@ pub trait CloudCatalog: std::fmt::Debug + Send + Sync {
     fn list_services(
         &self,
         _req: crate::model::ListServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -191,9 +189,9 @@ pub trait CloudCatalog: std::fmt::Debug + Send + Sync {
     fn list_skus(
         &self,
         _req: crate::model::ListSkusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSkusResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSkusResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/billing/v1/src/stub/dynamic.rs b/src/generated/cloud/billing/v1/src/stub/dynamic.rs
index 0d0299158c..b740efe5ce 100644
--- a/src/generated/cloud/billing/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/billing/v1/src/stub/dynamic.rs
@@ -20,70 +20,68 @@ pub trait CloudBilling: std::fmt::Debug + Send + Sync {
     async fn get_billing_account(
         &self,
         req: crate::model::GetBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>>;
 
     async fn list_billing_accounts(
         &self,
         req: crate::model::ListBillingAccountsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBillingAccountsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBillingAccountsResponse>>;
 
     async fn update_billing_account(
         &self,
         req: crate::model::UpdateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>>;
 
     async fn create_billing_account(
         &self,
         req: crate::model::CreateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>>;
 
     async fn list_project_billing_info(
         &self,
         req: crate::model::ListProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProjectBillingInfoResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProjectBillingInfoResponse>>;
 
     async fn get_project_billing_info(
         &self,
         req: crate::model::GetProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProjectBillingInfo>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProjectBillingInfo>>;
 
     async fn update_project_billing_info(
         &self,
         req: crate::model::UpdateProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProjectBillingInfo>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProjectBillingInfo>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn move_billing_account(
         &self,
         req: crate::model::MoveBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>>;
 }
 
 /// All implementations of [super::CloudBilling] also implement [CloudBilling].
@@ -93,8 +91,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn get_billing_account(
         &self,
         req: crate::model::GetBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>> {
         T::get_billing_account(self, req, options).await
     }
 
@@ -102,8 +100,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn list_billing_accounts(
         &self,
         req: crate::model::ListBillingAccountsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBillingAccountsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBillingAccountsResponse>> {
         T::list_billing_accounts(self, req, options).await
     }
 
@@ -111,8 +109,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn update_billing_account(
         &self,
         req: crate::model::UpdateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>> {
         T::update_billing_account(self, req, options).await
     }
 
@@ -120,8 +118,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn create_billing_account(
         &self,
         req: crate::model::CreateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>> {
         T::create_billing_account(self, req, options).await
     }
 
@@ -129,8 +127,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn list_project_billing_info(
         &self,
         req: crate::model::ListProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProjectBillingInfoResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProjectBillingInfoResponse>> {
         T::list_project_billing_info(self, req, options).await
     }
 
@@ -138,8 +136,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn get_project_billing_info(
         &self,
         req: crate::model::GetProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProjectBillingInfo>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProjectBillingInfo>> {
         T::get_project_billing_info(self, req, options).await
     }
 
@@ -147,8 +145,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn update_project_billing_info(
         &self,
         req: crate::model::UpdateProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProjectBillingInfo>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProjectBillingInfo>> {
         T::update_project_billing_info(self, req, options).await
     }
 
@@ -156,8 +154,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -165,8 +163,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -174,10 +172,9 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -185,8 +182,8 @@ impl<T: super::CloudBilling> CloudBilling for T {
     async fn move_billing_account(
         &self,
         req: crate::model::MoveBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BillingAccount>> {
         T::move_billing_account(self, req, options).await
     }
 }
@@ -197,14 +194,14 @@ pub trait CloudCatalog: std::fmt::Debug + Send + Sync {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>>;
 
     async fn list_skus(
         &self,
         req: crate::model::ListSkusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSkusResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSkusResponse>>;
 }
 
 /// All implementations of [super::CloudCatalog] also implement [CloudCatalog].
@@ -214,8 +211,8 @@ impl<T: super::CloudCatalog> CloudCatalog for T {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>> {
         T::list_services(self, req, options).await
     }
 
@@ -223,8 +220,8 @@ impl<T: super::CloudCatalog> CloudCatalog for T {
     async fn list_skus(
         &self,
         req: crate::model::ListSkusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSkusResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSkusResponse>> {
         T::list_skus(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/billing/v1/src/tracing.rs b/src/generated/cloud/billing/v1/src/tracing.rs
index 073cec367b..db130cf0e0 100644
--- a/src/generated/cloud/billing/v1/src/tracing.rs
+++ b/src/generated/cloud/billing/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_billing_account(
         &self,
         req: crate::model::GetBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         self.inner.get_billing_account(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_billing_accounts(
         &self,
         req: crate::model::ListBillingAccountsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBillingAccountsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBillingAccountsResponse>> {
         self.inner.list_billing_accounts(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn update_billing_account(
         &self,
         req: crate::model::UpdateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         self.inner.update_billing_account(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn create_billing_account(
         &self,
         req: crate::model::CreateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         self.inner.create_billing_account(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_project_billing_info(
         &self,
         req: crate::model::ListProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProjectBillingInfoResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProjectBillingInfoResponse>> {
         self.inner.list_project_billing_info(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_project_billing_info(
         &self,
         req: crate::model::GetProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProjectBillingInfo>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProjectBillingInfo>> {
         self.inner.get_project_billing_info(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn update_project_billing_info(
         &self,
         req: crate::model::UpdateProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProjectBillingInfo>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProjectBillingInfo>> {
         self.inner.update_project_billing_info(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -122,9 +122,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -132,8 +131,8 @@ where
     async fn move_billing_account(
         &self,
         req: crate::model::MoveBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         self.inner.move_billing_account(req, options).await
     }
 }
@@ -164,8 +163,8 @@ where
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         self.inner.list_services(req, options).await
     }
 
@@ -173,8 +172,8 @@ where
     async fn list_skus(
         &self,
         req: crate::model::ListSkusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSkusResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSkusResponse>> {
         self.inner.list_skus(req, options).await
     }
 }
diff --git a/src/generated/cloud/billing/v1/src/transport.rs b/src/generated/cloud/billing/v1/src/transport.rs
index 741647ce04..e6ae0782d7 100644
--- a/src/generated/cloud/billing/v1/src/transport.rs
+++ b/src/generated/cloud/billing/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudBilling](super::stub::CloudBilling) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudBilling {
 }
 
 impl CloudBilling {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn get_billing_account(
         &self,
         req: crate::model::GetBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -82,9 +82,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -99,13 +99,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn list_billing_accounts(
         &self,
         req: crate::model::ListBillingAccountsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBillingAccountsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBillingAccountsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/billingAccounts".to_string();
@@ -182,9 +182,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -199,13 +199,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn update_billing_account(
         &self,
         req: crate::model::UpdateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -250,9 +250,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -267,13 +267,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn create_billing_account(
         &self,
         req: crate::model::CreateBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/billingAccounts".to_string();
@@ -341,9 +341,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -358,13 +358,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn list_project_billing_info(
         &self,
         req: crate::model::ListProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProjectBillingInfoResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProjectBillingInfoResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -399,9 +399,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -416,13 +416,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn get_project_billing_info(
         &self,
         req: crate::model::GetProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProjectBillingInfo>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProjectBillingInfo>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -449,9 +449,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -466,13 +466,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn update_project_billing_info(
         &self,
         req: crate::model::UpdateProjectBillingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProjectBillingInfo>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProjectBillingInfo>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -499,9 +499,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -516,13 +516,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -567,9 +567,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -584,13 +584,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -623,9 +623,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -640,14 +640,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -680,9 +679,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -697,13 +696,13 @@ impl super::stub::CloudBilling for CloudBilling {
     async fn move_billing_account(
         &self,
         req: crate::model::MoveBillingAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BillingAccount>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BillingAccount>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -779,9 +778,9 @@ impl super::stub::CloudBilling for CloudBilling {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -809,7 +808,7 @@ impl std::fmt::Debug for CloudCatalog {
 }
 
 impl CloudCatalog {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -819,11 +818,11 @@ impl super::stub::CloudCatalog for CloudCatalog {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/services".to_string();
@@ -840,9 +839,9 @@ impl super::stub::CloudCatalog for CloudCatalog {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -857,13 +856,13 @@ impl super::stub::CloudCatalog for CloudCatalog {
     async fn list_skus(
         &self,
         req: crate::model::ListSkusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSkusResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSkusResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -915,9 +914,9 @@ impl super::stub::CloudCatalog for CloudCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/binaryauthorization/v1/Cargo.toml b/src/generated/cloud/binaryauthorization/v1/Cargo.toml
index f188990f46..5b54cc57d8 100644
--- a/src/generated/cloud/binaryauthorization/v1/Cargo.toml
+++ b/src/generated/cloud/binaryauthorization/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace             = true
 bytes.workspace                   = true
-gax.workspace                     = true
 gaxi                              = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace        = true
 google-cloud-grafeas-v1.workspace = true
 lazy_static.workspace             = true
 serde.workspace                   = true
diff --git a/src/generated/cloud/binaryauthorization/v1/src/builder.rs b/src/generated/cloud/binaryauthorization/v1/src/builder.rs
index 8ebf1db71d..70046f81cb 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/builder.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod binauthz_management_service_v_1 {
     /// A builder for [BinauthzManagementServiceV1][crate::client::BinauthzManagementServiceV1].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_binaryauthorization_v1::*;
     /// # use builder::binauthz_management_service_v_1::ClientBuilder;
     /// # use client::BinauthzManagementServiceV1;
@@ -30,19 +30,18 @@ pub mod binauthz_management_service_v_1 {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BinauthzManagementServiceV1;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BinauthzManagementServiceV1;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod binauthz_management_service_v_1 {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BinauthzManagementServiceV1>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod binauthz_management_service_v_1 {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::GetPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .get_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPolicyRequest::name].
@@ -127,8 +126,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -138,7 +137,7 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::UpdatePolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -166,7 +165,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -176,7 +175,7 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .update_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [policy][crate::model::UpdatePolicyRequest::policy].
@@ -203,8 +202,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -214,7 +213,7 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::CreateAttestor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -242,7 +241,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -252,7 +251,7 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .create_attestor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAttestorRequest::parent].
@@ -295,8 +294,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAttestor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAttestor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -306,7 +305,7 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::GetAttestor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -334,7 +333,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -344,7 +343,7 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .get_attestor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAttestorRequest::name].
@@ -357,8 +356,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAttestor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAttestor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -368,7 +367,7 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::UpdateAttestor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -396,7 +395,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -406,7 +405,7 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .update_attestor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [attestor][crate::model::UpdateAttestorRequest::attestor].
@@ -433,8 +432,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAttestor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAttestor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -444,8 +443,8 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::ListAttestors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -476,7 +475,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -486,13 +485,13 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .list_attestors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAttestorsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAttestorsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -501,15 +500,17 @@ pub mod binauthz_management_service_v_1 {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAttestorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAttestorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -535,8 +536,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAttestors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAttestors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -546,7 +547,7 @@ pub mod binauthz_management_service_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::binauthz_management_service_v_1::DeleteAttestor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -574,7 +575,7 @@ pub mod binauthz_management_service_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -584,7 +585,7 @@ pub mod binauthz_management_service_v_1 {
             (*self.0.stub)
                 .delete_attestor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAttestorRequest::name].
@@ -597,8 +598,8 @@ pub mod binauthz_management_service_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAttestor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAttestor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -610,7 +611,7 @@ pub mod system_policy_v_1 {
     /// A builder for [SystemPolicyV1][crate::client::SystemPolicyV1].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_binaryauthorization_v1::*;
     /// # use builder::system_policy_v_1::ClientBuilder;
     /// # use client::SystemPolicyV1;
@@ -620,19 +621,18 @@ pub mod system_policy_v_1 {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SystemPolicyV1;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SystemPolicyV1;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -643,7 +643,7 @@ pub mod system_policy_v_1 {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SystemPolicyV1>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -656,7 +656,7 @@ pub mod system_policy_v_1 {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -666,7 +666,7 @@ pub mod system_policy_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::system_policy_v_1::GetSystemPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -694,7 +694,7 @@ pub mod system_policy_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -704,7 +704,7 @@ pub mod system_policy_v_1 {
             (*self.0.stub)
                 .get_system_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSystemPolicyRequest::name].
@@ -717,8 +717,8 @@ pub mod system_policy_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSystemPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSystemPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -730,7 +730,7 @@ pub mod validation_helper_v_1 {
     /// A builder for [ValidationHelperV1][crate::client::ValidationHelperV1].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_binaryauthorization_v1::*;
     /// # use builder::validation_helper_v_1::ClientBuilder;
     /// # use client::ValidationHelperV1;
@@ -740,19 +740,18 @@ pub mod validation_helper_v_1 {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ValidationHelperV1;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ValidationHelperV1;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -763,7 +762,7 @@ pub mod validation_helper_v_1 {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ValidationHelperV1>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -776,7 +775,7 @@ pub mod validation_helper_v_1 {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -786,7 +785,7 @@ pub mod validation_helper_v_1 {
     /// # Example
     /// ```
     /// # use google_cloud_binaryauthorization_v1::builder::validation_helper_v_1::ValidateAttestationOccurrence;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_binaryauthorization_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -819,7 +818,7 @@ pub mod validation_helper_v_1 {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -829,7 +828,7 @@ pub mod validation_helper_v_1 {
             (*self.0.stub)
                 .validate_attestation_occurrence(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [attestor][crate::model::ValidateAttestationOccurrenceRequest::attestor].
@@ -880,8 +879,8 @@ pub mod validation_helper_v_1 {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateAttestationOccurrence {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateAttestationOccurrence {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/binaryauthorization/v1/src/client.rs b/src/generated/cloud/binaryauthorization/v1/src/client.rs
index b6e220b822..db87201329 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/client.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_binaryauthorization_v1::client::BinauthzManagementServiceV1;
 /// let client = BinauthzManagementServiceV1::builder().build().await?;
 /// // use `client` to make requests to the Binary Authorization API.
@@ -75,15 +75,13 @@ impl BinauthzManagementServiceV1 {
     /// Returns a builder for [BinauthzManagementServiceV1].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_binaryauthorization_v1::client::BinauthzManagementServiceV1;
     /// let client = BinauthzManagementServiceV1::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::binauthz_management_service_v_1::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::binauthz_management_service_v_1::client::Factory,
-        )
+        crate::new_client_builder(super::builder::binauthz_management_service_v_1::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -101,14 +99,14 @@ impl BinauthzManagementServiceV1 {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::BinauthzManagementServiceV1>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -119,13 +117,13 @@ impl BinauthzManagementServiceV1 {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BinauthzManagementServiceV1> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BinauthzManagementServiceV1> {
         super::transport::BinauthzManagementServiceV1::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BinauthzManagementServiceV1> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BinauthzManagementServiceV1> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BinauthzManagementServiceV1::new)
@@ -209,7 +207,7 @@ impl BinauthzManagementServiceV1 {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_binaryauthorization_v1::client::SystemPolicyV1;
 /// let client = SystemPolicyV1::builder().build().await?;
 /// // use `client` to make requests to the Binary Authorization API.
@@ -255,15 +253,13 @@ impl SystemPolicyV1 {
     /// Returns a builder for [SystemPolicyV1].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_binaryauthorization_v1::client::SystemPolicyV1;
     /// let client = SystemPolicyV1::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::system_policy_v_1::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::system_policy_v_1::client::Factory,
-        )
+        crate::new_client_builder(super::builder::system_policy_v_1::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -281,14 +277,14 @@ impl SystemPolicyV1 {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SystemPolicyV1>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SystemPolicyV1>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -297,13 +293,13 @@ impl SystemPolicyV1 {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SystemPolicyV1> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SystemPolicyV1> {
         super::transport::SystemPolicyV1::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SystemPolicyV1> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SystemPolicyV1> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SystemPolicyV1::new)
@@ -319,7 +315,7 @@ impl SystemPolicyV1 {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_binaryauthorization_v1::client::ValidationHelperV1;
 /// let client = ValidationHelperV1::builder().build().await?;
 /// // use `client` to make requests to the Binary Authorization API.
@@ -365,15 +361,13 @@ impl ValidationHelperV1 {
     /// Returns a builder for [ValidationHelperV1].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_binaryauthorization_v1::client::ValidationHelperV1;
     /// let client = ValidationHelperV1::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::validation_helper_v_1::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::validation_helper_v_1::client::Factory,
-        )
+        crate::new_client_builder(super::builder::validation_helper_v_1::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -391,14 +385,14 @@ impl ValidationHelperV1 {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ValidationHelperV1>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ValidationHelperV1>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -408,13 +402,13 @@ impl ValidationHelperV1 {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ValidationHelperV1> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ValidationHelperV1> {
         super::transport::ValidationHelperV1::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ValidationHelperV1> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ValidationHelperV1> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ValidationHelperV1::new)
diff --git a/src/generated/cloud/binaryauthorization/v1/src/lib.rs b/src/generated/cloud/binaryauthorization/v1/src/lib.rs
index 16eb192392..15bfa8cb10 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/lib.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/binaryauthorization/v1/src/model.rs b/src/generated/cloud/binaryauthorization/v1/src/model.rs
index ff455797f8..7dc69a0952 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/model.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_grafeas_v1;
 extern crate lazy_static;
 extern crate serde;
@@ -2074,7 +2074,7 @@ impl wkt::message::Message for ListAttestorsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAttestorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAttestorsResponse {
     type PageItem = crate::model::Attestor;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/binaryauthorization/v1/src/stub.rs b/src/generated/cloud/binaryauthorization/v1/src/stub.rs
index 6ec381b782..92fe930699 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/stub.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn get_policy(
         &self,
         _req: crate::model::GetPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn update_policy(
         &self,
         _req: crate::model::UpdatePolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +62,9 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn create_attestor(
         &self,
         _req: crate::model::CreateAttestorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Attestor>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Attestor>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +72,9 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn get_attestor(
         &self,
         _req: crate::model::GetAttestorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Attestor>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Attestor>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,10 +82,9 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn update_attestor(
         &self,
         _req: crate::model::UpdateAttestorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Attestor>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Attestor>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +92,9 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn list_attestors(
         &self,
         _req: crate::model::ListAttestorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAttestorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAttestorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,8 +103,8 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     fn delete_attestor(
         &self,
         _req: crate::model::DeleteAttestorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -130,10 +125,9 @@ pub trait SystemPolicyV1: std::fmt::Debug + Send + Sync {
     fn get_system_policy(
         &self,
         _req: crate::model::GetSystemPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -154,10 +148,10 @@ pub trait ValidationHelperV1: std::fmt::Debug + Send + Sync {
     fn validate_attestation_occurrence(
         &self,
         _req: crate::model::ValidateAttestationOccurrenceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ValidateAttestationOccurrenceResponse>,
+            crate::Response<crate::model::ValidateAttestationOccurrenceResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
diff --git a/src/generated/cloud/binaryauthorization/v1/src/stub/dynamic.rs b/src/generated/cloud/binaryauthorization/v1/src/stub/dynamic.rs
index cba2424e96..d8b9daa2d3 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/stub/dynamic.rs
@@ -20,44 +20,44 @@ pub trait BinauthzManagementServiceV1: std::fmt::Debug + Send + Sync {
     async fn get_policy(
         &self,
         req: crate::model::GetPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn update_policy(
         &self,
         req: crate::model::UpdatePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn create_attestor(
         &self,
         req: crate::model::CreateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attestor>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attestor>>;
 
     async fn get_attestor(
         &self,
         req: crate::model::GetAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attestor>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attestor>>;
 
     async fn update_attestor(
         &self,
         req: crate::model::UpdateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attestor>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attestor>>;
 
     async fn list_attestors(
         &self,
         req: crate::model::ListAttestorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAttestorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAttestorsResponse>>;
 
     async fn delete_attestor(
         &self,
         req: crate::model::DeleteAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::BinauthzManagementServiceV1] also implement [BinauthzManagementServiceV1].
@@ -67,8 +67,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn get_policy(
         &self,
         req: crate::model::GetPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_policy(self, req, options).await
     }
 
@@ -76,8 +76,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn update_policy(
         &self,
         req: crate::model::UpdatePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::update_policy(self, req, options).await
     }
 
@@ -85,8 +85,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn create_attestor(
         &self,
         req: crate::model::CreateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attestor>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attestor>> {
         T::create_attestor(self, req, options).await
     }
 
@@ -94,8 +94,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn get_attestor(
         &self,
         req: crate::model::GetAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attestor>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attestor>> {
         T::get_attestor(self, req, options).await
     }
 
@@ -103,8 +103,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn update_attestor(
         &self,
         req: crate::model::UpdateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Attestor>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Attestor>> {
         T::update_attestor(self, req, options).await
     }
 
@@ -112,8 +112,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn list_attestors(
         &self,
         req: crate::model::ListAttestorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAttestorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAttestorsResponse>> {
         T::list_attestors(self, req, options).await
     }
 
@@ -121,8 +121,8 @@ impl<T: super::BinauthzManagementServiceV1> BinauthzManagementServiceV1 for T {
     async fn delete_attestor(
         &self,
         req: crate::model::DeleteAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_attestor(self, req, options).await
     }
 }
@@ -133,8 +133,8 @@ pub trait SystemPolicyV1: std::fmt::Debug + Send + Sync {
     async fn get_system_policy(
         &self,
         req: crate::model::GetSystemPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 }
 
 /// All implementations of [super::SystemPolicyV1] also implement [SystemPolicyV1].
@@ -144,8 +144,8 @@ impl<T: super::SystemPolicyV1> SystemPolicyV1 for T {
     async fn get_system_policy(
         &self,
         req: crate::model::GetSystemPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_system_policy(self, req, options).await
     }
 }
@@ -156,8 +156,8 @@ pub trait ValidationHelperV1: std::fmt::Debug + Send + Sync {
     async fn validate_attestation_occurrence(
         &self,
         req: crate::model::ValidateAttestationOccurrenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ValidateAttestationOccurrenceResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ValidateAttestationOccurrenceResponse>>;
 }
 
 /// All implementations of [super::ValidationHelperV1] also implement [ValidationHelperV1].
@@ -167,9 +167,8 @@ impl<T: super::ValidationHelperV1> ValidationHelperV1 for T {
     async fn validate_attestation_occurrence(
         &self,
         req: crate::model::ValidateAttestationOccurrenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ValidateAttestationOccurrenceResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ValidateAttestationOccurrenceResponse>> {
         T::validate_attestation_occurrence(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/binaryauthorization/v1/src/tracing.rs b/src/generated/cloud/binaryauthorization/v1/src/tracing.rs
index 30d3918e13..abac1ccf29 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/tracing.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_policy(
         &self,
         req: crate::model::GetPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_policy(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_policy(
         &self,
         req: crate::model::UpdatePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.update_policy(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_attestor(
         &self,
         req: crate::model::CreateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attestor>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attestor>> {
         self.inner.create_attestor(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_attestor(
         &self,
         req: crate::model::GetAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attestor>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attestor>> {
         self.inner.get_attestor(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_attestor(
         &self,
         req: crate::model::UpdateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attestor>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attestor>> {
         self.inner.update_attestor(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_attestors(
         &self,
         req: crate::model::ListAttestorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAttestorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAttestorsResponse>> {
         self.inner.list_attestors(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn delete_attestor(
         &self,
         req: crate::model::DeleteAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_attestor(req, options).await
     }
 }
@@ -127,8 +127,8 @@ where
     async fn get_system_policy(
         &self,
         req: crate::model::GetSystemPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_system_policy(req, options).await
     }
 }
@@ -159,8 +159,8 @@ where
     async fn validate_attestation_occurrence(
         &self,
         req: crate::model::ValidateAttestationOccurrenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ValidateAttestationOccurrenceResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ValidateAttestationOccurrenceResponse>> {
         self.inner
             .validate_attestation_occurrence(req, options)
             .await
diff --git a/src/generated/cloud/binaryauthorization/v1/src/transport.rs b/src/generated/cloud/binaryauthorization/v1/src/transport.rs
index 6bfe6465c7..e3f514a367 100644
--- a/src/generated/cloud/binaryauthorization/v1/src/transport.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [BinauthzManagementServiceV1](super::stub::BinauthzManagementServiceV1) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for BinauthzManagementServiceV1 {
 }
 
 impl BinauthzManagementServiceV1 {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn get_policy(
         &self,
         req: crate::model::GetPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -84,9 +84,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -101,13 +101,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn update_policy(
         &self,
         req: crate::model::UpdatePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148,9 +148,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -165,13 +165,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn create_attestor(
         &self,
         req: crate::model::CreateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attestor>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attestor>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -199,9 +199,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -216,13 +216,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn get_attestor(
         &self,
         req: crate::model::GetAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attestor>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attestor>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -259,9 +259,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -276,13 +276,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn update_attestor(
         &self,
         req: crate::model::UpdateAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Attestor>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Attestor>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -325,9 +325,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -342,13 +342,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn list_attestors(
         &self,
         req: crate::model::ListAttestorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAttestorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAttestorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -377,9 +377,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -394,13 +394,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
     async fn delete_attestor(
         &self,
         req: crate::model::DeleteAttestorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -437,9 +437,9 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,12 +448,13 @@ impl super::stub::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -472,7 +473,7 @@ impl std::fmt::Debug for SystemPolicyV1 {
 }
 
 impl SystemPolicyV1 {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -482,13 +483,13 @@ impl super::stub::SystemPolicyV1 for SystemPolicyV1 {
     async fn get_system_policy(
         &self,
         req: crate::model::GetSystemPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -523,9 +524,9 @@ impl super::stub::SystemPolicyV1 for SystemPolicyV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -553,7 +554,7 @@ impl std::fmt::Debug for ValidationHelperV1 {
 }
 
 impl ValidationHelperV1 {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -563,13 +564,13 @@ impl super::stub::ValidationHelperV1 for ValidationHelperV1 {
     async fn validate_attestation_occurrence(
         &self,
         req: crate::model::ValidateAttestationOccurrenceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ValidateAttestationOccurrenceResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ValidateAttestationOccurrenceResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -606,9 +607,9 @@ impl super::stub::ValidationHelperV1 for ValidationHelperV1 {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/certificatemanager/v1/Cargo.toml b/src/generated/cloud/certificatemanager/v1/Cargo.toml
index 11ed39da5d..7983291a34 100644
--- a/src/generated/cloud/certificatemanager/v1/Cargo.toml
+++ b/src/generated/cloud/certificatemanager/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/certificatemanager/v1/src/builder.rs b/src/generated/cloud/certificatemanager/v1/src/builder.rs
index d170fac69d..4cd5f9d21f 100644
--- a/src/generated/cloud/certificatemanager/v1/src/builder.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod certificate_manager {
     /// A builder for [CertificateManager][crate::client::CertificateManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_certificatemanager_v1::*;
     /// # use builder::certificate_manager::ClientBuilder;
     /// # use client::CertificateManager;
@@ -30,19 +30,18 @@ pub mod certificate_manager {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CertificateManager;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CertificateManager;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod certificate_manager {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CertificateManager>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod certificate_manager {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListCertificates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_certificates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCertificatesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCertificatesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,15 +137,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCertificatesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCertificatesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -182,8 +185,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCertificates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCertificates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -193,7 +196,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -221,7 +224,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -231,7 +234,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCertificateRequest::name].
@@ -244,8 +247,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -255,7 +258,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CreateCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -287,7 +290,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -302,7 +305,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .create_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_certificate`.
@@ -319,7 +322,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -386,8 +389,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -397,7 +400,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::UpdateCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -429,7 +432,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -444,7 +447,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .update_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_certificate`.
@@ -461,7 +464,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -534,8 +537,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -545,7 +548,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteCertificate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -577,7 +580,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -592,7 +595,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_certificate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_certificate`.
@@ -604,7 +607,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -641,8 +644,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCertificate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCertificate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -652,8 +655,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListCertificateMaps;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -687,7 +690,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -697,14 +700,16 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_certificate_maps(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCertificateMapsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCertificateMapsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -712,17 +717,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCertificateMapsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -760,8 +765,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCertificateMaps {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCertificateMaps {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -771,7 +776,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetCertificateMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -802,7 +807,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -812,7 +817,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_certificate_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCertificateMapRequest::name].
@@ -825,8 +830,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCertificateMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCertificateMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -836,7 +841,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CreateCertificateMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -868,7 +873,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -883,7 +888,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .create_certificate_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_certificate_map`.
@@ -900,7 +905,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -967,8 +972,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCertificateMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCertificateMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -978,7 +983,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::UpdateCertificateMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1010,7 +1015,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1025,7 +1030,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .update_certificate_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_certificate_map`.
@@ -1042,7 +1047,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1115,8 +1120,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCertificateMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCertificateMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1126,7 +1131,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteCertificateMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1158,7 +1163,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1173,7 +1178,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_certificate_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_certificate_map`.
@@ -1185,7 +1190,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1222,8 +1227,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCertificateMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCertificateMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1233,8 +1238,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListCertificateMapEntries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1270,7 +1275,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1280,15 +1285,15 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_certificate_map_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListCertificateMapEntriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1297,17 +1302,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCertificateMapEntriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1345,8 +1350,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCertificateMapEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCertificateMapEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1356,7 +1361,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetCertificateMapEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1387,7 +1392,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1397,7 +1402,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_certificate_map_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCertificateMapEntryRequest::name].
@@ -1410,8 +1415,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCertificateMapEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCertificateMapEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1421,7 +1426,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CreateCertificateMapEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1455,7 +1460,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1470,7 +1475,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .create_certificate_map_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_certificate_map_entry`.
@@ -1489,7 +1494,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1556,8 +1561,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCertificateMapEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCertificateMapEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1567,7 +1572,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::UpdateCertificateMapEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1601,7 +1606,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1616,7 +1621,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .update_certificate_map_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_certificate_map_entry`.
@@ -1635,7 +1640,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1708,8 +1713,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCertificateMapEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCertificateMapEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1719,7 +1724,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteCertificateMapEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1753,7 +1758,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1768,7 +1773,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_certificate_map_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_certificate_map_entry`.
@@ -1780,7 +1785,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1817,8 +1822,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCertificateMapEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCertificateMapEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1828,8 +1833,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListDnsAuthorizations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1863,7 +1868,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1873,14 +1878,16 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_dns_authorizations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDnsAuthorizationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDnsAuthorizationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1888,17 +1895,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDnsAuthorizationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1936,8 +1943,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDnsAuthorizations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDnsAuthorizations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1947,7 +1954,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetDnsAuthorization;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1978,7 +1985,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1988,7 +1995,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_dns_authorization(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDnsAuthorizationRequest::name].
@@ -2001,8 +2008,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDnsAuthorization {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDnsAuthorization {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2012,7 +2019,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CreateDnsAuthorization;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2044,7 +2051,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2059,7 +2066,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .create_dns_authorization(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_dns_authorization`.
@@ -2076,7 +2083,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2143,8 +2150,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDnsAuthorization {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDnsAuthorization {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2154,7 +2161,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::UpdateDnsAuthorization;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2186,7 +2193,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2201,7 +2208,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .update_dns_authorization(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_dns_authorization`.
@@ -2218,7 +2225,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2291,8 +2298,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDnsAuthorization {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDnsAuthorization {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2302,7 +2309,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteDnsAuthorization;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2334,7 +2341,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2349,7 +2356,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_dns_authorization(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_dns_authorization`.
@@ -2361,7 +2368,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2398,8 +2405,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDnsAuthorization {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDnsAuthorization {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2409,8 +2416,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListCertificateIssuanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2446,7 +2453,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2456,15 +2463,15 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_certificate_issuance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListCertificateIssuanceConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2473,17 +2480,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCertificateIssuanceConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2521,8 +2528,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCertificateIssuanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCertificateIssuanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2532,7 +2539,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetCertificateIssuanceConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2565,7 +2572,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2575,7 +2582,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_certificate_issuance_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCertificateIssuanceConfigRequest::name].
@@ -2588,8 +2595,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCertificateIssuanceConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCertificateIssuanceConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2599,7 +2606,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CreateCertificateIssuanceConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2633,7 +2640,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2648,7 +2655,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .create_certificate_issuance_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_certificate_issuance_config`.
@@ -2667,7 +2674,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2740,8 +2747,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCertificateIssuanceConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCertificateIssuanceConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2751,7 +2758,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteCertificateIssuanceConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2785,7 +2792,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2800,7 +2807,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_certificate_issuance_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_certificate_issuance_config`.
@@ -2812,7 +2819,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2849,8 +2856,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCertificateIssuanceConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCertificateIssuanceConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2860,8 +2867,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListTrustConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2895,7 +2902,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2905,14 +2912,16 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_trust_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTrustConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTrustConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2920,15 +2929,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTrustConfigsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTrustConfigsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2966,8 +2977,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTrustConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTrustConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2977,7 +2988,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetTrustConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3005,7 +3016,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3015,7 +3026,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_trust_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTrustConfigRequest::name].
@@ -3028,8 +3039,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTrustConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTrustConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3039,7 +3050,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CreateTrustConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3071,7 +3082,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3086,7 +3097,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .create_trust_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_trust_config`.
@@ -3103,7 +3114,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3170,8 +3181,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTrustConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTrustConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3181,7 +3192,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::UpdateTrustConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3213,7 +3224,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3228,7 +3239,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .update_trust_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_trust_config`.
@@ -3245,7 +3256,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3318,8 +3329,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTrustConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTrustConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3329,7 +3340,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteTrustConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3361,7 +3372,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3376,7 +3387,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_trust_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_trust_config`.
@@ -3388,7 +3399,7 @@ pub mod certificate_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3431,8 +3442,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTrustConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTrustConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3442,8 +3453,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3477,7 +3488,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3487,15 +3498,15 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3504,17 +3515,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3544,8 +3555,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3555,7 +3566,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3586,7 +3597,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3596,7 +3607,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3607,8 +3618,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3618,8 +3629,8 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3655,7 +3666,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3665,15 +3676,15 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3682,17 +3693,17 @@ pub mod certificate_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3728,8 +3739,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3739,7 +3750,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3770,7 +3781,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3780,7 +3791,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3791,8 +3802,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3802,7 +3813,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3835,7 +3846,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3845,7 +3856,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3856,8 +3867,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3867,7 +3878,7 @@ pub mod certificate_manager {
     /// # Example
     /// ```
     /// # use google_cloud_certificatemanager_v1::builder::certificate_manager::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_certificatemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3900,7 +3911,7 @@ pub mod certificate_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3910,7 +3921,7 @@ pub mod certificate_manager {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3921,8 +3932,8 @@ pub mod certificate_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/certificatemanager/v1/src/client.rs b/src/generated/cloud/certificatemanager/v1/src/client.rs
index 1ed2649d26..e4e4ec99c6 100644
--- a/src/generated/cloud/certificatemanager/v1/src/client.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_certificatemanager_v1::client::CertificateManager;
 /// let client = CertificateManager::builder().build().await?;
 /// // use `client` to make requests to the Certificate Manager API.
@@ -92,15 +92,13 @@ impl CertificateManager {
     /// Returns a builder for [CertificateManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_certificatemanager_v1::client::CertificateManager;
     /// let client = CertificateManager::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::certificate_manager::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::certificate_manager::client::Factory,
-        )
+        crate::new_client_builder(super::builder::certificate_manager::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -118,14 +116,14 @@ impl CertificateManager {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CertificateManager>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CertificateManager>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -135,13 +133,13 @@ impl CertificateManager {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CertificateManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CertificateManager> {
         super::transport::CertificateManager::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CertificateManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CertificateManager> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CertificateManager::new)
diff --git a/src/generated/cloud/certificatemanager/v1/src/lib.rs b/src/generated/cloud/certificatemanager/v1/src/lib.rs
index a4c9e2a47b..146e3bff86 100644
--- a/src/generated/cloud/certificatemanager/v1/src/lib.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/certificatemanager/v1/src/model.rs b/src/generated/cloud/certificatemanager/v1/src/model.rs
index 58b8266cfa..803b594471 100644
--- a/src/generated/cloud/certificatemanager/v1/src/model.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -218,7 +218,9 @@ impl wkt::message::Message for ListCertificateIssuanceConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCertificateIssuanceConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListCertificateIssuanceConfigsResponse
+{
     type PageItem = crate::model::CertificateIssuanceConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1097,7 +1099,7 @@ impl wkt::message::Message for ListCertificatesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCertificatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCertificatesResponse {
     type PageItem = crate::model::Certificate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1540,7 +1542,7 @@ impl wkt::message::Message for ListCertificateMapsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCertificateMapsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCertificateMapsResponse {
     type PageItem = crate::model::CertificateMap;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1991,7 +1993,7 @@ impl wkt::message::Message for ListCertificateMapEntriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCertificateMapEntriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCertificateMapEntriesResponse {
     type PageItem = crate::model::CertificateMapEntry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2437,7 +2439,7 @@ impl wkt::message::Message for ListDnsAuthorizationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDnsAuthorizationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDnsAuthorizationsResponse {
     type PageItem = crate::model::DnsAuthorization;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5787,7 +5789,7 @@ impl wkt::message::Message for ListTrustConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTrustConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTrustConfigsResponse {
     type PageItem = crate::model::TrustConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/certificatemanager/v1/src/stub.rs b/src/generated/cloud/certificatemanager/v1/src/stub.rs
index c0807ee465..abf36fd7de 100644
--- a/src/generated/cloud/certificatemanager/v1/src/stub.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_certificates(
         &self,
         _req: crate::model::ListCertificatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCertificatesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCertificatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_certificate(
         &self,
         _req: crate::model::GetCertificateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Certificate>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Certificate>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn create_certificate(
         &self,
         _req: crate::model::CreateCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn update_certificate(
         &self,
         _req: crate::model::UpdateCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_certificate(
         &self,
         _req: crate::model::DeleteCertificateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_certificate_maps(
         &self,
         _req: crate::model::ListCertificateMapsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCertificateMapsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCertificateMapsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_certificate_map(
         &self,
         _req: crate::model::GetCertificateMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CertificateMap>>,
+        Output = crate::Result<crate::Response<crate::model::CertificateMap>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn create_certificate_map(
         &self,
         _req: crate::model::CreateCertificateMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +129,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn update_certificate_map(
         &self,
         _req: crate::model::UpdateCertificateMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +140,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_certificate_map(
         &self,
         _req: crate::model::DeleteCertificateMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,11 +151,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_certificate_map_entries(
         &self,
         _req: crate::model::ListCertificateMapEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListCertificateMapEntriesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListCertificateMapEntriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,9 +162,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_certificate_map_entry(
         &self,
         _req: crate::model::GetCertificateMapEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CertificateMapEntry>>,
+        Output = crate::Result<crate::Response<crate::model::CertificateMapEntry>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +173,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn create_certificate_map_entry(
         &self,
         _req: crate::model::CreateCertificateMapEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,9 +184,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn update_certificate_map_entry(
         &self,
         _req: crate::model::UpdateCertificateMapEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,9 +195,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_certificate_map_entry(
         &self,
         _req: crate::model::DeleteCertificateMapEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -209,11 +206,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_dns_authorizations(
         &self,
         _req: crate::model::ListDnsAuthorizationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDnsAuthorizationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDnsAuthorizationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -222,9 +217,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_dns_authorization(
         &self,
         _req: crate::model::GetDnsAuthorizationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DnsAuthorization>>,
+        Output = crate::Result<crate::Response<crate::model::DnsAuthorization>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -233,9 +228,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn create_dns_authorization(
         &self,
         _req: crate::model::CreateDnsAuthorizationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -244,9 +239,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn update_dns_authorization(
         &self,
         _req: crate::model::UpdateDnsAuthorizationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -255,9 +250,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_dns_authorization(
         &self,
         _req: crate::model::DeleteDnsAuthorizationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -266,10 +261,10 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_certificate_issuance_configs(
         &self,
         _req: crate::model::ListCertificateIssuanceConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListCertificateIssuanceConfigsResponse>,
+            crate::Response<crate::model::ListCertificateIssuanceConfigsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -279,9 +274,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_certificate_issuance_config(
         &self,
         _req: crate::model::GetCertificateIssuanceConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CertificateIssuanceConfig>>,
+        Output = crate::Result<crate::Response<crate::model::CertificateIssuanceConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -290,9 +285,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn create_certificate_issuance_config(
         &self,
         _req: crate::model::CreateCertificateIssuanceConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -301,9 +296,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_certificate_issuance_config(
         &self,
         _req: crate::model::DeleteCertificateIssuanceConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -312,9 +307,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_trust_configs(
         &self,
         _req: crate::model::ListTrustConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTrustConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTrustConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -323,10 +318,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_trust_config(
         &self,
         _req: crate::model::GetTrustConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TrustConfig>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TrustConfig>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -334,9 +328,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn create_trust_config(
         &self,
         _req: crate::model::CreateTrustConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -345,9 +339,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn update_trust_config(
         &self,
         _req: crate::model::UpdateTrustConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -356,9 +350,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_trust_config(
         &self,
         _req: crate::model::DeleteTrustConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -367,10 +361,10 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -380,9 +374,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -391,10 +385,10 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -404,9 +398,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -415,8 +409,8 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -424,8 +418,8 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -435,9 +429,9 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -446,8 +440,8 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/certificatemanager/v1/src/stub/dynamic.rs b/src/generated/cloud/certificatemanager/v1/src/stub/dynamic.rs
index c3703b9897..f9f62d3e10 100644
--- a/src/generated/cloud/certificatemanager/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/stub/dynamic.rs
@@ -20,224 +20,222 @@ pub trait CertificateManager: std::fmt::Debug + Send + Sync {
     async fn list_certificates(
         &self,
         req: crate::model::ListCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificatesResponse>>;
 
     async fn get_certificate(
         &self,
         req: crate::model::GetCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Certificate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Certificate>>;
 
     async fn create_certificate(
         &self,
         req: crate::model::CreateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_certificate(
         &self,
         req: crate::model::UpdateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_certificate(
         &self,
         req: crate::model::DeleteCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_certificate_maps(
         &self,
         req: crate::model::ListCertificateMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificateMapsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificateMapsResponse>>;
 
     async fn get_certificate_map(
         &self,
         req: crate::model::GetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateMap>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateMap>>;
 
     async fn create_certificate_map(
         &self,
         req: crate::model::CreateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_certificate_map(
         &self,
         req: crate::model::UpdateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_certificate_map(
         &self,
         req: crate::model::DeleteCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_certificate_map_entries(
         &self,
         req: crate::model::ListCertificateMapEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificateMapEntriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificateMapEntriesResponse>>;
 
     async fn get_certificate_map_entry(
         &self,
         req: crate::model::GetCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateMapEntry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateMapEntry>>;
 
     async fn create_certificate_map_entry(
         &self,
         req: crate::model::CreateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_certificate_map_entry(
         &self,
         req: crate::model::UpdateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_certificate_map_entry(
         &self,
         req: crate::model::DeleteCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_dns_authorizations(
         &self,
         req: crate::model::ListDnsAuthorizationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDnsAuthorizationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDnsAuthorizationsResponse>>;
 
     async fn get_dns_authorization(
         &self,
         req: crate::model::GetDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DnsAuthorization>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DnsAuthorization>>;
 
     async fn create_dns_authorization(
         &self,
         req: crate::model::CreateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_dns_authorization(
         &self,
         req: crate::model::UpdateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_dns_authorization(
         &self,
         req: crate::model::DeleteDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_certificate_issuance_configs(
         &self,
         req: crate::model::ListCertificateIssuanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificateIssuanceConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificateIssuanceConfigsResponse>>;
 
     async fn get_certificate_issuance_config(
         &self,
         req: crate::model::GetCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateIssuanceConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateIssuanceConfig>>;
 
     async fn create_certificate_issuance_config(
         &self,
         req: crate::model::CreateCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_certificate_issuance_config(
         &self,
         req: crate::model::DeleteCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_trust_configs(
         &self,
         req: crate::model::ListTrustConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTrustConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTrustConfigsResponse>>;
 
     async fn get_trust_config(
         &self,
         req: crate::model::GetTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TrustConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TrustConfig>>;
 
     async fn create_trust_config(
         &self,
         req: crate::model::CreateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_trust_config(
         &self,
         req: crate::model::UpdateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_trust_config(
         &self,
         req: crate::model::DeleteTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CertificateManager] also implement [CertificateManager].
@@ -247,8 +245,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_certificates(
         &self,
         req: crate::model::ListCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificatesResponse>> {
         T::list_certificates(self, req, options).await
     }
 
@@ -256,8 +254,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_certificate(
         &self,
         req: crate::model::GetCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Certificate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Certificate>> {
         T::get_certificate(self, req, options).await
     }
 
@@ -265,8 +263,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn create_certificate(
         &self,
         req: crate::model::CreateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_certificate(self, req, options).await
     }
 
@@ -274,8 +272,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn update_certificate(
         &self,
         req: crate::model::UpdateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_certificate(self, req, options).await
     }
 
@@ -283,8 +281,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_certificate(
         &self,
         req: crate::model::DeleteCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_certificate(self, req, options).await
     }
 
@@ -292,8 +290,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_certificate_maps(
         &self,
         req: crate::model::ListCertificateMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificateMapsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificateMapsResponse>> {
         T::list_certificate_maps(self, req, options).await
     }
 
@@ -301,8 +299,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_certificate_map(
         &self,
         req: crate::model::GetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateMap>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateMap>> {
         T::get_certificate_map(self, req, options).await
     }
 
@@ -310,8 +308,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn create_certificate_map(
         &self,
         req: crate::model::CreateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_certificate_map(self, req, options).await
     }
 
@@ -319,8 +317,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn update_certificate_map(
         &self,
         req: crate::model::UpdateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_certificate_map(self, req, options).await
     }
 
@@ -328,8 +326,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_certificate_map(
         &self,
         req: crate::model::DeleteCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_certificate_map(self, req, options).await
     }
 
@@ -337,9 +335,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_certificate_map_entries(
         &self,
         req: crate::model::ListCertificateMapEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificateMapEntriesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificateMapEntriesResponse>> {
         T::list_certificate_map_entries(self, req, options).await
     }
 
@@ -347,8 +344,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_certificate_map_entry(
         &self,
         req: crate::model::GetCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateMapEntry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateMapEntry>> {
         T::get_certificate_map_entry(self, req, options).await
     }
 
@@ -356,8 +353,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn create_certificate_map_entry(
         &self,
         req: crate::model::CreateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_certificate_map_entry(self, req, options).await
     }
 
@@ -365,8 +362,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn update_certificate_map_entry(
         &self,
         req: crate::model::UpdateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_certificate_map_entry(self, req, options).await
     }
 
@@ -374,8 +371,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_certificate_map_entry(
         &self,
         req: crate::model::DeleteCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_certificate_map_entry(self, req, options).await
     }
 
@@ -383,8 +380,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_dns_authorizations(
         &self,
         req: crate::model::ListDnsAuthorizationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDnsAuthorizationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDnsAuthorizationsResponse>> {
         T::list_dns_authorizations(self, req, options).await
     }
 
@@ -392,8 +389,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_dns_authorization(
         &self,
         req: crate::model::GetDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DnsAuthorization>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DnsAuthorization>> {
         T::get_dns_authorization(self, req, options).await
     }
 
@@ -401,8 +398,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn create_dns_authorization(
         &self,
         req: crate::model::CreateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_dns_authorization(self, req, options).await
     }
 
@@ -410,8 +407,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn update_dns_authorization(
         &self,
         req: crate::model::UpdateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_dns_authorization(self, req, options).await
     }
 
@@ -419,8 +416,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_dns_authorization(
         &self,
         req: crate::model::DeleteDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_dns_authorization(self, req, options).await
     }
 
@@ -428,9 +425,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_certificate_issuance_configs(
         &self,
         req: crate::model::ListCertificateIssuanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCertificateIssuanceConfigsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCertificateIssuanceConfigsResponse>> {
         T::list_certificate_issuance_configs(self, req, options).await
     }
 
@@ -438,8 +434,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_certificate_issuance_config(
         &self,
         req: crate::model::GetCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateIssuanceConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateIssuanceConfig>> {
         T::get_certificate_issuance_config(self, req, options).await
     }
 
@@ -447,8 +443,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn create_certificate_issuance_config(
         &self,
         req: crate::model::CreateCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_certificate_issuance_config(self, req, options).await
     }
 
@@ -456,8 +452,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_certificate_issuance_config(
         &self,
         req: crate::model::DeleteCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_certificate_issuance_config(self, req, options).await
     }
 
@@ -465,8 +461,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_trust_configs(
         &self,
         req: crate::model::ListTrustConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTrustConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTrustConfigsResponse>> {
         T::list_trust_configs(self, req, options).await
     }
 
@@ -474,8 +470,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_trust_config(
         &self,
         req: crate::model::GetTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TrustConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TrustConfig>> {
         T::get_trust_config(self, req, options).await
     }
 
@@ -483,8 +479,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn create_trust_config(
         &self,
         req: crate::model::CreateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_trust_config(self, req, options).await
     }
 
@@ -492,8 +488,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn update_trust_config(
         &self,
         req: crate::model::UpdateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_trust_config(self, req, options).await
     }
 
@@ -501,8 +497,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_trust_config(
         &self,
         req: crate::model::DeleteTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_trust_config(self, req, options).await
     }
 
@@ -510,9 +506,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -520,8 +515,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -529,10 +524,9 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -540,8 +534,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -549,8 +543,8 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -558,22 +552,22 @@ impl<T: super::CertificateManager> CertificateManager for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/certificatemanager/v1/src/tracing.rs b/src/generated/cloud/certificatemanager/v1/src/tracing.rs
index 6da33284c7..6d2b44dc67 100644
--- a/src/generated/cloud/certificatemanager/v1/src/tracing.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_certificates(
         &self,
         req: crate::model::ListCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificatesResponse>> {
         self.inner.list_certificates(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_certificate(
         &self,
         req: crate::model::GetCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Certificate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Certificate>> {
         self.inner.get_certificate(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_certificate(
         &self,
         req: crate::model::CreateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_certificate(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_certificate(
         &self,
         req: crate::model::UpdateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_certificate(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_certificate(
         &self,
         req: crate::model::DeleteCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_certificate(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_certificate_maps(
         &self,
         req: crate::model::ListCertificateMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificateMapsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificateMapsResponse>> {
         self.inner.list_certificate_maps(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_certificate_map(
         &self,
         req: crate::model::GetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateMap>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateMap>> {
         self.inner.get_certificate_map(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_certificate_map(
         &self,
         req: crate::model::CreateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_certificate_map(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_certificate_map(
         &self,
         req: crate::model::UpdateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_certificate_map(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_certificate_map(
         &self,
         req: crate::model::DeleteCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_certificate_map(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_certificate_map_entries(
         &self,
         req: crate::model::ListCertificateMapEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificateMapEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificateMapEntriesResponse>> {
         self.inner.list_certificate_map_entries(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_certificate_map_entry(
         &self,
         req: crate::model::GetCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateMapEntry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateMapEntry>> {
         self.inner.get_certificate_map_entry(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn create_certificate_map_entry(
         &self,
         req: crate::model::CreateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_certificate_map_entry(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn update_certificate_map_entry(
         &self,
         req: crate::model::UpdateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_certificate_map_entry(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn delete_certificate_map_entry(
         &self,
         req: crate::model::DeleteCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_certificate_map_entry(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn list_dns_authorizations(
         &self,
         req: crate::model::ListDnsAuthorizationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDnsAuthorizationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDnsAuthorizationsResponse>> {
         self.inner.list_dns_authorizations(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn get_dns_authorization(
         &self,
         req: crate::model::GetDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DnsAuthorization>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DnsAuthorization>> {
         self.inner.get_dns_authorization(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn create_dns_authorization(
         &self,
         req: crate::model::CreateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_dns_authorization(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn update_dns_authorization(
         &self,
         req: crate::model::UpdateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_dns_authorization(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn delete_dns_authorization(
         &self,
         req: crate::model::DeleteDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_dns_authorization(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_certificate_issuance_configs(
         &self,
         req: crate::model::ListCertificateIssuanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificateIssuanceConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificateIssuanceConfigsResponse>> {
         self.inner
             .list_certificate_issuance_configs(req, options)
             .await
@@ -232,8 +232,8 @@ where
     async fn get_certificate_issuance_config(
         &self,
         req: crate::model::GetCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateIssuanceConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateIssuanceConfig>> {
         self.inner
             .get_certificate_issuance_config(req, options)
             .await
@@ -243,8 +243,8 @@ where
     async fn create_certificate_issuance_config(
         &self,
         req: crate::model::CreateCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_certificate_issuance_config(req, options)
             .await
@@ -254,8 +254,8 @@ where
     async fn delete_certificate_issuance_config(
         &self,
         req: crate::model::DeleteCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_certificate_issuance_config(req, options)
             .await
@@ -265,8 +265,8 @@ where
     async fn list_trust_configs(
         &self,
         req: crate::model::ListTrustConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTrustConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTrustConfigsResponse>> {
         self.inner.list_trust_configs(req, options).await
     }
 
@@ -274,8 +274,8 @@ where
     async fn get_trust_config(
         &self,
         req: crate::model::GetTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TrustConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TrustConfig>> {
         self.inner.get_trust_config(req, options).await
     }
 
@@ -283,8 +283,8 @@ where
     async fn create_trust_config(
         &self,
         req: crate::model::CreateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_trust_config(req, options).await
     }
 
@@ -292,8 +292,8 @@ where
     async fn update_trust_config(
         &self,
         req: crate::model::UpdateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_trust_config(req, options).await
     }
 
@@ -301,8 +301,8 @@ where
     async fn delete_trust_config(
         &self,
         req: crate::model::DeleteTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_trust_config(req, options).await
     }
 
@@ -310,8 +310,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -319,8 +319,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -328,9 +328,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -338,8 +337,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -347,8 +346,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -356,22 +355,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/certificatemanager/v1/src/transport.rs b/src/generated/cloud/certificatemanager/v1/src/transport.rs
index b54d35d30b..4be485a287 100644
--- a/src/generated/cloud/certificatemanager/v1/src/transport.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CertificateManager](super::stub::CertificateManager) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CertificateManager {
 }
 
 impl CertificateManager {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_certificates(
         &self,
         req: crate::model::ListCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_certificate(
         &self,
         req: crate::model::GetCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Certificate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Certificate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn create_certificate(
         &self,
         req: crate::model::CreateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn update_certificate(
         &self,
         req: crate::model::UpdateCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_certificate(
         &self,
         req: crate::model::DeleteCertificateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -378,13 +378,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_certificate_maps(
         &self,
         req: crate::model::ListCertificateMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificateMapsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificateMapsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_certificate_map(
         &self,
         req: crate::model::GetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateMap>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateMap>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +489,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,13 +506,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn create_certificate_map(
         &self,
         req: crate::model::CreateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -550,9 +550,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -567,13 +567,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn update_certificate_map(
         &self,
         req: crate::model::UpdateCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -632,9 +632,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -649,13 +649,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_certificate_map(
         &self,
         req: crate::model::DeleteCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -696,9 +696,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -713,13 +713,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_certificate_map_entries(
         &self,
         req: crate::model::ListCertificateMapEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificateMapEntriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificateMapEntriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -764,9 +764,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -781,13 +781,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_certificate_map_entry(
         &self,
         req: crate::model::GetCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateMapEntry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateMapEntry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -832,9 +832,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -849,13 +849,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn create_certificate_map_entry(
         &self,
         req: crate::model::CreateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -898,9 +898,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -915,13 +915,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn update_certificate_map_entry(
         &self,
         req: crate::model::UpdateCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -984,9 +984,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1001,13 +1001,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_certificate_map_entry(
         &self,
         req: crate::model::DeleteCertificateMapEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1052,9 +1052,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1069,13 +1069,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_dns_authorizations(
         &self,
         req: crate::model::ListDnsAuthorizationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDnsAuthorizationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDnsAuthorizationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1116,9 +1116,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1133,13 +1133,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_dns_authorization(
         &self,
         req: crate::model::GetDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DnsAuthorization>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DnsAuthorization>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1180,9 +1180,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1197,13 +1197,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn create_dns_authorization(
         &self,
         req: crate::model::CreateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1241,9 +1241,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1258,13 +1258,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn update_dns_authorization(
         &self,
         req: crate::model::UpdateDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1323,9 +1323,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1340,13 +1340,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_dns_authorization(
         &self,
         req: crate::model::DeleteDnsAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1387,9 +1387,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1404,13 +1404,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_certificate_issuance_configs(
         &self,
         req: crate::model::ListCertificateIssuanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCertificateIssuanceConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCertificateIssuanceConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1451,9 +1451,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1468,13 +1468,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_certificate_issuance_config(
         &self,
         req: crate::model::GetCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateIssuanceConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateIssuanceConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1515,9 +1515,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1532,13 +1532,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn create_certificate_issuance_config(
         &self,
         req: crate::model::CreateCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1579,9 +1579,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1596,13 +1596,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_certificate_issuance_config(
         &self,
         req: crate::model::DeleteCertificateIssuanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1643,9 +1643,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1660,13 +1660,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_trust_configs(
         &self,
         req: crate::model::ListTrustConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTrustConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTrustConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1707,9 +1707,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1724,13 +1724,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_trust_config(
         &self,
         req: crate::model::GetTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TrustConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TrustConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1771,9 +1771,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1788,13 +1788,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn create_trust_config(
         &self,
         req: crate::model::CreateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1832,9 +1832,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1849,13 +1849,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn update_trust_config(
         &self,
         req: crate::model::UpdateTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1914,9 +1914,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1931,13 +1931,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_trust_config(
         &self,
         req: crate::model::DeleteTrustConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1979,9 +1979,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1996,13 +1996,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2032,9 +2032,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2049,13 +2049,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2092,9 +2092,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2109,14 +2109,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2158,9 +2157,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2175,13 +2174,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2222,9 +2221,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2239,13 +2238,13 @@ impl super::stub::CertificateManager for CertificateManager {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2286,9 +2285,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2297,24 +2296,25 @@ impl super::stub::CertificateManager for CertificateManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2355,9 +2355,9 @@ impl super::stub::CertificateManager for CertificateManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2366,25 +2366,26 @@ impl super::stub::CertificateManager for CertificateManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/chronicle/v1/Cargo.toml b/src/generated/cloud/chronicle/v1/Cargo.toml
index a1e9c5be87..341d144f47 100644
--- a/src/generated/cloud/chronicle/v1/Cargo.toml
+++ b/src/generated/cloud/chronicle/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 google-cloud-type.workspace        = true
diff --git a/src/generated/cloud/chronicle/v1/src/builder.rs b/src/generated/cloud/chronicle/v1/src/builder.rs
index ceeaf92c76..34e3e8f7dd 100644
--- a/src/generated/cloud/chronicle/v1/src/builder.rs
+++ b/src/generated/cloud/chronicle/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_access_control_service {
     /// A builder for [DataAccessControlService][crate::client::DataAccessControlService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::*;
     /// # use builder::data_access_control_service::ClientBuilder;
     /// # use client::DataAccessControlService;
@@ -30,19 +30,18 @@ pub mod data_access_control_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataAccessControlService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataAccessControlService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_access_control_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataAccessControlService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_access_control_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::CreateDataAccessLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .create_data_access_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDataAccessLabelRequest::parent].
@@ -160,8 +159,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataAccessLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataAccessLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -171,7 +170,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::GetDataAccessLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -202,7 +201,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -212,7 +211,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .get_data_access_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataAccessLabelRequest::name].
@@ -225,8 +224,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataAccessLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataAccessLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -236,8 +235,8 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::ListDataAccessLabels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -271,7 +270,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -281,14 +280,16 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .list_data_access_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataAccessLabelsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataAccessLabelsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -296,17 +297,17 @@ pub mod data_access_control_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataAccessLabelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -338,8 +339,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataAccessLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataAccessLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -349,7 +350,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::UpdateDataAccessLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -380,7 +381,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -390,7 +391,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .update_data_access_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_access_label][crate::model::UpdateDataAccessLabelRequest::data_access_label].
@@ -435,8 +436,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataAccessLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataAccessLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -446,7 +447,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::DeleteDataAccessLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -477,7 +478,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -487,7 +488,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .delete_data_access_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDataAccessLabelRequest::name].
@@ -500,8 +501,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataAccessLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataAccessLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -511,7 +512,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::CreateDataAccessScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -542,7 +543,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -552,7 +553,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .create_data_access_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDataAccessScopeRequest::parent].
@@ -595,8 +596,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataAccessScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataAccessScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -606,7 +607,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::GetDataAccessScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -637,7 +638,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -647,7 +648,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .get_data_access_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataAccessScopeRequest::name].
@@ -660,8 +661,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataAccessScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataAccessScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -671,8 +672,8 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::ListDataAccessScopes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -706,7 +707,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -716,14 +717,16 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .list_data_access_scopes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataAccessScopesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataAccessScopesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -731,17 +734,17 @@ pub mod data_access_control_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataAccessScopesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -773,8 +776,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataAccessScopes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataAccessScopes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -784,7 +787,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::UpdateDataAccessScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -815,7 +818,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -825,7 +828,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .update_data_access_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_access_scope][crate::model::UpdateDataAccessScopeRequest::data_access_scope].
@@ -870,8 +873,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataAccessScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataAccessScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -881,7 +884,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::DeleteDataAccessScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -912,7 +915,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -922,7 +925,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .delete_data_access_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDataAccessScopeRequest::name].
@@ -935,8 +938,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataAccessScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataAccessScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -946,8 +949,8 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -983,7 +986,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -993,15 +996,15 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1010,17 +1013,17 @@ pub mod data_access_control_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1056,8 +1059,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1067,7 +1070,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1098,7 +1101,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1108,7 +1111,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1119,8 +1122,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1130,7 +1133,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1163,7 +1166,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1173,7 +1176,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1184,8 +1187,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1195,7 +1198,7 @@ pub mod data_access_control_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::data_access_control_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1228,7 +1231,7 @@ pub mod data_access_control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1238,7 +1241,7 @@ pub mod data_access_control_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1249,8 +1252,8 @@ pub mod data_access_control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1262,7 +1265,7 @@ pub mod entity_service {
     /// A builder for [EntityService][crate::client::EntityService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::*;
     /// # use builder::entity_service::ClientBuilder;
     /// # use client::EntityService;
@@ -1272,19 +1275,18 @@ pub mod entity_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EntityService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EntityService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1295,7 +1297,7 @@ pub mod entity_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EntityService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1308,7 +1310,7 @@ pub mod entity_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1318,7 +1320,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::GetWatchlist;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1346,7 +1348,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1356,7 +1358,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .get_watchlist(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWatchlistRequest::name].
@@ -1369,8 +1371,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWatchlist {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWatchlist {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1380,8 +1382,8 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::ListWatchlists;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1412,7 +1414,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1422,14 +1424,16 @@ pub mod entity_service {
             (*self.0.stub)
                 .list_watchlists(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWatchlistsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListWatchlistsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1437,15 +1441,17 @@ pub mod entity_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListWatchlistsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListWatchlistsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1477,8 +1483,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWatchlists {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWatchlists {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1488,7 +1494,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::CreateWatchlist;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1516,7 +1522,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1526,7 +1532,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .create_watchlist(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateWatchlistRequest::parent].
@@ -1567,8 +1573,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWatchlist {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWatchlist {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1578,7 +1584,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::UpdateWatchlist;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1606,7 +1612,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1616,7 +1622,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .update_watchlist(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [watchlist][crate::model::UpdateWatchlistRequest::watchlist].
@@ -1661,8 +1667,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateWatchlist {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateWatchlist {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1672,7 +1678,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::DeleteWatchlist;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1700,7 +1706,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1710,7 +1716,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .delete_watchlist(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWatchlistRequest::name].
@@ -1729,8 +1735,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWatchlist {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWatchlist {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1740,8 +1746,8 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1777,7 +1783,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1787,15 +1793,15 @@ pub mod entity_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1804,17 +1810,17 @@ pub mod entity_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1850,8 +1856,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1861,7 +1867,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1892,7 +1898,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1902,7 +1908,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1913,8 +1919,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1924,7 +1930,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1957,7 +1963,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1967,7 +1973,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1978,8 +1984,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1989,7 +1995,7 @@ pub mod entity_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::entity_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2022,7 +2028,7 @@ pub mod entity_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2032,7 +2038,7 @@ pub mod entity_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2043,8 +2049,8 @@ pub mod entity_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2056,7 +2062,7 @@ pub mod instance_service {
     /// A builder for [InstanceService][crate::client::InstanceService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::*;
     /// # use builder::instance_service::ClientBuilder;
     /// # use client::InstanceService;
@@ -2066,19 +2072,18 @@ pub mod instance_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstanceService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstanceService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2089,7 +2094,7 @@ pub mod instance_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstanceService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2102,7 +2107,7 @@ pub mod instance_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2112,7 +2117,7 @@ pub mod instance_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::instance_service::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2140,7 +2145,7 @@ pub mod instance_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2150,7 +2155,7 @@ pub mod instance_service {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -2163,8 +2168,8 @@ pub mod instance_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2174,8 +2179,8 @@ pub mod instance_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::instance_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2211,7 +2216,7 @@ pub mod instance_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2221,15 +2226,15 @@ pub mod instance_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2238,17 +2243,17 @@ pub mod instance_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2284,8 +2289,8 @@ pub mod instance_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2295,7 +2300,7 @@ pub mod instance_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::instance_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2326,7 +2331,7 @@ pub mod instance_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2336,7 +2341,7 @@ pub mod instance_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2347,8 +2352,8 @@ pub mod instance_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2358,7 +2363,7 @@ pub mod instance_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::instance_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2391,7 +2396,7 @@ pub mod instance_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2401,7 +2406,7 @@ pub mod instance_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2412,8 +2417,8 @@ pub mod instance_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2423,7 +2428,7 @@ pub mod instance_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::instance_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2456,7 +2461,7 @@ pub mod instance_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2466,7 +2471,7 @@ pub mod instance_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2477,8 +2482,8 @@ pub mod instance_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2490,7 +2495,7 @@ pub mod reference_list_service {
     /// A builder for [ReferenceListService][crate::client::ReferenceListService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::*;
     /// # use builder::reference_list_service::ClientBuilder;
     /// # use client::ReferenceListService;
@@ -2500,19 +2505,18 @@ pub mod reference_list_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReferenceListService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReferenceListService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2523,7 +2527,7 @@ pub mod reference_list_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReferenceListService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2536,7 +2540,7 @@ pub mod reference_list_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2546,7 +2550,7 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::GetReferenceList;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2577,7 +2581,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2587,7 +2591,7 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .get_reference_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReferenceListRequest::name].
@@ -2606,8 +2610,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReferenceList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReferenceList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2617,8 +2621,8 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::ListReferenceLists;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2652,7 +2656,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2662,14 +2666,16 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .list_reference_lists(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReferenceListsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReferenceListsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2677,17 +2683,17 @@ pub mod reference_list_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListReferenceListsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2719,8 +2725,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReferenceLists {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReferenceLists {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2730,7 +2736,7 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::CreateReferenceList;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2761,7 +2767,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2771,7 +2777,7 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .create_reference_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateReferenceListRequest::parent].
@@ -2814,8 +2820,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReferenceList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReferenceList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2825,7 +2831,7 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::UpdateReferenceList;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2856,7 +2862,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2866,7 +2872,7 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .update_reference_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [reference_list][crate::model::UpdateReferenceListRequest::reference_list].
@@ -2911,8 +2917,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateReferenceList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateReferenceList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2922,8 +2928,8 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2959,7 +2965,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2969,15 +2975,15 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2986,17 +2992,17 @@ pub mod reference_list_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3032,8 +3038,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3043,7 +3049,7 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3074,7 +3080,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3084,7 +3090,7 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3095,8 +3101,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3106,7 +3112,7 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3139,7 +3145,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3149,7 +3155,7 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3160,8 +3166,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3171,7 +3177,7 @@ pub mod reference_list_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::reference_list_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3204,7 +3210,7 @@ pub mod reference_list_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3214,7 +3220,7 @@ pub mod reference_list_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3225,8 +3231,8 @@ pub mod reference_list_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3238,7 +3244,7 @@ pub mod rule_service {
     /// A builder for [RuleService][crate::client::RuleService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::*;
     /// # use builder::rule_service::ClientBuilder;
     /// # use client::RuleService;
@@ -3248,19 +3254,18 @@ pub mod rule_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RuleService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RuleService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3271,7 +3276,7 @@ pub mod rule_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RuleService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3284,7 +3289,7 @@ pub mod rule_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3294,7 +3299,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::CreateRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3322,7 +3327,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3332,7 +3337,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .create_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateRuleRequest::parent].
@@ -3367,8 +3372,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3378,7 +3383,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3406,7 +3411,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3416,7 +3421,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRuleRequest::name].
@@ -3435,8 +3440,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3446,8 +3451,8 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::ListRules;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3478,7 +3483,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3488,13 +3493,13 @@ pub mod rule_service {
             (*self.0.stub)
                 .list_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRulesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRulesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3503,15 +3508,15 @@ pub mod rule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRulesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListRulesResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3549,8 +3554,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3560,7 +3565,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::UpdateRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3588,7 +3593,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3598,7 +3603,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .update_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [rule][crate::model::UpdateRuleRequest::rule].
@@ -3643,8 +3648,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3654,7 +3659,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::DeleteRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3682,7 +3687,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3692,7 +3697,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .delete_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteRuleRequest::name].
@@ -3711,8 +3716,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3722,8 +3727,8 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::ListRuleRevisions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3757,7 +3762,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3767,14 +3772,16 @@ pub mod rule_service {
             (*self.0.stub)
                 .list_rule_revisions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRuleRevisionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRuleRevisionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3782,15 +3789,17 @@ pub mod rule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRuleRevisionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRuleRevisionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3822,8 +3831,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuleRevisions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuleRevisions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3833,7 +3842,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::CreateRetrohunt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3862,7 +3871,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3877,7 +3886,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .create_retrohunt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_retrohunt`.
@@ -3894,7 +3903,7 @@ pub mod rule_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3953,8 +3962,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRetrohunt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRetrohunt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3964,7 +3973,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::GetRetrohunt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3992,7 +4001,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4002,7 +4011,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .get_retrohunt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRetrohuntRequest::name].
@@ -4015,8 +4024,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRetrohunt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRetrohunt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4026,8 +4035,8 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::ListRetrohunts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4058,7 +4067,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4068,14 +4077,16 @@ pub mod rule_service {
             (*self.0.stub)
                 .list_retrohunts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRetrohuntsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRetrohuntsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4083,15 +4094,17 @@ pub mod rule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRetrohuntsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRetrohuntsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4123,8 +4136,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRetrohunts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRetrohunts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4134,7 +4147,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::GetRuleDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4165,7 +4178,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4175,7 +4188,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .get_rule_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRuleDeploymentRequest::name].
@@ -4188,8 +4201,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRuleDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRuleDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4199,8 +4212,8 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::ListRuleDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4234,7 +4247,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4244,14 +4257,16 @@ pub mod rule_service {
             (*self.0.stub)
                 .list_rule_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRuleDeploymentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRuleDeploymentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4259,17 +4274,17 @@ pub mod rule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRuleDeploymentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4301,8 +4316,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuleDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuleDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4312,7 +4327,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::UpdateRuleDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4343,7 +4358,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4353,7 +4368,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .update_rule_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [rule_deployment][crate::model::UpdateRuleDeploymentRequest::rule_deployment].
@@ -4402,8 +4417,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRuleDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRuleDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4413,8 +4428,8 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4450,7 +4465,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4460,15 +4475,15 @@ pub mod rule_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4477,17 +4492,17 @@ pub mod rule_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4523,8 +4538,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4534,7 +4549,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4565,7 +4580,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4575,7 +4590,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4586,8 +4601,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4597,7 +4612,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4630,7 +4645,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4640,7 +4655,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4651,8 +4666,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4662,7 +4677,7 @@ pub mod rule_service {
     /// # Example
     /// ```
     /// # use google_cloud_chronicle_v1::builder::rule_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_chronicle_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4695,7 +4710,7 @@ pub mod rule_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4705,7 +4720,7 @@ pub mod rule_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4716,8 +4731,8 @@ pub mod rule_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/chronicle/v1/src/client.rs b/src/generated/cloud/chronicle/v1/src/client.rs
index 815cf69254..1d3f6af18e 100644
--- a/src/generated/cloud/chronicle/v1/src/client.rs
+++ b/src/generated/cloud/chronicle/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_chronicle_v1::client::DataAccessControlService;
 /// let client = DataAccessControlService::builder().build().await?;
 /// // use `client` to make requests to the Chronicle API.
@@ -67,15 +67,13 @@ impl DataAccessControlService {
     /// Returns a builder for [DataAccessControlService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::client::DataAccessControlService;
     /// let client = DataAccessControlService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_access_control_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_access_control_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_access_control_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -93,14 +91,14 @@ impl DataAccessControlService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::DataAccessControlService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -111,13 +109,13 @@ impl DataAccessControlService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataAccessControlService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataAccessControlService> {
         super::transport::DataAccessControlService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataAccessControlService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataAccessControlService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataAccessControlService::new)
@@ -238,7 +236,7 @@ impl DataAccessControlService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_chronicle_v1::client::EntityService;
 /// let client = EntityService::builder().build().await?;
 /// // use `client` to make requests to the Chronicle API.
@@ -284,13 +282,13 @@ impl EntityService {
     /// Returns a builder for [EntityService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::client::EntityService;
     /// let client = EntityService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::entity_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::entity_service::client::Factory)
+        crate::new_client_builder(super::builder::entity_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -308,14 +306,14 @@ impl EntityService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EntityService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EntityService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -324,13 +322,13 @@ impl EntityService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EntityService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EntityService> {
         super::transport::EntityService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EntityService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EntityService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EntityService::new)
@@ -395,7 +393,7 @@ impl EntityService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_chronicle_v1::client::InstanceService;
 /// let client = InstanceService::builder().build().await?;
 /// // use `client` to make requests to the Chronicle API.
@@ -441,15 +439,13 @@ impl InstanceService {
     /// Returns a builder for [InstanceService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::client::InstanceService;
     /// let client = InstanceService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instance_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::instance_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::instance_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -467,15 +463,14 @@ impl InstanceService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InstanceService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InstanceService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -484,13 +479,13 @@ impl InstanceService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceService> {
         super::transport::InstanceService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstanceService::new)
@@ -534,7 +529,7 @@ impl InstanceService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_chronicle_v1::client::ReferenceListService;
 /// let client = ReferenceListService::builder().build().await?;
 /// // use `client` to make requests to the Chronicle API.
@@ -580,15 +575,13 @@ impl ReferenceListService {
     /// Returns a builder for [ReferenceListService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::client::ReferenceListService;
     /// let client = ReferenceListService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reference_list_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::reference_list_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::reference_list_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -606,14 +599,14 @@ impl ReferenceListService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ReferenceListService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ReferenceListService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -623,13 +616,13 @@ impl ReferenceListService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReferenceListService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReferenceListService> {
         super::transport::ReferenceListService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReferenceListService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReferenceListService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReferenceListService::new)
@@ -694,7 +687,7 @@ impl ReferenceListService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_chronicle_v1::client::RuleService;
 /// let client = RuleService::builder().build().await?;
 /// // use `client` to make requests to the Chronicle API.
@@ -740,13 +733,13 @@ impl RuleService {
     /// Returns a builder for [RuleService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_chronicle_v1::client::RuleService;
     /// let client = RuleService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::rule_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::rule_service::client::Factory)
+        crate::new_client_builder(super::builder::rule_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -764,14 +757,14 @@ impl RuleService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RuleService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RuleService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -780,13 +773,13 @@ impl RuleService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RuleService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RuleService> {
         super::transport::RuleService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RuleService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RuleService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RuleService::new)
diff --git a/src/generated/cloud/chronicle/v1/src/lib.rs b/src/generated/cloud/chronicle/v1/src/lib.rs
index 4438644c4b..6305bfa9ad 100644
--- a/src/generated/cloud/chronicle/v1/src/lib.rs
+++ b/src/generated/cloud/chronicle/v1/src/lib.rs
@@ -48,8 +48,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -84,3 +84,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/chronicle/v1/src/model.rs b/src/generated/cloud/chronicle/v1/src/model.rs
index 21efbff0cb..57c40a9786 100644
--- a/src/generated/cloud/chronicle/v1/src/model.rs
+++ b/src/generated/cloud/chronicle/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate google_cloud_type;
@@ -313,7 +313,7 @@ impl wkt::message::Message for ListDataAccessLabelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataAccessLabelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataAccessLabelsResponse {
     type PageItem = crate::model::DataAccessLabel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -773,7 +773,7 @@ impl wkt::message::Message for ListDataAccessScopesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataAccessScopesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataAccessScopesResponse {
     type PageItem = crate::model::DataAccessScope;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2379,7 +2379,7 @@ impl wkt::message::Message for ListWatchlistsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWatchlistsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWatchlistsResponse {
     type PageItem = crate::model::Watchlist;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3010,7 +3010,7 @@ impl wkt::message::Message for ListReferenceListsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReferenceListsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReferenceListsResponse {
     type PageItem = crate::model::ReferenceList;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5072,7 +5072,7 @@ impl wkt::message::Message for ListRulesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRulesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRulesResponse {
     type PageItem = crate::model::Rule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5391,7 +5391,7 @@ impl wkt::message::Message for ListRuleRevisionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRuleRevisionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRuleRevisionsResponse {
     type PageItem = crate::model::Rule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5663,7 +5663,7 @@ impl wkt::message::Message for ListRetrohuntsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRetrohuntsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRetrohuntsResponse {
     type PageItem = crate::model::Retrohunt;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5864,7 +5864,7 @@ impl wkt::message::Message for ListRuleDeploymentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRuleDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRuleDeploymentsResponse {
     type PageItem = crate::model::RuleDeployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/chronicle/v1/src/stub.rs b/src/generated/cloud/chronicle/v1/src/stub.rs
index 908a97a251..e1f8a057b4 100644
--- a/src/generated/cloud/chronicle/v1/src/stub.rs
+++ b/src/generated/cloud/chronicle/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn create_data_access_label(
         &self,
         _req: crate::model::CreateDataAccessLabelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAccessLabel>>,
+        Output = crate::Result<crate::Response<crate::model::DataAccessLabel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn get_data_access_label(
         &self,
         _req: crate::model::GetDataAccessLabelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAccessLabel>>,
+        Output = crate::Result<crate::Response<crate::model::DataAccessLabel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn list_data_access_labels(
         &self,
         _req: crate::model::ListDataAccessLabelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataAccessLabelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataAccessLabelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn update_data_access_label(
         &self,
         _req: crate::model::UpdateDataAccessLabelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAccessLabel>>,
+        Output = crate::Result<crate::Response<crate::model::DataAccessLabel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,8 +86,8 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn delete_data_access_label(
         &self,
         _req: crate::model::DeleteDataAccessLabelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +95,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn create_data_access_scope(
         &self,
         _req: crate::model::CreateDataAccessScopeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAccessScope>>,
+        Output = crate::Result<crate::Response<crate::model::DataAccessScope>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,9 +106,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn get_data_access_scope(
         &self,
         _req: crate::model::GetDataAccessScopeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAccessScope>>,
+        Output = crate::Result<crate::Response<crate::model::DataAccessScope>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,9 +117,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn list_data_access_scopes(
         &self,
         _req: crate::model::ListDataAccessScopesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataAccessScopesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataAccessScopesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,9 +128,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn update_data_access_scope(
         &self,
         _req: crate::model::UpdateDataAccessScopeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAccessScope>>,
+        Output = crate::Result<crate::Response<crate::model::DataAccessScope>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,8 +139,8 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn delete_data_access_scope(
         &self,
         _req: crate::model::DeleteDataAccessScopeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -148,10 +148,10 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -161,9 +161,9 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -172,8 +172,8 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -181,8 +181,8 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -203,10 +203,9 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn get_watchlist(
         &self,
         _req: crate::model::GetWatchlistRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Watchlist>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Watchlist>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -214,9 +213,9 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn list_watchlists(
         &self,
         _req: crate::model::ListWatchlistsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWatchlistsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWatchlistsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -225,10 +224,9 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn create_watchlist(
         &self,
         _req: crate::model::CreateWatchlistRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Watchlist>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Watchlist>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -236,10 +234,9 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn update_watchlist(
         &self,
         _req: crate::model::UpdateWatchlistRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Watchlist>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Watchlist>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -247,8 +244,8 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn delete_watchlist(
         &self,
         _req: crate::model::DeleteWatchlistRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -256,10 +253,10 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -269,9 +266,9 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -280,8 +277,8 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -289,8 +286,8 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -311,10 +308,9 @@ pub trait InstanceService: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -322,10 +318,10 @@ pub trait InstanceService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -335,9 +331,9 @@ pub trait InstanceService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -346,8 +342,8 @@ pub trait InstanceService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -355,8 +351,8 @@ pub trait InstanceService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -377,9 +373,9 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn get_reference_list(
         &self,
         _req: crate::model::GetReferenceListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReferenceList>>,
+        Output = crate::Result<crate::Response<crate::model::ReferenceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -388,9 +384,9 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn list_reference_lists(
         &self,
         _req: crate::model::ListReferenceListsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReferenceListsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReferenceListsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -399,9 +395,9 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn create_reference_list(
         &self,
         _req: crate::model::CreateReferenceListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReferenceList>>,
+        Output = crate::Result<crate::Response<crate::model::ReferenceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -410,9 +406,9 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn update_reference_list(
         &self,
         _req: crate::model::UpdateReferenceListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReferenceList>>,
+        Output = crate::Result<crate::Response<crate::model::ReferenceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -421,10 +417,10 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -434,9 +430,9 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -445,8 +441,8 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -454,8 +450,8 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -476,10 +472,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn create_rule(
         &self,
         _req: crate::model::CreateRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Rule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Rule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -487,10 +482,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::GetRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Rule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Rule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -498,9 +492,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn list_rules(
         &self,
         _req: crate::model::ListRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRulesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -509,10 +503,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn update_rule(
         &self,
         _req: crate::model::UpdateRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Rule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Rule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -520,8 +513,8 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn delete_rule(
         &self,
         _req: crate::model::DeleteRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -529,9 +522,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn list_rule_revisions(
         &self,
         _req: crate::model::ListRuleRevisionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRuleRevisionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRuleRevisionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -540,9 +533,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn create_retrohunt(
         &self,
         _req: crate::model::CreateRetrohuntRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -551,10 +544,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn get_retrohunt(
         &self,
         _req: crate::model::GetRetrohuntRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Retrohunt>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Retrohunt>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -562,9 +554,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn list_retrohunts(
         &self,
         _req: crate::model::ListRetrohuntsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRetrohuntsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRetrohuntsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -573,9 +565,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn get_rule_deployment(
         &self,
         _req: crate::model::GetRuleDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RuleDeployment>>,
+        Output = crate::Result<crate::Response<crate::model::RuleDeployment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -584,9 +576,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn list_rule_deployments(
         &self,
         _req: crate::model::ListRuleDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRuleDeploymentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRuleDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -595,9 +587,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn update_rule_deployment(
         &self,
         _req: crate::model::UpdateRuleDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RuleDeployment>>,
+        Output = crate::Result<crate::Response<crate::model::RuleDeployment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -606,10 +598,10 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -619,9 +611,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -630,8 +622,8 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -639,8 +631,8 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -650,9 +642,9 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -661,8 +653,8 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/chronicle/v1/src/stub/dynamic.rs b/src/generated/cloud/chronicle/v1/src/stub/dynamic.rs
index 39ea8907dd..62a7ae8c74 100644
--- a/src/generated/cloud/chronicle/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/chronicle/v1/src/stub/dynamic.rs
@@ -20,88 +20,86 @@ pub trait DataAccessControlService: std::fmt::Debug + Send + Sync {
     async fn create_data_access_label(
         &self,
         req: crate::model::CreateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessLabel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessLabel>>;
 
     async fn get_data_access_label(
         &self,
         req: crate::model::GetDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessLabel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessLabel>>;
 
     async fn list_data_access_labels(
         &self,
         req: crate::model::ListDataAccessLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAccessLabelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAccessLabelsResponse>>;
 
     async fn update_data_access_label(
         &self,
         req: crate::model::UpdateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessLabel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessLabel>>;
 
     async fn delete_data_access_label(
         &self,
         req: crate::model::DeleteDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_data_access_scope(
         &self,
         req: crate::model::CreateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessScope>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessScope>>;
 
     async fn get_data_access_scope(
         &self,
         req: crate::model::GetDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessScope>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessScope>>;
 
     async fn list_data_access_scopes(
         &self,
         req: crate::model::ListDataAccessScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAccessScopesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAccessScopesResponse>>;
 
     async fn update_data_access_scope(
         &self,
         req: crate::model::UpdateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessScope>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessScope>>;
 
     async fn delete_data_access_scope(
         &self,
         req: crate::model::DeleteDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::DataAccessControlService] also implement [DataAccessControlService].
@@ -111,8 +109,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn create_data_access_label(
         &self,
         req: crate::model::CreateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessLabel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessLabel>> {
         T::create_data_access_label(self, req, options).await
     }
 
@@ -120,8 +118,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn get_data_access_label(
         &self,
         req: crate::model::GetDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessLabel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessLabel>> {
         T::get_data_access_label(self, req, options).await
     }
 
@@ -129,8 +127,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn list_data_access_labels(
         &self,
         req: crate::model::ListDataAccessLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAccessLabelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAccessLabelsResponse>> {
         T::list_data_access_labels(self, req, options).await
     }
 
@@ -138,8 +136,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn update_data_access_label(
         &self,
         req: crate::model::UpdateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessLabel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessLabel>> {
         T::update_data_access_label(self, req, options).await
     }
 
@@ -147,8 +145,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn delete_data_access_label(
         &self,
         req: crate::model::DeleteDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_data_access_label(self, req, options).await
     }
 
@@ -156,8 +154,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn create_data_access_scope(
         &self,
         req: crate::model::CreateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessScope>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessScope>> {
         T::create_data_access_scope(self, req, options).await
     }
 
@@ -165,8 +163,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn get_data_access_scope(
         &self,
         req: crate::model::GetDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessScope>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessScope>> {
         T::get_data_access_scope(self, req, options).await
     }
 
@@ -174,8 +172,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn list_data_access_scopes(
         &self,
         req: crate::model::ListDataAccessScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAccessScopesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAccessScopesResponse>> {
         T::list_data_access_scopes(self, req, options).await
     }
 
@@ -183,8 +181,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn update_data_access_scope(
         &self,
         req: crate::model::UpdateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAccessScope>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAccessScope>> {
         T::update_data_access_scope(self, req, options).await
     }
 
@@ -192,8 +190,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn delete_data_access_scope(
         &self,
         req: crate::model::DeleteDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_data_access_scope(self, req, options).await
     }
 
@@ -201,10 +199,9 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -212,8 +209,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -221,8 +218,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -230,8 +227,8 @@ impl<T: super::DataAccessControlService> DataAccessControlService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -242,58 +239,56 @@ pub trait EntityService: std::fmt::Debug + Send + Sync {
     async fn get_watchlist(
         &self,
         req: crate::model::GetWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Watchlist>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Watchlist>>;
 
     async fn list_watchlists(
         &self,
         req: crate::model::ListWatchlistsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWatchlistsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWatchlistsResponse>>;
 
     async fn create_watchlist(
         &self,
         req: crate::model::CreateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Watchlist>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Watchlist>>;
 
     async fn update_watchlist(
         &self,
         req: crate::model::UpdateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Watchlist>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Watchlist>>;
 
     async fn delete_watchlist(
         &self,
         req: crate::model::DeleteWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::EntityService] also implement [EntityService].
@@ -303,8 +298,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn get_watchlist(
         &self,
         req: crate::model::GetWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Watchlist>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Watchlist>> {
         T::get_watchlist(self, req, options).await
     }
 
@@ -312,8 +307,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn list_watchlists(
         &self,
         req: crate::model::ListWatchlistsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWatchlistsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWatchlistsResponse>> {
         T::list_watchlists(self, req, options).await
     }
 
@@ -321,8 +316,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn create_watchlist(
         &self,
         req: crate::model::CreateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Watchlist>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Watchlist>> {
         T::create_watchlist(self, req, options).await
     }
 
@@ -330,8 +325,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn update_watchlist(
         &self,
         req: crate::model::UpdateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Watchlist>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Watchlist>> {
         T::update_watchlist(self, req, options).await
     }
 
@@ -339,8 +334,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn delete_watchlist(
         &self,
         req: crate::model::DeleteWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_watchlist(self, req, options).await
     }
 
@@ -348,10 +343,9 @@ impl<T: super::EntityService> EntityService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -359,8 +353,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -368,8 +362,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -377,8 +371,8 @@ impl<T: super::EntityService> EntityService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -389,34 +383,32 @@ pub trait InstanceService: std::fmt::Debug + Send + Sync {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::InstanceService] also implement [InstanceService].
@@ -426,8 +418,8 @@ impl<T: super::InstanceService> InstanceService for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -435,10 +427,9 @@ impl<T: super::InstanceService> InstanceService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -446,8 +437,8 @@ impl<T: super::InstanceService> InstanceService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -455,8 +446,8 @@ impl<T: super::InstanceService> InstanceService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -464,8 +455,8 @@ impl<T: super::InstanceService> InstanceService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -476,52 +467,50 @@ pub trait ReferenceListService: std::fmt::Debug + Send + Sync {
     async fn get_reference_list(
         &self,
         req: crate::model::GetReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReferenceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReferenceList>>;
 
     async fn list_reference_lists(
         &self,
         req: crate::model::ListReferenceListsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReferenceListsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReferenceListsResponse>>;
 
     async fn create_reference_list(
         &self,
         req: crate::model::CreateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReferenceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReferenceList>>;
 
     async fn update_reference_list(
         &self,
         req: crate::model::UpdateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReferenceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReferenceList>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ReferenceListService] also implement [ReferenceListService].
@@ -531,8 +520,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn get_reference_list(
         &self,
         req: crate::model::GetReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReferenceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReferenceList>> {
         T::get_reference_list(self, req, options).await
     }
 
@@ -540,8 +529,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn list_reference_lists(
         &self,
         req: crate::model::ListReferenceListsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReferenceListsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReferenceListsResponse>> {
         T::list_reference_lists(self, req, options).await
     }
 
@@ -549,8 +538,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn create_reference_list(
         &self,
         req: crate::model::CreateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReferenceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReferenceList>> {
         T::create_reference_list(self, req, options).await
     }
 
@@ -558,8 +547,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn update_reference_list(
         &self,
         req: crate::model::UpdateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReferenceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReferenceList>> {
         T::update_reference_list(self, req, options).await
     }
 
@@ -567,10 +556,9 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -578,8 +566,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -587,8 +575,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -596,8 +584,8 @@ impl<T: super::ReferenceListService> ReferenceListService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -608,110 +596,108 @@ pub trait RuleService: std::fmt::Debug + Send + Sync {
     async fn create_rule(
         &self,
         req: crate::model::CreateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rule>>;
 
     async fn get_rule(
         &self,
         req: crate::model::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rule>>;
 
     async fn list_rules(
         &self,
         req: crate::model::ListRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRulesResponse>>;
 
     async fn update_rule(
         &self,
         req: crate::model::UpdateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rule>>;
 
     async fn delete_rule(
         &self,
         req: crate::model::DeleteRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_rule_revisions(
         &self,
         req: crate::model::ListRuleRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuleRevisionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuleRevisionsResponse>>;
 
     async fn create_retrohunt(
         &self,
         req: crate::model::CreateRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_retrohunt(
         &self,
         req: crate::model::GetRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Retrohunt>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Retrohunt>>;
 
     async fn list_retrohunts(
         &self,
         req: crate::model::ListRetrohuntsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRetrohuntsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRetrohuntsResponse>>;
 
     async fn get_rule_deployment(
         &self,
         req: crate::model::GetRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuleDeployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuleDeployment>>;
 
     async fn list_rule_deployments(
         &self,
         req: crate::model::ListRuleDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuleDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuleDeploymentsResponse>>;
 
     async fn update_rule_deployment(
         &self,
         req: crate::model::UpdateRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuleDeployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuleDeployment>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RuleService] also implement [RuleService].
@@ -721,8 +707,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn create_rule(
         &self,
         req: crate::model::CreateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rule>> {
         T::create_rule(self, req, options).await
     }
 
@@ -730,8 +716,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn get_rule(
         &self,
         req: crate::model::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -739,8 +725,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn list_rules(
         &self,
         req: crate::model::ListRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRulesResponse>> {
         T::list_rules(self, req, options).await
     }
 
@@ -748,8 +734,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn update_rule(
         &self,
         req: crate::model::UpdateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rule>> {
         T::update_rule(self, req, options).await
     }
 
@@ -757,8 +743,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn delete_rule(
         &self,
         req: crate::model::DeleteRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_rule(self, req, options).await
     }
 
@@ -766,8 +752,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn list_rule_revisions(
         &self,
         req: crate::model::ListRuleRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuleRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuleRevisionsResponse>> {
         T::list_rule_revisions(self, req, options).await
     }
 
@@ -775,8 +761,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn create_retrohunt(
         &self,
         req: crate::model::CreateRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_retrohunt(self, req, options).await
     }
 
@@ -784,8 +770,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn get_retrohunt(
         &self,
         req: crate::model::GetRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Retrohunt>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Retrohunt>> {
         T::get_retrohunt(self, req, options).await
     }
 
@@ -793,8 +779,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn list_retrohunts(
         &self,
         req: crate::model::ListRetrohuntsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRetrohuntsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRetrohuntsResponse>> {
         T::list_retrohunts(self, req, options).await
     }
 
@@ -802,8 +788,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn get_rule_deployment(
         &self,
         req: crate::model::GetRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuleDeployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuleDeployment>> {
         T::get_rule_deployment(self, req, options).await
     }
 
@@ -811,8 +797,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn list_rule_deployments(
         &self,
         req: crate::model::ListRuleDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuleDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuleDeploymentsResponse>> {
         T::list_rule_deployments(self, req, options).await
     }
 
@@ -820,8 +806,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn update_rule_deployment(
         &self,
         req: crate::model::UpdateRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuleDeployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuleDeployment>> {
         T::update_rule_deployment(self, req, options).await
     }
 
@@ -829,10 +815,9 @@ impl<T: super::RuleService> RuleService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -840,8 +825,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -849,8 +834,8 @@ impl<T: super::RuleService> RuleService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -858,22 +843,22 @@ impl<T: super::RuleService> RuleService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/chronicle/v1/src/tracing.rs b/src/generated/cloud/chronicle/v1/src/tracing.rs
index edbeb66884..cbd31fc8ef 100644
--- a/src/generated/cloud/chronicle/v1/src/tracing.rs
+++ b/src/generated/cloud/chronicle/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_data_access_label(
         &self,
         req: crate::model::CreateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessLabel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessLabel>> {
         self.inner.create_data_access_label(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_data_access_label(
         &self,
         req: crate::model::GetDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessLabel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessLabel>> {
         self.inner.get_data_access_label(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_data_access_labels(
         &self,
         req: crate::model::ListDataAccessLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAccessLabelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAccessLabelsResponse>> {
         self.inner.list_data_access_labels(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_data_access_label(
         &self,
         req: crate::model::UpdateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessLabel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessLabel>> {
         self.inner.update_data_access_label(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_data_access_label(
         &self,
         req: crate::model::DeleteDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_data_access_label(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn create_data_access_scope(
         &self,
         req: crate::model::CreateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessScope>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessScope>> {
         self.inner.create_data_access_scope(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_data_access_scope(
         &self,
         req: crate::model::GetDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessScope>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessScope>> {
         self.inner.get_data_access_scope(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_data_access_scopes(
         &self,
         req: crate::model::ListDataAccessScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAccessScopesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAccessScopesResponse>> {
         self.inner.list_data_access_scopes(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_data_access_scope(
         &self,
         req: crate::model::UpdateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessScope>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessScope>> {
         self.inner.update_data_access_scope(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_data_access_scope(
         &self,
         req: crate::model::DeleteDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_data_access_scope(req, options).await
     }
 
@@ -131,9 +131,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -141,8 +140,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -150,8 +149,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -159,8 +158,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -191,8 +190,8 @@ where
     async fn get_watchlist(
         &self,
         req: crate::model::GetWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Watchlist>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Watchlist>> {
         self.inner.get_watchlist(req, options).await
     }
 
@@ -200,8 +199,8 @@ where
     async fn list_watchlists(
         &self,
         req: crate::model::ListWatchlistsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWatchlistsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWatchlistsResponse>> {
         self.inner.list_watchlists(req, options).await
     }
 
@@ -209,8 +208,8 @@ where
     async fn create_watchlist(
         &self,
         req: crate::model::CreateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Watchlist>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Watchlist>> {
         self.inner.create_watchlist(req, options).await
     }
 
@@ -218,8 +217,8 @@ where
     async fn update_watchlist(
         &self,
         req: crate::model::UpdateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Watchlist>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Watchlist>> {
         self.inner.update_watchlist(req, options).await
     }
 
@@ -227,8 +226,8 @@ where
     async fn delete_watchlist(
         &self,
         req: crate::model::DeleteWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_watchlist(req, options).await
     }
 
@@ -236,9 +235,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -246,8 +244,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -255,8 +253,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -264,8 +262,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -296,8 +294,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -305,9 +303,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -315,8 +312,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -324,8 +321,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -333,8 +330,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -365,8 +362,8 @@ where
     async fn get_reference_list(
         &self,
         req: crate::model::GetReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReferenceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReferenceList>> {
         self.inner.get_reference_list(req, options).await
     }
 
@@ -374,8 +371,8 @@ where
     async fn list_reference_lists(
         &self,
         req: crate::model::ListReferenceListsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReferenceListsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReferenceListsResponse>> {
         self.inner.list_reference_lists(req, options).await
     }
 
@@ -383,8 +380,8 @@ where
     async fn create_reference_list(
         &self,
         req: crate::model::CreateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReferenceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReferenceList>> {
         self.inner.create_reference_list(req, options).await
     }
 
@@ -392,8 +389,8 @@ where
     async fn update_reference_list(
         &self,
         req: crate::model::UpdateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReferenceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReferenceList>> {
         self.inner.update_reference_list(req, options).await
     }
 
@@ -401,9 +398,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -411,8 +407,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -420,8 +416,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -429,8 +425,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -461,8 +457,8 @@ where
     async fn create_rule(
         &self,
         req: crate::model::CreateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rule>> {
         self.inner.create_rule(req, options).await
     }
 
@@ -470,8 +466,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -479,8 +475,8 @@ where
     async fn list_rules(
         &self,
         req: crate::model::ListRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRulesResponse>> {
         self.inner.list_rules(req, options).await
     }
 
@@ -488,8 +484,8 @@ where
     async fn update_rule(
         &self,
         req: crate::model::UpdateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rule>> {
         self.inner.update_rule(req, options).await
     }
 
@@ -497,8 +493,8 @@ where
     async fn delete_rule(
         &self,
         req: crate::model::DeleteRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_rule(req, options).await
     }
 
@@ -506,8 +502,8 @@ where
     async fn list_rule_revisions(
         &self,
         req: crate::model::ListRuleRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuleRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuleRevisionsResponse>> {
         self.inner.list_rule_revisions(req, options).await
     }
 
@@ -515,8 +511,8 @@ where
     async fn create_retrohunt(
         &self,
         req: crate::model::CreateRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_retrohunt(req, options).await
     }
 
@@ -524,8 +520,8 @@ where
     async fn get_retrohunt(
         &self,
         req: crate::model::GetRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Retrohunt>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Retrohunt>> {
         self.inner.get_retrohunt(req, options).await
     }
 
@@ -533,8 +529,8 @@ where
     async fn list_retrohunts(
         &self,
         req: crate::model::ListRetrohuntsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRetrohuntsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRetrohuntsResponse>> {
         self.inner.list_retrohunts(req, options).await
     }
 
@@ -542,8 +538,8 @@ where
     async fn get_rule_deployment(
         &self,
         req: crate::model::GetRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuleDeployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuleDeployment>> {
         self.inner.get_rule_deployment(req, options).await
     }
 
@@ -551,8 +547,8 @@ where
     async fn list_rule_deployments(
         &self,
         req: crate::model::ListRuleDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuleDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuleDeploymentsResponse>> {
         self.inner.list_rule_deployments(req, options).await
     }
 
@@ -560,8 +556,8 @@ where
     async fn update_rule_deployment(
         &self,
         req: crate::model::UpdateRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuleDeployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuleDeployment>> {
         self.inner.update_rule_deployment(req, options).await
     }
 
@@ -569,9 +565,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -579,8 +574,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -588,8 +583,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -597,22 +592,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/chronicle/v1/src/transport.rs b/src/generated/cloud/chronicle/v1/src/transport.rs
index 158961eaa2..cbf802f89f 100644
--- a/src/generated/cloud/chronicle/v1/src/transport.rs
+++ b/src/generated/cloud/chronicle/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataAccessControlService](super::stub::DataAccessControlService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataAccessControlService {
 }
 
 impl DataAccessControlService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn create_data_access_label(
         &self,
         req: crate::model::CreateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessLabel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessLabel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -91,9 +91,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -108,13 +108,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn get_data_access_label(
         &self,
         req: crate::model::GetDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessLabel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessLabel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -159,9 +159,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -176,13 +176,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn list_data_access_labels(
         &self,
         req: crate::model::ListDataAccessLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAccessLabelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAccessLabelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -226,9 +226,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -243,13 +243,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn update_data_access_label(
         &self,
         req: crate::model::UpdateDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessLabel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessLabel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -312,9 +312,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -329,13 +329,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn delete_data_access_label(
         &self,
         req: crate::model::DeleteDataAccessLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -380,9 +380,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -391,24 +391,25 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_data_access_scope(
         &self,
         req: crate::model::CreateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessScope>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessScope>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -450,9 +451,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -467,13 +468,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn get_data_access_scope(
         &self,
         req: crate::model::GetDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessScope>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessScope>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -518,9 +519,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -535,13 +536,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn list_data_access_scopes(
         &self,
         req: crate::model::ListDataAccessScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAccessScopesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAccessScopesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -585,9 +586,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -602,13 +603,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn update_data_access_scope(
         &self,
         req: crate::model::UpdateDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAccessScope>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAccessScope>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -671,9 +672,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -688,13 +689,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn delete_data_access_scope(
         &self,
         req: crate::model::DeleteDataAccessScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -739,9 +740,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -750,25 +751,25 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -814,9 +815,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -831,13 +832,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -882,9 +883,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -899,13 +900,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -950,9 +951,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -961,24 +962,25 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1023,9 +1025,9 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1034,12 +1036,13 @@ impl super::stub::DataAccessControlService for DataAccessControlService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1058,7 +1061,7 @@ impl std::fmt::Debug for EntityService {
 }
 
 impl EntityService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1068,13 +1071,13 @@ impl super::stub::EntityService for EntityService {
     async fn get_watchlist(
         &self,
         req: crate::model::GetWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Watchlist>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Watchlist>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1119,9 +1122,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1136,13 +1139,13 @@ impl super::stub::EntityService for EntityService {
     async fn list_watchlists(
         &self,
         req: crate::model::ListWatchlistsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWatchlistsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWatchlistsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1186,9 +1189,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1203,13 +1206,13 @@ impl super::stub::EntityService for EntityService {
     async fn create_watchlist(
         &self,
         req: crate::model::CreateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Watchlist>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Watchlist>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1251,9 +1254,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1268,13 +1271,13 @@ impl super::stub::EntityService for EntityService {
     async fn update_watchlist(
         &self,
         req: crate::model::UpdateWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Watchlist>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Watchlist>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1337,9 +1340,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1354,13 +1357,13 @@ impl super::stub::EntityService for EntityService {
     async fn delete_watchlist(
         &self,
         req: crate::model::DeleteWatchlistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1406,9 +1409,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1417,25 +1420,25 @@ impl super::stub::EntityService for EntityService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1481,9 +1484,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1498,13 +1501,13 @@ impl super::stub::EntityService for EntityService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1549,9 +1552,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1566,13 +1569,13 @@ impl super::stub::EntityService for EntityService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1617,9 +1620,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1628,24 +1631,25 @@ impl super::stub::EntityService for EntityService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1690,9 +1694,9 @@ impl super::stub::EntityService for EntityService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1701,12 +1705,13 @@ impl super::stub::EntityService for EntityService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1725,7 +1730,7 @@ impl std::fmt::Debug for InstanceService {
 }
 
 impl InstanceService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1735,13 +1740,13 @@ impl super::stub::InstanceService for InstanceService {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1782,9 +1787,9 @@ impl super::stub::InstanceService for InstanceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1799,14 +1804,13 @@ impl super::stub::InstanceService for InstanceService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1852,9 +1856,9 @@ impl super::stub::InstanceService for InstanceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1869,13 +1873,13 @@ impl super::stub::InstanceService for InstanceService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1920,9 +1924,9 @@ impl super::stub::InstanceService for InstanceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1937,13 +1941,13 @@ impl super::stub::InstanceService for InstanceService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1988,9 +1992,9 @@ impl super::stub::InstanceService for InstanceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1999,24 +2003,25 @@ impl super::stub::InstanceService for InstanceService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2061,9 +2066,9 @@ impl super::stub::InstanceService for InstanceService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2072,12 +2077,13 @@ impl super::stub::InstanceService for InstanceService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -2096,7 +2102,7 @@ impl std::fmt::Debug for ReferenceListService {
 }
 
 impl ReferenceListService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2106,13 +2112,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn get_reference_list(
         &self,
         req: crate::model::GetReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReferenceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReferenceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2158,9 +2164,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2175,13 +2181,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn list_reference_lists(
         &self,
         req: crate::model::ListReferenceListsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReferenceListsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReferenceListsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2225,9 +2231,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2242,13 +2248,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn create_reference_list(
         &self,
         req: crate::model::CreateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReferenceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReferenceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2290,9 +2296,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2307,13 +2313,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn update_reference_list(
         &self,
         req: crate::model::UpdateReferenceListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReferenceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReferenceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2376,9 +2382,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2393,14 +2399,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2446,9 +2451,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2463,13 +2468,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2514,9 +2519,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2531,13 +2536,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2582,9 +2587,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2593,24 +2598,25 @@ impl super::stub::ReferenceListService for ReferenceListService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2655,9 +2661,9 @@ impl super::stub::ReferenceListService for ReferenceListService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2666,12 +2672,13 @@ impl super::stub::ReferenceListService for ReferenceListService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -2690,7 +2697,7 @@ impl std::fmt::Debug for RuleService {
 }
 
 impl RuleService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2700,13 +2707,13 @@ impl super::stub::RuleService for RuleService {
     async fn create_rule(
         &self,
         req: crate::model::CreateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2747,9 +2754,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2764,13 +2771,13 @@ impl super::stub::RuleService for RuleService {
     async fn get_rule(
         &self,
         req: crate::model::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2816,9 +2823,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2833,13 +2840,13 @@ impl super::stub::RuleService for RuleService {
     async fn list_rules(
         &self,
         req: crate::model::ListRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2884,9 +2891,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2901,13 +2908,13 @@ impl super::stub::RuleService for RuleService {
     async fn update_rule(
         &self,
         req: crate::model::UpdateRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2970,9 +2977,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2987,13 +2994,13 @@ impl super::stub::RuleService for RuleService {
     async fn delete_rule(
         &self,
         req: crate::model::DeleteRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3039,9 +3046,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3050,24 +3057,25 @@ impl super::stub::RuleService for RuleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_rule_revisions(
         &self,
         req: crate::model::ListRuleRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuleRevisionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuleRevisionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3115,9 +3123,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3132,13 +3140,13 @@ impl super::stub::RuleService for RuleService {
     async fn create_retrohunt(
         &self,
         req: crate::model::CreateRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3183,9 +3191,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3200,13 +3208,13 @@ impl super::stub::RuleService for RuleService {
     async fn get_retrohunt(
         &self,
         req: crate::model::GetRetrohuntRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Retrohunt>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Retrohunt>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3255,9 +3263,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3272,13 +3280,13 @@ impl super::stub::RuleService for RuleService {
     async fn list_retrohunts(
         &self,
         req: crate::model::ListRetrohuntsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRetrohuntsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRetrohuntsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3326,9 +3334,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3343,13 +3351,13 @@ impl super::stub::RuleService for RuleService {
     async fn get_rule_deployment(
         &self,
         req: crate::model::GetRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuleDeployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuleDeployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3396,9 +3404,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3413,13 +3421,13 @@ impl super::stub::RuleService for RuleService {
     async fn list_rule_deployments(
         &self,
         req: crate::model::ListRuleDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuleDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuleDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3467,9 +3475,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3484,13 +3492,13 @@ impl super::stub::RuleService for RuleService {
     async fn update_rule_deployment(
         &self,
         req: crate::model::UpdateRuleDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuleDeployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuleDeployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3555,9 +3563,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3572,14 +3580,13 @@ impl super::stub::RuleService for RuleService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3625,9 +3632,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3642,13 +3649,13 @@ impl super::stub::RuleService for RuleService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3693,9 +3700,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3710,13 +3717,13 @@ impl super::stub::RuleService for RuleService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3761,9 +3768,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3772,24 +3779,25 @@ impl super::stub::RuleService for RuleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3834,9 +3842,9 @@ impl super::stub::RuleService for RuleService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3845,25 +3853,26 @@ impl super::stub::RuleService for RuleService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml b/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml
index 993011d5c8..37864536ed 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml
+++ b/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace       = true
 bytes.workspace             = true
-gax.workspace               = true
 gaxi                        = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace  = true
 google-cloud-type.workspace = true
 lazy_static.workspace       = true
 serde.workspace             = true
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/builder.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/builder.rs
index 4df44d36bd..b01e2488ae 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/builder.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_controls_partner_core {
     /// A builder for [CloudControlsPartnerCore][crate::client::CloudControlsPartnerCore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudcontrolspartner_v1::*;
     /// # use builder::cloud_controls_partner_core::ClientBuilder;
     /// # use client::CloudControlsPartnerCore;
@@ -30,19 +30,18 @@ pub mod cloud_controls_partner_core {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudControlsPartnerCore;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudControlsPartnerCore;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_controls_partner_core {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudControlsPartnerCore>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_controls_partner_core {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::GetWorkload;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .get_workload(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkloadRequest::name].
@@ -127,8 +126,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkload {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkload {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -138,8 +137,8 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::ListWorkloads;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -170,7 +169,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -180,13 +179,13 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .list_workloads(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWorkloadsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListWorkloadsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -195,15 +194,17 @@ pub mod cloud_controls_partner_core {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListWorkloadsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListWorkloadsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -241,8 +242,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkloads {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkloads {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::GetCustomer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -280,7 +281,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -290,7 +291,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .get_customer(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCustomerRequest::name].
@@ -303,8 +304,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCustomer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCustomer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -314,8 +315,8 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::ListCustomers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -346,7 +347,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -356,13 +357,13 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .list_customers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCustomersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListCustomersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -371,15 +372,17 @@ pub mod cloud_controls_partner_core {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCustomersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCustomersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -417,8 +420,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCustomers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCustomers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -428,7 +431,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::GetEkmConnections;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -459,7 +462,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -469,7 +472,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .get_ekm_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEkmConnectionsRequest::name].
@@ -482,8 +485,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEkmConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEkmConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -493,7 +496,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::GetPartnerPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -524,7 +527,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -534,7 +537,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .get_partner_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPartnerPermissionsRequest::name].
@@ -547,8 +550,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPartnerPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPartnerPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -558,8 +561,8 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::ListAccessApprovalRequests;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -595,7 +598,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -605,15 +608,15 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .list_access_approval_requests(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListAccessApprovalRequestsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -622,17 +625,17 @@ pub mod cloud_controls_partner_core {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAccessApprovalRequestsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -670,8 +673,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAccessApprovalRequests {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAccessApprovalRequests {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -681,7 +684,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::GetPartner;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -709,7 +712,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -719,7 +722,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .get_partner(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPartnerRequest::name].
@@ -732,8 +735,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPartner {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPartner {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -743,7 +746,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::CreateCustomer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -771,7 +774,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -781,7 +784,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .create_customer(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCustomerRequest::parent].
@@ -824,8 +827,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCustomer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCustomer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -835,7 +838,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::UpdateCustomer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -863,7 +866,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -873,7 +876,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .update_customer(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [customer][crate::model::UpdateCustomerRequest::customer].
@@ -918,8 +921,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCustomer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCustomer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -929,7 +932,7 @@ pub mod cloud_controls_partner_core {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_core::DeleteCustomer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -957,7 +960,7 @@ pub mod cloud_controls_partner_core {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -967,7 +970,7 @@ pub mod cloud_controls_partner_core {
             (*self.0.stub)
                 .delete_customer(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteCustomerRequest::name].
@@ -980,8 +983,8 @@ pub mod cloud_controls_partner_core {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCustomer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCustomer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -993,7 +996,7 @@ pub mod cloud_controls_partner_monitoring {
     /// A builder for [CloudControlsPartnerMonitoring][crate::client::CloudControlsPartnerMonitoring].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudcontrolspartner_v1::*;
     /// # use builder::cloud_controls_partner_monitoring::ClientBuilder;
     /// # use client::CloudControlsPartnerMonitoring;
@@ -1003,19 +1006,18 @@ pub mod cloud_controls_partner_monitoring {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudControlsPartnerMonitoring;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudControlsPartnerMonitoring;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1026,7 +1028,7 @@ pub mod cloud_controls_partner_monitoring {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudControlsPartnerMonitoring>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1039,7 +1041,7 @@ pub mod cloud_controls_partner_monitoring {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1049,8 +1051,8 @@ pub mod cloud_controls_partner_monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_monitoring::ListViolations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1081,7 +1083,7 @@ pub mod cloud_controls_partner_monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1091,14 +1093,16 @@ pub mod cloud_controls_partner_monitoring {
             (*self.0.stub)
                 .list_violations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListViolationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListViolationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1106,15 +1110,17 @@ pub mod cloud_controls_partner_monitoring {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListViolationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListViolationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1170,8 +1176,8 @@ pub mod cloud_controls_partner_monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListViolations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListViolations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1181,7 +1187,7 @@ pub mod cloud_controls_partner_monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudcontrolspartner_v1::builder::cloud_controls_partner_monitoring::GetViolation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudcontrolspartner_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1209,7 +1215,7 @@ pub mod cloud_controls_partner_monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1219,7 +1225,7 @@ pub mod cloud_controls_partner_monitoring {
             (*self.0.stub)
                 .get_violation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetViolationRequest::name].
@@ -1232,8 +1238,8 @@ pub mod cloud_controls_partner_monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetViolation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetViolation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/client.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/client.rs
index 1fa9cae9bd..0d9bdafd23 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/client.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudcontrolspartner_v1::client::CloudControlsPartnerCore;
 /// let client = CloudControlsPartnerCore::builder().build().await?;
 /// // use `client` to make requests to the Cloud Controls Partner API.
@@ -66,15 +66,13 @@ impl CloudControlsPartnerCore {
     /// Returns a builder for [CloudControlsPartnerCore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudcontrolspartner_v1::client::CloudControlsPartnerCore;
     /// let client = CloudControlsPartnerCore::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_controls_partner_core::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cloud_controls_partner_core::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cloud_controls_partner_core::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl CloudControlsPartnerCore {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::CloudControlsPartnerCore>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -110,13 +108,13 @@ impl CloudControlsPartnerCore {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudControlsPartnerCore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudControlsPartnerCore> {
         super::transport::CloudControlsPartnerCore::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudControlsPartnerCore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudControlsPartnerCore> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudControlsPartnerCore::new)
@@ -192,7 +190,7 @@ impl CloudControlsPartnerCore {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudcontrolspartner_v1::client::CloudControlsPartnerMonitoring;
 /// let client = CloudControlsPartnerMonitoring::builder().build().await?;
 /// // use `client` to make requests to the Cloud Controls Partner API.
@@ -238,13 +236,13 @@ impl CloudControlsPartnerMonitoring {
     /// Returns a builder for [CloudControlsPartnerMonitoring].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudcontrolspartner_v1::client::CloudControlsPartnerMonitoring;
     /// let client = CloudControlsPartnerMonitoring::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_controls_partner_monitoring::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::cloud_controls_partner_monitoring::client::Factory,
         )
     }
@@ -264,14 +262,14 @@ impl CloudControlsPartnerMonitoring {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::CloudControlsPartnerMonitoring>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -282,13 +280,13 @@ impl CloudControlsPartnerMonitoring {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudControlsPartnerMonitoring> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudControlsPartnerMonitoring> {
         super::transport::CloudControlsPartnerMonitoring::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudControlsPartnerMonitoring> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudControlsPartnerMonitoring> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudControlsPartnerMonitoring::new)
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/lib.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/lib.rs
index 359f87d67d..71d1ca0357 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/lib.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/lib.rs
@@ -47,8 +47,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -83,3 +83,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs
index 79ad3ab3a7..0721a6d406 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_type;
 extern crate lazy_static;
 extern crate serde;
@@ -359,7 +359,9 @@ impl wkt::message::Message for ListAccessApprovalRequestsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAccessApprovalRequestsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListAccessApprovalRequestsResponse
+{
     type PageItem = crate::model::AccessApprovalRequest;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1355,7 +1357,7 @@ impl wkt::message::Message for ListWorkloadsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkloadsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkloadsResponse {
     type PageItem = crate::model::Workload;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2017,7 +2019,7 @@ impl wkt::message::Message for ListCustomersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCustomersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCustomersResponse {
     type PageItem = crate::model::Customer;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4957,7 +4959,7 @@ impl wkt::message::Message for ListViolationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListViolationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListViolationsResponse {
     type PageItem = crate::model::Violation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/stub.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/stub.rs
index bb51dc6bae..566367af54 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/stub.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn get_workload(
         &self,
         _req: crate::model::GetWorkloadRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Workload>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Workload>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn list_workloads(
         &self,
         _req: crate::model::ListWorkloadsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWorkloadsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +63,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn get_customer(
         &self,
         _req: crate::model::GetCustomerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Customer>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Customer>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +73,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn list_customers(
         &self,
         _req: crate::model::ListCustomersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCustomersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCustomersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +84,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn get_ekm_connections(
         &self,
         _req: crate::model::GetEkmConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EkmConnections>>,
+        Output = crate::Result<crate::Response<crate::model::EkmConnections>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +95,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn get_partner_permissions(
         &self,
         _req: crate::model::GetPartnerPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PartnerPermissions>>,
+        Output = crate::Result<crate::Response<crate::model::PartnerPermissions>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,11 +106,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn list_access_approval_requests(
         &self,
         _req: crate::model::ListAccessApprovalRequestsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAccessApprovalRequestsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAccessApprovalRequestsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,10 +117,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn get_partner(
         &self,
         _req: crate::model::GetPartnerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Partner>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Partner>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -132,10 +127,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn create_customer(
         &self,
         _req: crate::model::CreateCustomerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Customer>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Customer>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -143,10 +137,9 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn update_customer(
         &self,
         _req: crate::model::UpdateCustomerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Customer>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Customer>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -154,8 +147,8 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     fn delete_customer(
         &self,
         _req: crate::model::DeleteCustomerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -176,9 +169,9 @@ pub trait CloudControlsPartnerMonitoring: std::fmt::Debug + Send + Sync {
     fn list_violations(
         &self,
         _req: crate::model::ListViolationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListViolationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListViolationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,10 +180,9 @@ pub trait CloudControlsPartnerMonitoring: std::fmt::Debug + Send + Sync {
     fn get_violation(
         &self,
         _req: crate::model::GetViolationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Violation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Violation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/stub/dynamic.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/stub/dynamic.rs
index 9f0efc0a1f..00d122846c 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/stub/dynamic.rs
@@ -20,68 +20,68 @@ pub trait CloudControlsPartnerCore: std::fmt::Debug + Send + Sync {
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>>;
 
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkloadsResponse>>;
 
     async fn get_customer(
         &self,
         req: crate::model::GetCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Customer>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Customer>>;
 
     async fn list_customers(
         &self,
         req: crate::model::ListCustomersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomersResponse>>;
 
     async fn get_ekm_connections(
         &self,
         req: crate::model::GetEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnections>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnections>>;
 
     async fn get_partner_permissions(
         &self,
         req: crate::model::GetPartnerPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PartnerPermissions>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PartnerPermissions>>;
 
     async fn list_access_approval_requests(
         &self,
         req: crate::model::ListAccessApprovalRequestsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAccessApprovalRequestsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAccessApprovalRequestsResponse>>;
 
     async fn get_partner(
         &self,
         req: crate::model::GetPartnerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Partner>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Partner>>;
 
     async fn create_customer(
         &self,
         req: crate::model::CreateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Customer>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Customer>>;
 
     async fn update_customer(
         &self,
         req: crate::model::UpdateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Customer>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Customer>>;
 
     async fn delete_customer(
         &self,
         req: crate::model::DeleteCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::CloudControlsPartnerCore] also implement [CloudControlsPartnerCore].
@@ -91,8 +91,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workload>> {
         T::get_workload(self, req, options).await
     }
 
@@ -100,8 +100,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         T::list_workloads(self, req, options).await
     }
 
@@ -109,8 +109,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn get_customer(
         &self,
         req: crate::model::GetCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Customer>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Customer>> {
         T::get_customer(self, req, options).await
     }
 
@@ -118,8 +118,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn list_customers(
         &self,
         req: crate::model::ListCustomersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomersResponse>> {
         T::list_customers(self, req, options).await
     }
 
@@ -127,8 +127,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn get_ekm_connections(
         &self,
         req: crate::model::GetEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnections>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnections>> {
         T::get_ekm_connections(self, req, options).await
     }
 
@@ -136,8 +136,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn get_partner_permissions(
         &self,
         req: crate::model::GetPartnerPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PartnerPermissions>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PartnerPermissions>> {
         T::get_partner_permissions(self, req, options).await
     }
 
@@ -145,9 +145,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn list_access_approval_requests(
         &self,
         req: crate::model::ListAccessApprovalRequestsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAccessApprovalRequestsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAccessApprovalRequestsResponse>> {
         T::list_access_approval_requests(self, req, options).await
     }
 
@@ -155,8 +154,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn get_partner(
         &self,
         req: crate::model::GetPartnerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Partner>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Partner>> {
         T::get_partner(self, req, options).await
     }
 
@@ -164,8 +163,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn create_customer(
         &self,
         req: crate::model::CreateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Customer>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Customer>> {
         T::create_customer(self, req, options).await
     }
 
@@ -173,8 +172,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn update_customer(
         &self,
         req: crate::model::UpdateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Customer>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Customer>> {
         T::update_customer(self, req, options).await
     }
 
@@ -182,8 +181,8 @@ impl<T: super::CloudControlsPartnerCore> CloudControlsPartnerCore for T {
     async fn delete_customer(
         &self,
         req: crate::model::DeleteCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_customer(self, req, options).await
     }
 }
@@ -194,14 +193,14 @@ pub trait CloudControlsPartnerMonitoring: std::fmt::Debug + Send + Sync {
     async fn list_violations(
         &self,
         req: crate::model::ListViolationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListViolationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListViolationsResponse>>;
 
     async fn get_violation(
         &self,
         req: crate::model::GetViolationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Violation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Violation>>;
 }
 
 /// All implementations of [super::CloudControlsPartnerMonitoring] also implement [CloudControlsPartnerMonitoring].
@@ -211,8 +210,8 @@ impl<T: super::CloudControlsPartnerMonitoring> CloudControlsPartnerMonitoring fo
     async fn list_violations(
         &self,
         req: crate::model::ListViolationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListViolationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListViolationsResponse>> {
         T::list_violations(self, req, options).await
     }
 
@@ -220,8 +219,8 @@ impl<T: super::CloudControlsPartnerMonitoring> CloudControlsPartnerMonitoring fo
     async fn get_violation(
         &self,
         req: crate::model::GetViolationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Violation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Violation>> {
         T::get_violation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/tracing.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/tracing.rs
index 11b3a1e372..9265f96c76 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/tracing.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         self.inner.get_workload(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         self.inner.list_workloads(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_customer(
         &self,
         req: crate::model::GetCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Customer>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Customer>> {
         self.inner.get_customer(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_customers(
         &self,
         req: crate::model::ListCustomersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomersResponse>> {
         self.inner.list_customers(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_ekm_connections(
         &self,
         req: crate::model::GetEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnections>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnections>> {
         self.inner.get_ekm_connections(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_partner_permissions(
         &self,
         req: crate::model::GetPartnerPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PartnerPermissions>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PartnerPermissions>> {
         self.inner.get_partner_permissions(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_access_approval_requests(
         &self,
         req: crate::model::ListAccessApprovalRequestsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAccessApprovalRequestsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAccessApprovalRequestsResponse>> {
         self.inner.list_access_approval_requests(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_partner(
         &self,
         req: crate::model::GetPartnerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Partner>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Partner>> {
         self.inner.get_partner(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn create_customer(
         &self,
         req: crate::model::CreateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Customer>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Customer>> {
         self.inner.create_customer(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn update_customer(
         &self,
         req: crate::model::UpdateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Customer>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Customer>> {
         self.inner.update_customer(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_customer(
         &self,
         req: crate::model::DeleteCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_customer(req, options).await
     }
 }
@@ -163,8 +163,8 @@ where
     async fn list_violations(
         &self,
         req: crate::model::ListViolationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListViolationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListViolationsResponse>> {
         self.inner.list_violations(req, options).await
     }
 
@@ -172,8 +172,8 @@ where
     async fn get_violation(
         &self,
         req: crate::model::GetViolationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Violation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Violation>> {
         self.inner.get_violation(req, options).await
     }
 }
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs
index 273d5bafc5..dd7ce8b783 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudControlsPartnerCore](super::stub::CloudControlsPartnerCore) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudControlsPartnerCore {
 }
 
 impl CloudControlsPartnerCore {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn get_workload(
         &self,
         req: crate::model::GetWorkloadRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workload>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workload>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -94,9 +94,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -111,13 +111,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn list_workloads(
         &self,
         req: crate::model::ListWorkloadsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkloadsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkloadsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162,9 +162,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -179,13 +179,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn get_customer(
         &self,
         req: crate::model::GetCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Customer>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Customer>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -226,9 +226,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -243,13 +243,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn list_customers(
         &self,
         req: crate::model::ListCustomersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -290,9 +290,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -307,13 +307,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn get_ekm_connections(
         &self,
         req: crate::model::GetEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnections>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnections>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -360,9 +360,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -377,13 +377,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn get_partner_permissions(
         &self,
         req: crate::model::GetPartnerPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PartnerPermissions>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PartnerPermissions>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430,9 +430,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -447,13 +447,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn list_access_approval_requests(
         &self,
         req: crate::model::ListAccessApprovalRequestsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAccessApprovalRequestsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAccessApprovalRequestsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -502,9 +502,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -519,13 +519,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn get_partner(
         &self,
         req: crate::model::GetPartnerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Partner>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Partner>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -564,9 +564,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -581,13 +581,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn create_customer(
         &self,
         req: crate::model::CreateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Customer>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Customer>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -625,9 +625,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -642,13 +642,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn update_customer(
         &self,
         req: crate::model::UpdateCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Customer>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Customer>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -707,9 +707,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -724,13 +724,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
     async fn delete_customer(
         &self,
         req: crate::model::DeleteCustomerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -771,9 +771,9 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -782,12 +782,13 @@ impl super::stub::CloudControlsPartnerCore for CloudControlsPartnerCore {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -806,7 +807,7 @@ impl std::fmt::Debug for CloudControlsPartnerMonitoring {
 }
 
 impl CloudControlsPartnerMonitoring {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -816,13 +817,13 @@ impl super::stub::CloudControlsPartnerMonitoring for CloudControlsPartnerMonitor
     async fn list_violations(
         &self,
         req: crate::model::ListViolationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListViolationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListViolationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -883,9 +884,9 @@ impl super::stub::CloudControlsPartnerMonitoring for CloudControlsPartnerMonitor
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -900,13 +901,13 @@ impl super::stub::CloudControlsPartnerMonitoring for CloudControlsPartnerMonitor
     async fn get_violation(
         &self,
         req: crate::model::GetViolationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Violation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Violation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -955,9 +956,9 @@ impl super::stub::CloudControlsPartnerMonitoring for CloudControlsPartnerMonitor
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/clouddms/v1/Cargo.toml b/src/generated/cloud/clouddms/v1/Cargo.toml
index 2e8f8ddf22..94f19309d7 100644
--- a/src/generated/cloud/clouddms/v1/Cargo.toml
+++ b/src/generated/cloud/clouddms/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/clouddms/v1/src/builder.rs b/src/generated/cloud/clouddms/v1/src/builder.rs
index 701542474c..a9db6878e4 100644
--- a/src/generated/cloud/clouddms/v1/src/builder.rs
+++ b/src/generated/cloud/clouddms/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_migration_service {
     /// A builder for [DataMigrationService][crate::client::DataMigrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_clouddms_v1::*;
     /// # use builder::data_migration_service::ClientBuilder;
     /// # use client::DataMigrationService;
@@ -30,19 +30,18 @@ pub mod data_migration_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataMigrationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataMigrationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_migration_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataMigrationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_migration_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListMigrationJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_migration_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMigrationJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMigrationJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,15 +137,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMigrationJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMigrationJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -182,8 +185,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMigrationJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMigrationJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -193,7 +196,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -221,7 +224,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -231,7 +234,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMigrationJobRequest::name].
@@ -244,8 +247,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -255,7 +258,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CreateMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -287,7 +290,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -302,7 +305,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .create_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_migration_job`.
@@ -319,7 +322,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -392,8 +395,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -403,7 +406,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::UpdateMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -435,7 +438,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -450,7 +453,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .update_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_migration_job`.
@@ -467,7 +470,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -546,8 +549,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -557,7 +560,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DeleteMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -589,7 +592,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -604,7 +607,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .delete_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_migration_job`.
@@ -616,7 +619,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -665,8 +668,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -676,7 +679,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::StartMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -708,7 +711,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -723,7 +726,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .start_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_migration_job`.
@@ -740,7 +743,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -781,8 +784,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -792,7 +795,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::StopMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -824,7 +827,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -839,7 +842,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .stop_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_migration_job`.
@@ -856,7 +859,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -891,8 +894,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -902,7 +905,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ResumeMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -934,7 +937,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -949,7 +952,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .resume_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resume_migration_job`.
@@ -966,7 +969,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1001,8 +1004,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1012,7 +1015,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::PromoteMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1044,7 +1047,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1059,7 +1062,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .promote_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `promote_migration_job`.
@@ -1076,7 +1079,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1111,8 +1114,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PromoteMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PromoteMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1122,7 +1125,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::VerifyMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1154,7 +1157,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1169,7 +1172,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .verify_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `verify_migration_job`.
@@ -1186,7 +1189,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1257,8 +1260,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for VerifyMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for VerifyMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1268,7 +1271,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::RestartMigrationJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1300,7 +1303,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1315,7 +1318,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .restart_migration_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restart_migration_job`.
@@ -1332,7 +1335,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1373,8 +1376,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestartMigrationJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestartMigrationJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1384,7 +1387,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GenerateSshScript;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1415,7 +1418,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1425,7 +1428,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .generate_ssh_script(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [migration_job][crate::model::GenerateSshScriptRequest::migration_job].
@@ -1494,8 +1497,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateSshScript {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateSshScript {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1505,7 +1508,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GenerateTcpProxyScript;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1536,7 +1539,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1546,7 +1549,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .generate_tcp_proxy_script(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [migration_job][crate::model::GenerateTcpProxyScriptRequest::migration_job].
@@ -1587,8 +1590,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateTcpProxyScript {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateTcpProxyScript {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1598,8 +1601,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListConnectionProfiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1633,7 +1636,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1643,15 +1646,15 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_connection_profiles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConnectionProfilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1660,17 +1663,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConnectionProfilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1708,8 +1711,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnectionProfiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnectionProfiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1719,7 +1722,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1750,7 +1753,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1760,7 +1763,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectionProfileRequest::name].
@@ -1773,8 +1776,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1784,7 +1787,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CreateConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1818,7 +1821,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1833,7 +1836,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .create_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_connection_profile`.
@@ -1852,7 +1855,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1937,8 +1940,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1948,7 +1951,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::UpdateConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1982,7 +1985,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1997,7 +2000,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .update_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_connection_profile`.
@@ -2016,7 +2019,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2107,8 +2110,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2118,7 +2121,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DeleteConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2152,7 +2155,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2167,7 +2170,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .delete_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_connection_profile`.
@@ -2179,7 +2182,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2228,8 +2231,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2239,7 +2242,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CreatePrivateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2273,7 +2276,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2288,7 +2291,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .create_private_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_private_connection`.
@@ -2307,7 +2310,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2386,8 +2389,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePrivateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePrivateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2397,7 +2400,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetPrivateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2428,7 +2431,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2438,7 +2441,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_private_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPrivateConnectionRequest::name].
@@ -2451,8 +2454,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPrivateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPrivateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2462,8 +2465,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListPrivateConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2497,7 +2500,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2507,15 +2510,15 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_private_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListPrivateConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2524,17 +2527,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPrivateConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2572,8 +2575,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPrivateConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPrivateConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2583,7 +2586,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DeletePrivateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2617,7 +2620,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2632,7 +2635,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .delete_private_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_private_connection`.
@@ -2644,7 +2647,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2687,8 +2690,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePrivateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePrivateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2698,7 +2701,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2729,7 +2732,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2739,7 +2742,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversionWorkspaceRequest::name].
@@ -2752,8 +2755,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2763,8 +2766,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListConversionWorkspaces;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2800,7 +2803,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2810,15 +2813,15 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_conversion_workspaces(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConversionWorkspacesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2827,17 +2830,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConversionWorkspacesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2869,8 +2872,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversionWorkspaces {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversionWorkspaces {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2880,7 +2883,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CreateConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2914,7 +2917,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2929,7 +2932,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .create_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_conversion_workspace`.
@@ -2948,7 +2951,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3021,8 +3024,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3032,7 +3035,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::UpdateConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3066,7 +3069,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3081,7 +3084,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .update_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_conversion_workspace`.
@@ -3100,7 +3103,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3179,8 +3182,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3190,7 +3193,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DeleteConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3224,7 +3227,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3239,7 +3242,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .delete_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_conversion_workspace`.
@@ -3251,7 +3254,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3300,8 +3303,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3311,7 +3314,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CreateMappingRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3342,7 +3345,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3352,7 +3355,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .create_mapping_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateMappingRuleRequest::parent].
@@ -3401,8 +3404,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMappingRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMappingRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3412,7 +3415,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DeleteMappingRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3443,7 +3446,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3453,7 +3456,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .delete_mapping_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteMappingRuleRequest::name].
@@ -3472,8 +3475,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMappingRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMappingRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3483,8 +3486,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListMappingRules;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3518,7 +3521,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3528,14 +3531,16 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_mapping_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMappingRulesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMappingRulesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3543,15 +3548,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMappingRulesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMappingRulesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3577,8 +3584,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMappingRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMappingRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3588,7 +3595,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetMappingRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3616,7 +3623,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3626,7 +3633,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_mapping_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMappingRuleRequest::name].
@@ -3639,8 +3646,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMappingRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMappingRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3650,7 +3657,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::SeedConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3684,7 +3691,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3699,7 +3706,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .seed_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `seed_conversion_workspace`.
@@ -3718,7 +3725,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3799,8 +3806,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SeedConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SeedConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3810,7 +3817,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ImportMappingRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3842,7 +3849,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3857,7 +3864,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .import_mapping_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_mapping_rules`.
@@ -3876,7 +3883,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3945,8 +3952,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportMappingRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportMappingRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3956,7 +3963,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ConvertConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3990,7 +3997,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4005,7 +4012,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .convert_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `convert_conversion_workspace`.
@@ -4024,7 +4031,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4077,8 +4084,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ConvertConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ConvertConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4088,7 +4095,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CommitConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4122,7 +4129,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4137,7 +4144,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .commit_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `commit_conversion_workspace`.
@@ -4156,7 +4163,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4199,8 +4206,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CommitConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CommitConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4210,7 +4217,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::RollbackConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4244,7 +4251,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4259,7 +4266,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .rollback_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `rollback_conversion_workspace`.
@@ -4278,7 +4285,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4315,8 +4322,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RollbackConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RollbackConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4326,7 +4333,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ApplyConversionWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4360,7 +4367,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4375,7 +4382,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .apply_conversion_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `apply_conversion_workspace`.
@@ -4394,7 +4401,7 @@ pub mod data_migration_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4476,8 +4483,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApplyConversionWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApplyConversionWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4487,8 +4494,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DescribeDatabaseEntities;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4524,7 +4531,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4534,15 +4541,15 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .describe_database_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::DescribeDatabaseEntitiesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4551,17 +4558,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::DescribeDatabaseEntitiesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4622,8 +4629,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DescribeDatabaseEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DescribeDatabaseEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4633,7 +4640,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::SearchBackgroundJobs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4664,7 +4671,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4674,7 +4681,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .search_background_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversion_workspace][crate::model::SearchBackgroundJobsRequest::conversion_workspace].
@@ -4717,8 +4724,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchBackgroundJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchBackgroundJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4728,7 +4735,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DescribeConversionWorkspaceRevisions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4761,7 +4768,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4773,7 +4780,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .describe_conversion_workspace_revisions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversion_workspace][crate::model::DescribeConversionWorkspaceRevisionsRequest::conversion_workspace].
@@ -4792,8 +4799,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DescribeConversionWorkspaceRevisions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DescribeConversionWorkspaceRevisions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4803,7 +4810,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::FetchStaticIps;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4831,7 +4838,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4841,7 +4848,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .fetch_static_ips(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchStaticIpsRequest::name].
@@ -4866,8 +4873,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchStaticIps {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchStaticIps {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4877,8 +4884,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4912,7 +4919,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4922,15 +4929,15 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4939,17 +4946,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4979,8 +4986,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4990,7 +4997,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5021,7 +5028,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5031,7 +5038,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5042,8 +5049,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5053,7 +5060,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5084,7 +5091,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5094,7 +5101,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -5147,8 +5154,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5158,7 +5165,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5189,7 +5196,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5199,7 +5206,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -5230,8 +5237,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5241,7 +5248,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5274,7 +5281,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5284,7 +5291,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -5310,8 +5317,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5321,8 +5328,8 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5358,7 +5365,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5368,15 +5375,15 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5385,17 +5392,17 @@ pub mod data_migration_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5431,8 +5438,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5442,7 +5449,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5473,7 +5480,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5483,7 +5490,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5494,8 +5501,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5505,7 +5512,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5538,7 +5545,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5548,7 +5555,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5559,8 +5566,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5570,7 +5577,7 @@ pub mod data_migration_service {
     /// # Example
     /// ```
     /// # use google_cloud_clouddms_v1::builder::data_migration_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_clouddms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5603,7 +5610,7 @@ pub mod data_migration_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5613,7 +5620,7 @@ pub mod data_migration_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5624,8 +5631,8 @@ pub mod data_migration_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/clouddms/v1/src/client.rs b/src/generated/cloud/clouddms/v1/src/client.rs
index c38d34f696..cef9fcfbb4 100644
--- a/src/generated/cloud/clouddms/v1/src/client.rs
+++ b/src/generated/cloud/clouddms/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_clouddms_v1::client::DataMigrationService;
 /// let client = DataMigrationService::builder().build().await?;
 /// // use `client` to make requests to the Database Migration API.
@@ -66,15 +66,13 @@ impl DataMigrationService {
     /// Returns a builder for [DataMigrationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_clouddms_v1::client::DataMigrationService;
     /// let client = DataMigrationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_migration_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_migration_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_migration_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl DataMigrationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataMigrationService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataMigrationService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl DataMigrationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataMigrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataMigrationService> {
         super::transport::DataMigrationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataMigrationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataMigrationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataMigrationService::new)
diff --git a/src/generated/cloud/clouddms/v1/src/lib.rs b/src/generated/cloud/clouddms/v1/src/lib.rs
index a9f799252a..ecb6a03f53 100644
--- a/src/generated/cloud/clouddms/v1/src/lib.rs
+++ b/src/generated/cloud/clouddms/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/clouddms/v1/src/model.rs b/src/generated/cloud/clouddms/v1/src/model.rs
index 38ce8d8bf7..7589a42a18 100644
--- a/src/generated/cloud/clouddms/v1/src/model.rs
+++ b/src/generated/cloud/clouddms/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -229,7 +229,7 @@ impl wkt::message::Message for ListMigrationJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMigrationJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMigrationJobsResponse {
     type PageItem = crate::model::MigrationJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1528,7 +1528,7 @@ impl wkt::message::Message for ListConnectionProfilesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectionProfilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectionProfilesResponse {
     type PageItem = crate::model::ConnectionProfile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2249,7 +2249,7 @@ impl wkt::message::Message for ListPrivateConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPrivateConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPrivateConnectionsResponse {
     type PageItem = crate::model::PrivateConnection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2698,7 +2698,7 @@ impl wkt::message::Message for ListConversionWorkspacesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversionWorkspacesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversionWorkspacesResponse {
     type PageItem = crate::model::ConversionWorkspace;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3418,7 +3418,7 @@ impl wkt::message::Message for ListMappingRulesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMappingRulesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMappingRulesResponse {
     type PageItem = crate::model::MappingRule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4261,7 +4261,7 @@ impl wkt::message::Message for DescribeDatabaseEntitiesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DescribeDatabaseEntitiesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for DescribeDatabaseEntitiesResponse {
     type PageItem = crate::model::DatabaseEntity;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/clouddms/v1/src/stub.rs b/src/generated/cloud/clouddms/v1/src/stub.rs
index 9c8c03f510..5b816e2172 100644
--- a/src/generated/cloud/clouddms/v1/src/stub.rs
+++ b/src/generated/cloud/clouddms/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_migration_jobs(
         &self,
         _req: crate::model::ListMigrationJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMigrationJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMigrationJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_migration_job(
         &self,
         _req: crate::model::GetMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MigrationJob>>,
+        Output = crate::Result<crate::Response<crate::model::MigrationJob>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn create_migration_job(
         &self,
         _req: crate::model::CreateMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn update_migration_job(
         &self,
         _req: crate::model::UpdateMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn delete_migration_job(
         &self,
         _req: crate::model::DeleteMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn start_migration_job(
         &self,
         _req: crate::model::StartMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +108,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn stop_migration_job(
         &self,
         _req: crate::model::StopMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +119,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn resume_migration_job(
         &self,
         _req: crate::model::ResumeMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +130,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn promote_migration_job(
         &self,
         _req: crate::model::PromoteMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +141,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn verify_migration_job(
         &self,
         _req: crate::model::VerifyMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +152,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn restart_migration_job(
         &self,
         _req: crate::model::RestartMigrationJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,10 +163,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn generate_ssh_script(
         &self,
         _req: crate::model::GenerateSshScriptRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SshScript>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SshScript>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -174,9 +173,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn generate_tcp_proxy_script(
         &self,
         _req: crate::model::GenerateTcpProxyScriptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TcpProxyScript>>,
+        Output = crate::Result<crate::Response<crate::model::TcpProxyScript>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,11 +184,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_connection_profiles(
         &self,
         _req: crate::model::ListConnectionProfilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConnectionProfilesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConnectionProfilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,9 +195,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_connection_profile(
         &self,
         _req: crate::model::GetConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConnectionProfile>>,
+        Output = crate::Result<crate::Response<crate::model::ConnectionProfile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -209,9 +206,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn create_connection_profile(
         &self,
         _req: crate::model::CreateConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +217,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn update_connection_profile(
         &self,
         _req: crate::model::UpdateConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +228,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn delete_connection_profile(
         &self,
         _req: crate::model::DeleteConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +239,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn create_private_connection(
         &self,
         _req: crate::model::CreatePrivateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +250,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_private_connection(
         &self,
         _req: crate::model::GetPrivateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PrivateConnection>>,
+        Output = crate::Result<crate::Response<crate::model::PrivateConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,11 +261,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_private_connections(
         &self,
         _req: crate::model::ListPrivateConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListPrivateConnectionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListPrivateConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -277,9 +272,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn delete_private_connection(
         &self,
         _req: crate::model::DeletePrivateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,9 +283,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_conversion_workspace(
         &self,
         _req: crate::model::GetConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversionWorkspace>>,
+        Output = crate::Result<crate::Response<crate::model::ConversionWorkspace>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -299,11 +294,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_conversion_workspaces(
         &self,
         _req: crate::model::ListConversionWorkspacesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConversionWorkspacesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConversionWorkspacesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -312,9 +305,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn create_conversion_workspace(
         &self,
         _req: crate::model::CreateConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -323,9 +316,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn update_conversion_workspace(
         &self,
         _req: crate::model::UpdateConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -334,9 +327,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn delete_conversion_workspace(
         &self,
         _req: crate::model::DeleteConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -345,10 +338,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn create_mapping_rule(
         &self,
         _req: crate::model::CreateMappingRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MappingRule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::MappingRule>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -356,8 +348,8 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn delete_mapping_rule(
         &self,
         _req: crate::model::DeleteMappingRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -365,9 +357,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_mapping_rules(
         &self,
         _req: crate::model::ListMappingRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMappingRulesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMappingRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -376,10 +368,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_mapping_rule(
         &self,
         _req: crate::model::GetMappingRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MappingRule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::MappingRule>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -387,9 +378,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn seed_conversion_workspace(
         &self,
         _req: crate::model::SeedConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -398,9 +389,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn import_mapping_rules(
         &self,
         _req: crate::model::ImportMappingRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,9 +400,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn convert_conversion_workspace(
         &self,
         _req: crate::model::ConvertConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -420,9 +411,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn commit_conversion_workspace(
         &self,
         _req: crate::model::CommitConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -431,9 +422,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn rollback_conversion_workspace(
         &self,
         _req: crate::model::RollbackConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -442,9 +433,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn apply_conversion_workspace(
         &self,
         _req: crate::model::ApplyConversionWorkspaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -453,11 +444,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn describe_database_entities(
         &self,
         _req: crate::model::DescribeDatabaseEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::DescribeDatabaseEntitiesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::DescribeDatabaseEntitiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -466,9 +455,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn search_background_jobs(
         &self,
         _req: crate::model::SearchBackgroundJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchBackgroundJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchBackgroundJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -477,10 +466,10 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn describe_conversion_workspace_revisions(
         &self,
         _req: crate::model::DescribeConversionWorkspaceRevisionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>,
+            crate::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -490,9 +479,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn fetch_static_ips(
         &self,
         _req: crate::model::FetchStaticIpsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchStaticIpsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchStaticIpsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -501,10 +490,10 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -514,9 +503,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -525,9 +514,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -536,9 +525,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -547,10 +536,10 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -560,10 +549,10 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -573,9 +562,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -584,8 +573,8 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -593,8 +582,8 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -604,9 +593,9 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -615,8 +604,8 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/clouddms/v1/src/stub/dynamic.rs b/src/generated/cloud/clouddms/v1/src/stub/dynamic.rs
index 01dbdff3e9..3804838c69 100644
--- a/src/generated/cloud/clouddms/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/clouddms/v1/src/stub/dynamic.rs
@@ -20,318 +20,312 @@ pub trait DataMigrationService: std::fmt::Debug + Send + Sync {
     async fn list_migration_jobs(
         &self,
         req: crate::model::ListMigrationJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMigrationJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMigrationJobsResponse>>;
 
     async fn get_migration_job(
         &self,
         req: crate::model::GetMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationJob>>;
 
     async fn create_migration_job(
         &self,
         req: crate::model::CreateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_migration_job(
         &self,
         req: crate::model::UpdateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_migration_job(
         &self,
         req: crate::model::DeleteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn start_migration_job(
         &self,
         req: crate::model::StartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn stop_migration_job(
         &self,
         req: crate::model::StopMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn resume_migration_job(
         &self,
         req: crate::model::ResumeMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn promote_migration_job(
         &self,
         req: crate::model::PromoteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn verify_migration_job(
         &self,
         req: crate::model::VerifyMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restart_migration_job(
         &self,
         req: crate::model::RestartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_ssh_script(
         &self,
         req: crate::model::GenerateSshScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SshScript>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SshScript>>;
 
     async fn generate_tcp_proxy_script(
         &self,
         req: crate::model::GenerateTcpProxyScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TcpProxyScript>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TcpProxyScript>>;
 
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionProfilesResponse>>;
 
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionProfile>>;
 
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PrivateConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PrivateConnection>>;
 
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPrivateConnectionsResponse>>;
 
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_conversion_workspace(
         &self,
         req: crate::model::GetConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversionWorkspace>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversionWorkspace>>;
 
     async fn list_conversion_workspaces(
         &self,
         req: crate::model::ListConversionWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversionWorkspacesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversionWorkspacesResponse>>;
 
     async fn create_conversion_workspace(
         &self,
         req: crate::model::CreateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_conversion_workspace(
         &self,
         req: crate::model::UpdateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_conversion_workspace(
         &self,
         req: crate::model::DeleteConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_mapping_rule(
         &self,
         req: crate::model::CreateMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MappingRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MappingRule>>;
 
     async fn delete_mapping_rule(
         &self,
         req: crate::model::DeleteMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_mapping_rules(
         &self,
         req: crate::model::ListMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMappingRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMappingRulesResponse>>;
 
     async fn get_mapping_rule(
         &self,
         req: crate::model::GetMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MappingRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MappingRule>>;
 
     async fn seed_conversion_workspace(
         &self,
         req: crate::model::SeedConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_mapping_rules(
         &self,
         req: crate::model::ImportMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn convert_conversion_workspace(
         &self,
         req: crate::model::ConvertConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn commit_conversion_workspace(
         &self,
         req: crate::model::CommitConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn rollback_conversion_workspace(
         &self,
         req: crate::model::RollbackConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn apply_conversion_workspace(
         &self,
         req: crate::model::ApplyConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn describe_database_entities(
         &self,
         req: crate::model::DescribeDatabaseEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DescribeDatabaseEntitiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DescribeDatabaseEntitiesResponse>>;
 
     async fn search_background_jobs(
         &self,
         req: crate::model::SearchBackgroundJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchBackgroundJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchBackgroundJobsResponse>>;
 
     async fn describe_conversion_workspace_revisions(
         &self,
         req: crate::model::DescribeConversionWorkspaceRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>>;
 
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchStaticIpsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchStaticIpsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataMigrationService] also implement [DataMigrationService].
@@ -341,8 +335,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_migration_jobs(
         &self,
         req: crate::model::ListMigrationJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMigrationJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMigrationJobsResponse>> {
         T::list_migration_jobs(self, req, options).await
     }
 
@@ -350,8 +344,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_migration_job(
         &self,
         req: crate::model::GetMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationJob>> {
         T::get_migration_job(self, req, options).await
     }
 
@@ -359,8 +353,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn create_migration_job(
         &self,
         req: crate::model::CreateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_migration_job(self, req, options).await
     }
 
@@ -368,8 +362,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn update_migration_job(
         &self,
         req: crate::model::UpdateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_migration_job(self, req, options).await
     }
 
@@ -377,8 +371,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn delete_migration_job(
         &self,
         req: crate::model::DeleteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_migration_job(self, req, options).await
     }
 
@@ -386,8 +380,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn start_migration_job(
         &self,
         req: crate::model::StartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::start_migration_job(self, req, options).await
     }
 
@@ -395,8 +389,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn stop_migration_job(
         &self,
         req: crate::model::StopMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::stop_migration_job(self, req, options).await
     }
 
@@ -404,8 +398,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn resume_migration_job(
         &self,
         req: crate::model::ResumeMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::resume_migration_job(self, req, options).await
     }
 
@@ -413,8 +407,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn promote_migration_job(
         &self,
         req: crate::model::PromoteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::promote_migration_job(self, req, options).await
     }
 
@@ -422,8 +416,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn verify_migration_job(
         &self,
         req: crate::model::VerifyMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::verify_migration_job(self, req, options).await
     }
 
@@ -431,8 +425,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn restart_migration_job(
         &self,
         req: crate::model::RestartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restart_migration_job(self, req, options).await
     }
 
@@ -440,8 +434,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn generate_ssh_script(
         &self,
         req: crate::model::GenerateSshScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SshScript>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SshScript>> {
         T::generate_ssh_script(self, req, options).await
     }
 
@@ -449,8 +443,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn generate_tcp_proxy_script(
         &self,
         req: crate::model::GenerateTcpProxyScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TcpProxyScript>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TcpProxyScript>> {
         T::generate_tcp_proxy_script(self, req, options).await
     }
 
@@ -458,8 +452,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionProfilesResponse>> {
         T::list_connection_profiles(self, req, options).await
     }
 
@@ -467,8 +461,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionProfile>> {
         T::get_connection_profile(self, req, options).await
     }
 
@@ -476,8 +470,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_connection_profile(self, req, options).await
     }
 
@@ -485,8 +479,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_connection_profile(self, req, options).await
     }
 
@@ -494,8 +488,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_connection_profile(self, req, options).await
     }
 
@@ -503,8 +497,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_private_connection(self, req, options).await
     }
 
@@ -512,8 +506,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PrivateConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PrivateConnection>> {
         T::get_private_connection(self, req, options).await
     }
 
@@ -521,8 +515,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPrivateConnectionsResponse>> {
         T::list_private_connections(self, req, options).await
     }
 
@@ -530,8 +524,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_private_connection(self, req, options).await
     }
 
@@ -539,8 +533,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_conversion_workspace(
         &self,
         req: crate::model::GetConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversionWorkspace>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversionWorkspace>> {
         T::get_conversion_workspace(self, req, options).await
     }
 
@@ -548,9 +542,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_conversion_workspaces(
         &self,
         req: crate::model::ListConversionWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversionWorkspacesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversionWorkspacesResponse>> {
         T::list_conversion_workspaces(self, req, options).await
     }
 
@@ -558,8 +551,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn create_conversion_workspace(
         &self,
         req: crate::model::CreateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_conversion_workspace(self, req, options).await
     }
 
@@ -567,8 +560,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn update_conversion_workspace(
         &self,
         req: crate::model::UpdateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_conversion_workspace(self, req, options).await
     }
 
@@ -576,8 +569,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn delete_conversion_workspace(
         &self,
         req: crate::model::DeleteConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_conversion_workspace(self, req, options).await
     }
 
@@ -585,8 +578,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn create_mapping_rule(
         &self,
         req: crate::model::CreateMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MappingRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MappingRule>> {
         T::create_mapping_rule(self, req, options).await
     }
 
@@ -594,8 +587,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn delete_mapping_rule(
         &self,
         req: crate::model::DeleteMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_mapping_rule(self, req, options).await
     }
 
@@ -603,8 +596,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_mapping_rules(
         &self,
         req: crate::model::ListMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMappingRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMappingRulesResponse>> {
         T::list_mapping_rules(self, req, options).await
     }
 
@@ -612,8 +605,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_mapping_rule(
         &self,
         req: crate::model::GetMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MappingRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MappingRule>> {
         T::get_mapping_rule(self, req, options).await
     }
 
@@ -621,8 +614,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn seed_conversion_workspace(
         &self,
         req: crate::model::SeedConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::seed_conversion_workspace(self, req, options).await
     }
 
@@ -630,8 +623,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn import_mapping_rules(
         &self,
         req: crate::model::ImportMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_mapping_rules(self, req, options).await
     }
 
@@ -639,8 +632,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn convert_conversion_workspace(
         &self,
         req: crate::model::ConvertConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::convert_conversion_workspace(self, req, options).await
     }
 
@@ -648,8 +641,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn commit_conversion_workspace(
         &self,
         req: crate::model::CommitConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::commit_conversion_workspace(self, req, options).await
     }
 
@@ -657,8 +650,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn rollback_conversion_workspace(
         &self,
         req: crate::model::RollbackConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::rollback_conversion_workspace(self, req, options).await
     }
 
@@ -666,8 +659,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn apply_conversion_workspace(
         &self,
         req: crate::model::ApplyConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::apply_conversion_workspace(self, req, options).await
     }
 
@@ -675,9 +668,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn describe_database_entities(
         &self,
         req: crate::model::DescribeDatabaseEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DescribeDatabaseEntitiesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DescribeDatabaseEntitiesResponse>> {
         T::describe_database_entities(self, req, options).await
     }
 
@@ -685,8 +677,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn search_background_jobs(
         &self,
         req: crate::model::SearchBackgroundJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchBackgroundJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchBackgroundJobsResponse>> {
         T::search_background_jobs(self, req, options).await
     }
 
@@ -694,10 +686,9 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn describe_conversion_workspace_revisions(
         &self,
         req: crate::model::DescribeConversionWorkspaceRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>>
+    {
         T::describe_conversion_workspace_revisions(self, req, options).await
     }
 
@@ -705,8 +696,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchStaticIpsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchStaticIpsResponse>> {
         T::fetch_static_ips(self, req, options).await
     }
 
@@ -714,9 +705,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -724,8 +714,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -733,8 +723,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -742,8 +732,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -751,10 +741,9 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -762,10 +751,9 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -773,8 +761,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -782,8 +770,8 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -791,22 +779,22 @@ impl<T: super::DataMigrationService> DataMigrationService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/clouddms/v1/src/tracing.rs b/src/generated/cloud/clouddms/v1/src/tracing.rs
index 55c74313a6..98cce029b5 100644
--- a/src/generated/cloud/clouddms/v1/src/tracing.rs
+++ b/src/generated/cloud/clouddms/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_migration_jobs(
         &self,
         req: crate::model::ListMigrationJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMigrationJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMigrationJobsResponse>> {
         self.inner.list_migration_jobs(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_migration_job(
         &self,
         req: crate::model::GetMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationJob>> {
         self.inner.get_migration_job(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_migration_job(
         &self,
         req: crate::model::CreateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_migration_job(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_migration_job(
         &self,
         req: crate::model::UpdateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_migration_job(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_migration_job(
         &self,
         req: crate::model::DeleteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_migration_job(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn start_migration_job(
         &self,
         req: crate::model::StartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.start_migration_job(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn stop_migration_job(
         &self,
         req: crate::model::StopMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.stop_migration_job(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn resume_migration_job(
         &self,
         req: crate::model::ResumeMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.resume_migration_job(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn promote_migration_job(
         &self,
         req: crate::model::PromoteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.promote_migration_job(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn verify_migration_job(
         &self,
         req: crate::model::VerifyMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.verify_migration_job(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn restart_migration_job(
         &self,
         req: crate::model::RestartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restart_migration_job(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn generate_ssh_script(
         &self,
         req: crate::model::GenerateSshScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SshScript>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SshScript>> {
         self.inner.generate_ssh_script(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn generate_tcp_proxy_script(
         &self,
         req: crate::model::GenerateTcpProxyScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TcpProxyScript>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TcpProxyScript>> {
         self.inner.generate_tcp_proxy_script(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionProfilesResponse>> {
         self.inner.list_connection_profiles(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionProfile>> {
         self.inner.get_connection_profile(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_connection_profile(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_connection_profile(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_connection_profile(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_private_connection(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PrivateConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PrivateConnection>> {
         self.inner.get_private_connection(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPrivateConnectionsResponse>> {
         self.inner.list_private_connections(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_private_connection(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn get_conversion_workspace(
         &self,
         req: crate::model::GetConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversionWorkspace>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversionWorkspace>> {
         self.inner.get_conversion_workspace(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn list_conversion_workspaces(
         &self,
         req: crate::model::ListConversionWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversionWorkspacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversionWorkspacesResponse>> {
         self.inner.list_conversion_workspaces(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn create_conversion_workspace(
         &self,
         req: crate::model::CreateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_conversion_workspace(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn update_conversion_workspace(
         &self,
         req: crate::model::UpdateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_conversion_workspace(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn delete_conversion_workspace(
         &self,
         req: crate::model::DeleteConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_conversion_workspace(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn create_mapping_rule(
         &self,
         req: crate::model::CreateMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MappingRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MappingRule>> {
         self.inner.create_mapping_rule(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn delete_mapping_rule(
         &self,
         req: crate::model::DeleteMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_mapping_rule(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn list_mapping_rules(
         &self,
         req: crate::model::ListMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMappingRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMappingRulesResponse>> {
         self.inner.list_mapping_rules(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn get_mapping_rule(
         &self,
         req: crate::model::GetMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MappingRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MappingRule>> {
         self.inner.get_mapping_rule(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn seed_conversion_workspace(
         &self,
         req: crate::model::SeedConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.seed_conversion_workspace(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn import_mapping_rules(
         &self,
         req: crate::model::ImportMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_mapping_rules(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn convert_conversion_workspace(
         &self,
         req: crate::model::ConvertConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.convert_conversion_workspace(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn commit_conversion_workspace(
         &self,
         req: crate::model::CommitConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.commit_conversion_workspace(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn rollback_conversion_workspace(
         &self,
         req: crate::model::RollbackConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.rollback_conversion_workspace(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn apply_conversion_workspace(
         &self,
         req: crate::model::ApplyConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.apply_conversion_workspace(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn describe_database_entities(
         &self,
         req: crate::model::DescribeDatabaseEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DescribeDatabaseEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DescribeDatabaseEntitiesResponse>> {
         self.inner.describe_database_entities(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn search_background_jobs(
         &self,
         req: crate::model::SearchBackgroundJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchBackgroundJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchBackgroundJobsResponse>> {
         self.inner.search_background_jobs(req, options).await
     }
 
@@ -392,9 +392,8 @@ where
     async fn describe_conversion_workspace_revisions(
         &self,
         req: crate::model::DescribeConversionWorkspaceRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>> {
         self.inner
             .describe_conversion_workspace_revisions(req, options)
             .await
@@ -404,8 +403,8 @@ where
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchStaticIpsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchStaticIpsResponse>> {
         self.inner.fetch_static_ips(req, options).await
     }
 
@@ -413,8 +412,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -422,8 +421,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -431,8 +430,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -440,8 +439,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -449,9 +448,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -459,9 +457,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -469,8 +466,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -478,8 +475,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -487,22 +484,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/clouddms/v1/src/transport.rs b/src/generated/cloud/clouddms/v1/src/transport.rs
index a971a87a53..ffd811cd0f 100644
--- a/src/generated/cloud/clouddms/v1/src/transport.rs
+++ b/src/generated/cloud/clouddms/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataMigrationService](super::stub::DataMigrationService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataMigrationService {
 }
 
 impl DataMigrationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn list_migration_jobs(
         &self,
         req: crate::model::ListMigrationJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMigrationJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMigrationJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_migration_job(
         &self,
         req: crate::model::GetMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn create_migration_job(
         &self,
         req: crate::model::CreateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn update_migration_job(
         &self,
         req: crate::model::UpdateMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn delete_migration_job(
         &self,
         req: crate::model::DeleteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -365,9 +365,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -382,13 +382,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn start_migration_job(
         &self,
         req: crate::model::StartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429,9 +429,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446,13 +446,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn stop_migration_job(
         &self,
         req: crate::model::StopMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -493,9 +493,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -510,13 +510,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn resume_migration_job(
         &self,
         req: crate::model::ResumeMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -557,9 +557,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -574,13 +574,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn promote_migration_job(
         &self,
         req: crate::model::PromoteMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -621,9 +621,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -638,13 +638,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn verify_migration_job(
         &self,
         req: crate::model::VerifyMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -685,9 +685,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -702,13 +702,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn restart_migration_job(
         &self,
         req: crate::model::RestartMigrationJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -749,9 +749,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -766,13 +766,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn generate_ssh_script(
         &self,
         req: crate::model::GenerateSshScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SshScript>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SshScript>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -813,9 +813,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -830,13 +830,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn generate_tcp_proxy_script(
         &self,
         req: crate::model::GenerateTcpProxyScriptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TcpProxyScript>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TcpProxyScript>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -877,9 +877,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -894,13 +894,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionProfilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -941,9 +941,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -958,13 +958,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1005,9 +1005,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1022,13 +1022,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1069,9 +1069,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1086,13 +1086,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1154,9 +1154,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1171,13 +1171,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1220,9 +1220,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1237,13 +1237,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1283,9 +1283,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1300,13 +1300,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PrivateConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PrivateConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1347,9 +1347,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1364,13 +1364,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPrivateConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1411,9 +1411,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1428,13 +1428,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1476,9 +1476,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1493,13 +1493,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_conversion_workspace(
         &self,
         req: crate::model::GetConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversionWorkspace>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversionWorkspace>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1540,9 +1540,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1557,13 +1557,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn list_conversion_workspaces(
         &self,
         req: crate::model::ListConversionWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversionWorkspacesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversionWorkspacesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1603,9 +1603,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1620,13 +1620,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn create_conversion_workspace(
         &self,
         req: crate::model::CreateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1666,9 +1666,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1683,13 +1683,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn update_conversion_workspace(
         &self,
         req: crate::model::UpdateConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1749,9 +1749,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1766,13 +1766,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn delete_conversion_workspace(
         &self,
         req: crate::model::DeleteConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1815,9 +1815,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1832,13 +1832,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn create_mapping_rule(
         &self,
         req: crate::model::CreateMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MappingRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MappingRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1881,9 +1881,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1898,13 +1898,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn delete_mapping_rule(
         &self,
         req: crate::model::DeleteMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1950,9 +1950,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1961,24 +1961,25 @@ impl super::stub::DataMigrationService for DataMigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_mapping_rules(
         &self,
         req: crate::model::ListMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMappingRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMappingRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2021,9 +2022,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2038,13 +2039,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_mapping_rule(
         &self,
         req: crate::model::GetMappingRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MappingRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MappingRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2089,9 +2090,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2106,13 +2107,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn seed_conversion_workspace(
         &self,
         req: crate::model::SeedConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2153,9 +2154,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2170,13 +2171,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn import_mapping_rules(
         &self,
         req: crate::model::ImportMappingRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2217,9 +2218,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2234,13 +2235,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn convert_conversion_workspace(
         &self,
         req: crate::model::ConvertConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2281,9 +2282,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2298,13 +2299,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn commit_conversion_workspace(
         &self,
         req: crate::model::CommitConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2345,9 +2346,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2362,13 +2363,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn rollback_conversion_workspace(
         &self,
         req: crate::model::RollbackConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2409,9 +2410,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2426,13 +2427,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn apply_conversion_workspace(
         &self,
         req: crate::model::ApplyConversionWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2473,9 +2474,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2490,13 +2491,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn describe_database_entities(
         &self,
         req: crate::model::DescribeDatabaseEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DescribeDatabaseEntitiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DescribeDatabaseEntitiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2548,9 +2549,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2565,13 +2566,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn search_background_jobs(
         &self,
         req: crate::model::SearchBackgroundJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchBackgroundJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchBackgroundJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2633,9 +2634,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2650,14 +2651,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn describe_conversion_workspace_revisions(
         &self,
         req: crate::model::DescribeConversionWorkspaceRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DescribeConversionWorkspaceRevisionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2703,9 +2703,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2720,13 +2720,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchStaticIpsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchStaticIpsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2765,9 +2765,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2782,13 +2782,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2818,9 +2818,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2835,13 +2835,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2878,9 +2878,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2895,13 +2895,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3053,9 +3053,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3070,13 +3070,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3276,9 +3276,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3293,14 +3293,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3452,9 +3451,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3469,14 +3468,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3518,9 +3516,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3535,13 +3533,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3582,9 +3580,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3599,13 +3597,13 @@ impl super::stub::DataMigrationService for DataMigrationService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3646,9 +3644,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3657,24 +3655,25 @@ impl super::stub::DataMigrationService for DataMigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3715,9 +3714,9 @@ impl super::stub::DataMigrationService for DataMigrationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3726,25 +3725,26 @@ impl super::stub::DataMigrationService for DataMigrationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/Cargo.toml b/src/generated/cloud/cloudsecuritycompliance/v1/Cargo.toml
index 64d0d906a6..e12a3f6319 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/Cargo.toml
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/builder.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/builder.rs
index e80f2d98b3..609eedcf82 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/builder.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod audit {
     /// A builder for [Audit][crate::client::Audit].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::*;
     /// # use builder::audit::ClientBuilder;
     /// # use client::Audit;
@@ -30,19 +30,18 @@ pub mod audit {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Audit;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Audit;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod audit {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Audit>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod audit {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::GenerateFrameworkAuditScopeReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105,7 +104,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115,7 +114,7 @@ pub mod audit {
             (*self.0.stub)
                 .generate_framework_audit_scope_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [scope][crate::model::GenerateFrameworkAuditScopeReportRequest::scope].
@@ -149,8 +148,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateFrameworkAuditScopeReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateFrameworkAuditScopeReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -160,7 +159,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::CreateFrameworkAudit;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -190,7 +189,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -205,7 +204,7 @@ pub mod audit {
             (*self.0.stub)
                 .create_framework_audit(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_framework_audit`.
@@ -222,7 +221,7 @@ pub mod audit {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -287,8 +286,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFrameworkAudit {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFrameworkAudit {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -298,8 +297,8 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::ListFrameworkAudits;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -331,7 +330,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -341,14 +340,16 @@ pub mod audit {
             (*self.0.stub)
                 .list_framework_audits(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFrameworkAuditsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFrameworkAuditsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -356,17 +357,17 @@ pub mod audit {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFrameworkAuditsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -398,8 +399,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFrameworkAudits {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFrameworkAudits {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -409,7 +410,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::GetFrameworkAudit;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -438,7 +439,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -448,7 +449,7 @@ pub mod audit {
             (*self.0.stub)
                 .get_framework_audit(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFrameworkAuditRequest::name].
@@ -461,8 +462,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFrameworkAudit {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFrameworkAudit {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -472,8 +473,8 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -505,7 +506,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -515,15 +516,15 @@ pub mod audit {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -532,17 +533,17 @@ pub mod audit {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -572,8 +573,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -583,7 +584,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -612,7 +613,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -622,7 +623,7 @@ pub mod audit {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -633,8 +634,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -644,8 +645,8 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -679,7 +680,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -689,15 +690,15 @@ pub mod audit {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -706,17 +707,17 @@ pub mod audit {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -752,8 +753,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -763,7 +764,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -792,7 +793,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -802,7 +803,7 @@ pub mod audit {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -813,8 +814,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -824,7 +825,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -855,7 +856,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -865,7 +866,7 @@ pub mod audit {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -876,8 +877,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -887,7 +888,7 @@ pub mod audit {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::audit::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -918,7 +919,7 @@ pub mod audit {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -928,7 +929,7 @@ pub mod audit {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -939,8 +940,8 @@ pub mod audit {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -952,7 +953,7 @@ pub mod cm_enrollment_service {
     /// A builder for [CmEnrollmentService][crate::client::CmEnrollmentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::*;
     /// # use builder::cm_enrollment_service::ClientBuilder;
     /// # use client::CmEnrollmentService;
@@ -962,19 +963,18 @@ pub mod cm_enrollment_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CmEnrollmentService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CmEnrollmentService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -985,7 +985,7 @@ pub mod cm_enrollment_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CmEnrollmentService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -998,7 +998,7 @@ pub mod cm_enrollment_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1008,7 +1008,7 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::UpdateCmEnrollment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1039,7 +1039,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1049,7 +1049,7 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .update_cm_enrollment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [cm_enrollment][crate::model::UpdateCmEnrollmentRequest::cm_enrollment].
@@ -1094,8 +1094,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCmEnrollment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCmEnrollment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1105,7 +1105,7 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::CalculateEffectiveCmEnrollment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1138,7 +1138,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1148,7 +1148,7 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .calculate_effective_cm_enrollment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CalculateEffectiveCmEnrollmentRequest::name].
@@ -1161,8 +1161,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CalculateEffectiveCmEnrollment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CalculateEffectiveCmEnrollment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1172,8 +1172,8 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1207,7 +1207,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1217,15 +1217,15 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1234,17 +1234,17 @@ pub mod cm_enrollment_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1274,8 +1274,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1285,7 +1285,7 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1316,7 +1316,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1326,7 +1326,7 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1337,8 +1337,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1348,8 +1348,8 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1385,7 +1385,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1395,15 +1395,15 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1412,17 +1412,17 @@ pub mod cm_enrollment_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1458,8 +1458,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1469,7 +1469,7 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1500,7 +1500,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1510,7 +1510,7 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1521,8 +1521,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1532,7 +1532,7 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1565,7 +1565,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1575,7 +1575,7 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1586,8 +1586,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1597,7 +1597,7 @@ pub mod cm_enrollment_service {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::cm_enrollment_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1630,7 +1630,7 @@ pub mod cm_enrollment_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1640,7 +1640,7 @@ pub mod cm_enrollment_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1651,8 +1651,8 @@ pub mod cm_enrollment_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1664,7 +1664,7 @@ pub mod config {
     /// A builder for [Config][crate::client::Config].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::*;
     /// # use builder::config::ClientBuilder;
     /// # use client::Config;
@@ -1674,19 +1674,18 @@ pub mod config {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Config;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Config;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1697,7 +1696,7 @@ pub mod config {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Config>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1708,7 +1707,7 @@ pub mod config {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1718,8 +1717,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::ListFrameworks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1748,7 +1747,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1758,14 +1757,16 @@ pub mod config {
             (*self.0.stub)
                 .list_frameworks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFrameworksResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFrameworksResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1773,15 +1774,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFrameworksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFrameworksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1807,8 +1810,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFrameworks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFrameworks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1818,7 +1821,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::GetFramework;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1844,7 +1847,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1854,7 +1857,7 @@ pub mod config {
             (*self.0.stub)
                 .get_framework(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFrameworkRequest::name].
@@ -1873,8 +1876,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFramework {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFramework {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1884,7 +1887,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::CreateFramework;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1910,7 +1913,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1920,7 +1923,7 @@ pub mod config {
             (*self.0.stub)
                 .create_framework(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateFrameworkRequest::parent].
@@ -1963,8 +1966,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFramework {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFramework {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1974,7 +1977,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::UpdateFramework;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2000,7 +2003,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2010,7 +2013,7 @@ pub mod config {
             (*self.0.stub)
                 .update_framework(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateFrameworkRequest::update_mask].
@@ -2061,8 +2064,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFramework {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFramework {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2072,7 +2075,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::DeleteFramework;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2098,7 +2101,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2108,7 +2111,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_framework(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteFrameworkRequest::name].
@@ -2121,8 +2124,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFramework {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFramework {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2132,8 +2135,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::ListCloudControls;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2165,7 +2168,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2175,14 +2178,16 @@ pub mod config {
             (*self.0.stub)
                 .list_cloud_controls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCloudControlsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCloudControlsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2190,15 +2195,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCloudControlsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCloudControlsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2224,8 +2231,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCloudControls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCloudControls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2235,7 +2242,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::GetCloudControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2261,7 +2268,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2271,7 +2278,7 @@ pub mod config {
             (*self.0.stub)
                 .get_cloud_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCloudControlRequest::name].
@@ -2290,8 +2297,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCloudControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCloudControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2301,7 +2308,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::CreateCloudControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2330,7 +2337,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2340,7 +2347,7 @@ pub mod config {
             (*self.0.stub)
                 .create_cloud_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCloudControlRequest::parent].
@@ -2383,8 +2390,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCloudControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCloudControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2394,7 +2401,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::UpdateCloudControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2423,7 +2430,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2433,7 +2440,7 @@ pub mod config {
             (*self.0.stub)
                 .update_cloud_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateCloudControlRequest::update_mask].
@@ -2478,8 +2485,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCloudControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCloudControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2489,7 +2496,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::DeleteCloudControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2518,7 +2525,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2528,7 +2535,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_cloud_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteCloudControlRequest::name].
@@ -2541,8 +2548,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCloudControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCloudControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2552,8 +2559,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2585,7 +2592,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2595,15 +2602,15 @@ pub mod config {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2612,17 +2619,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2652,8 +2659,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2663,7 +2670,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2692,7 +2699,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2702,7 +2709,7 @@ pub mod config {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2713,8 +2720,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2724,8 +2731,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2759,7 +2766,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2769,15 +2776,15 @@ pub mod config {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2786,17 +2793,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2832,8 +2839,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2843,7 +2850,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2872,7 +2879,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2882,7 +2889,7 @@ pub mod config {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2893,8 +2900,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2904,7 +2911,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2935,7 +2942,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2945,7 +2952,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2956,8 +2963,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2967,7 +2974,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::config::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2998,7 +3005,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3008,7 +3015,7 @@ pub mod config {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3019,8 +3026,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3032,7 +3039,7 @@ pub mod deployment {
     /// A builder for [Deployment][crate::client::Deployment].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::*;
     /// # use builder::deployment::ClientBuilder;
     /// # use client::Deployment;
@@ -3042,19 +3049,18 @@ pub mod deployment {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Deployment;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Deployment;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3065,7 +3071,7 @@ pub mod deployment {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Deployment>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3078,7 +3084,7 @@ pub mod deployment {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3088,7 +3094,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::CreateFrameworkDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3122,7 +3128,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3137,7 +3143,7 @@ pub mod deployment {
             (*self.0.stub)
                 .create_framework_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_framework_deployment`.
@@ -3156,7 +3162,7 @@ pub mod deployment {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3221,8 +3227,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFrameworkDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFrameworkDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3232,7 +3238,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::DeleteFrameworkDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3266,7 +3272,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3281,7 +3287,7 @@ pub mod deployment {
             (*self.0.stub)
                 .delete_framework_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_framework_deployment`.
@@ -3293,7 +3299,7 @@ pub mod deployment {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3336,8 +3342,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFrameworkDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFrameworkDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3347,7 +3353,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::GetFrameworkDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3378,7 +3384,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3388,7 +3394,7 @@ pub mod deployment {
             (*self.0.stub)
                 .get_framework_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFrameworkDeploymentRequest::name].
@@ -3401,8 +3407,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFrameworkDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFrameworkDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3412,8 +3418,8 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::ListFrameworkDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3449,7 +3455,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3459,15 +3465,15 @@ pub mod deployment {
             (*self.0.stub)
                 .list_framework_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListFrameworkDeploymentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3476,17 +3482,17 @@ pub mod deployment {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFrameworkDeploymentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3524,8 +3530,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFrameworkDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFrameworkDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3535,7 +3541,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::GetCloudControlDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3568,7 +3574,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3578,7 +3584,7 @@ pub mod deployment {
             (*self.0.stub)
                 .get_cloud_control_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCloudControlDeploymentRequest::name].
@@ -3591,8 +3597,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCloudControlDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCloudControlDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3602,8 +3608,8 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::ListCloudControlDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3639,7 +3645,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3649,15 +3655,15 @@ pub mod deployment {
             (*self.0.stub)
                 .list_cloud_control_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListCloudControlDeploymentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3666,17 +3672,17 @@ pub mod deployment {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCloudControlDeploymentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3714,8 +3720,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCloudControlDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCloudControlDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3725,8 +3731,8 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3760,7 +3766,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3770,15 +3776,15 @@ pub mod deployment {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3787,17 +3793,17 @@ pub mod deployment {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3827,8 +3833,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3838,7 +3844,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3869,7 +3875,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3879,7 +3885,7 @@ pub mod deployment {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3890,8 +3896,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3901,8 +3907,8 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3938,7 +3944,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3948,15 +3954,15 @@ pub mod deployment {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3965,17 +3971,17 @@ pub mod deployment {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4011,8 +4017,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4022,7 +4028,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4053,7 +4059,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4063,7 +4069,7 @@ pub mod deployment {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4074,8 +4080,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4085,7 +4091,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4118,7 +4124,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4128,7 +4134,7 @@ pub mod deployment {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4139,8 +4145,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4150,7 +4156,7 @@ pub mod deployment {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::deployment::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4183,7 +4189,7 @@ pub mod deployment {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4193,7 +4199,7 @@ pub mod deployment {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4204,8 +4210,8 @@ pub mod deployment {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4217,7 +4223,7 @@ pub mod monitoring {
     /// A builder for [Monitoring][crate::client::Monitoring].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::*;
     /// # use builder::monitoring::ClientBuilder;
     /// # use client::Monitoring;
@@ -4227,19 +4233,18 @@ pub mod monitoring {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Monitoring;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Monitoring;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4250,7 +4255,7 @@ pub mod monitoring {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Monitoring>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4263,7 +4268,7 @@ pub mod monitoring {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4273,8 +4278,8 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::ListFrameworkComplianceSummaries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4310,7 +4315,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4320,15 +4325,15 @@ pub mod monitoring {
             (*self.0.stub)
                 .list_framework_compliance_summaries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListFrameworkComplianceSummariesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4337,17 +4342,17 @@ pub mod monitoring {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFrameworkComplianceSummariesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4379,8 +4384,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFrameworkComplianceSummaries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFrameworkComplianceSummaries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4390,8 +4395,8 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::ListFindingSummaries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4425,7 +4430,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4435,14 +4440,16 @@ pub mod monitoring {
             (*self.0.stub)
                 .list_finding_summaries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFindingSummariesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFindingSummariesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4450,17 +4457,17 @@ pub mod monitoring {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFindingSummariesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4512,8 +4519,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFindingSummaries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFindingSummaries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4523,7 +4530,7 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::FetchFrameworkComplianceReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4556,7 +4563,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4566,7 +4573,7 @@ pub mod monitoring {
             (*self.0.stub)
                 .fetch_framework_compliance_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchFrameworkComplianceReportRequest::name].
@@ -4597,8 +4604,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchFrameworkComplianceReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchFrameworkComplianceReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4608,8 +4615,8 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::ListControlComplianceSummaries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4645,7 +4652,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4655,15 +4662,15 @@ pub mod monitoring {
             (*self.0.stub)
                 .list_control_compliance_summaries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListControlComplianceSummariesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4672,17 +4679,17 @@ pub mod monitoring {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListControlComplianceSummariesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4734,8 +4741,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListControlComplianceSummaries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListControlComplianceSummaries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4745,7 +4752,7 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::AggregateFrameworkComplianceReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4778,7 +4785,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4790,7 +4797,7 @@ pub mod monitoring {
             (*self.0.stub)
                 .aggregate_framework_compliance_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::AggregateFrameworkComplianceReportRequest::name].
@@ -4827,8 +4834,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregateFrameworkComplianceReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregateFrameworkComplianceReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4838,8 +4845,8 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4873,7 +4880,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4883,15 +4890,15 @@ pub mod monitoring {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4900,17 +4907,17 @@ pub mod monitoring {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4940,8 +4947,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4951,7 +4958,7 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4982,7 +4989,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4992,7 +4999,7 @@ pub mod monitoring {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5003,8 +5010,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5014,8 +5021,8 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5051,7 +5058,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5061,15 +5068,15 @@ pub mod monitoring {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5078,17 +5085,17 @@ pub mod monitoring {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5124,8 +5131,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5135,7 +5142,7 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5166,7 +5173,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5176,7 +5183,7 @@ pub mod monitoring {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5187,8 +5194,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5198,7 +5205,7 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5231,7 +5238,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5241,7 +5248,7 @@ pub mod monitoring {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5252,8 +5259,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5263,7 +5270,7 @@ pub mod monitoring {
     /// # Example
     /// ```
     /// # use google_cloud_cloudsecuritycompliance_v1::builder::monitoring::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_cloudsecuritycompliance_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5296,7 +5303,7 @@ pub mod monitoring {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5306,7 +5313,7 @@ pub mod monitoring {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5317,8 +5324,8 @@ pub mod monitoring {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/client.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/client.rs
index 71fd263d9e..0193c2d76f 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/client.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudsecuritycompliance_v1::client::Audit;
 /// let client = Audit::builder().build().await?;
 /// // use `client` to make requests to the Cloud Security Compliance API.
@@ -66,13 +66,13 @@ impl Audit {
     /// Returns a builder for [Audit].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::client::Audit;
     /// let client = Audit::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::audit::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::audit::client::Factory)
+        crate::new_client_builder(super::builder::audit::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Audit {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Audit>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Audit>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Audit {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Audit> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Audit> {
         super::transport::Audit::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Audit> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Audit> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Audit::new)
@@ -193,7 +193,7 @@ impl Audit {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudsecuritycompliance_v1::client::CmEnrollmentService;
 /// let client = CmEnrollmentService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Security Compliance API.
@@ -240,15 +240,13 @@ impl CmEnrollmentService {
     /// Returns a builder for [CmEnrollmentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::client::CmEnrollmentService;
     /// let client = CmEnrollmentService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cm_enrollment_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cm_enrollment_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cm_enrollment_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -266,14 +264,14 @@ impl CmEnrollmentService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CmEnrollmentService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CmEnrollmentService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -283,13 +281,13 @@ impl CmEnrollmentService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CmEnrollmentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CmEnrollmentService> {
         super::transport::CmEnrollmentService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CmEnrollmentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CmEnrollmentService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CmEnrollmentService::new)
@@ -360,7 +358,7 @@ impl CmEnrollmentService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudsecuritycompliance_v1::client::Config;
 /// let client = Config::builder().build().await?;
 /// // use `client` to make requests to the Cloud Security Compliance API.
@@ -407,13 +405,13 @@ impl Config {
     /// Returns a builder for [Config].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::client::Config;
     /// let client = Config::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::config::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::config::client::Factory)
+        crate::new_client_builder(super::builder::config::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -431,14 +429,14 @@ impl Config {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Config>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Config>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -447,13 +445,13 @@ impl Config {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Config> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Config> {
         super::transport::Config::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Config> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Config> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Config::new)
@@ -608,7 +606,7 @@ impl Config {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudsecuritycompliance_v1::client::Deployment;
 /// let client = Deployment::builder().build().await?;
 /// // use `client` to make requests to the Cloud Security Compliance API.
@@ -655,13 +653,13 @@ impl Deployment {
     /// Returns a builder for [Deployment].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::client::Deployment;
     /// let client = Deployment::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::deployment::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::deployment::client::Factory)
+        crate::new_client_builder(super::builder::deployment::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -679,14 +677,14 @@ impl Deployment {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Deployment>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Deployment>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -695,13 +693,13 @@ impl Deployment {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Deployment> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Deployment> {
         super::transport::Deployment::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Deployment> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Deployment> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Deployment::new)
@@ -813,7 +811,7 @@ impl Deployment {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_cloudsecuritycompliance_v1::client::Monitoring;
 /// let client = Monitoring::builder().build().await?;
 /// // use `client` to make requests to the Cloud Security Compliance API.
@@ -859,13 +857,13 @@ impl Monitoring {
     /// Returns a builder for [Monitoring].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_cloudsecuritycompliance_v1::client::Monitoring;
     /// let client = Monitoring::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::monitoring::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::monitoring::client::Factory)
+        crate::new_client_builder(super::builder::monitoring::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -883,14 +881,14 @@ impl Monitoring {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Monitoring>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Monitoring>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -899,13 +897,13 @@ impl Monitoring {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Monitoring> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Monitoring> {
         super::transport::Monitoring::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Monitoring> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Monitoring> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Monitoring::new)
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/lib.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/lib.rs
index ba513c02a4..c7788b8d3e 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/lib.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/lib.rs
@@ -50,8 +50,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -86,3 +86,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/model.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/model.rs
index 7361d2d85b..fbecc6fbad 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/model.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1504,7 +1504,7 @@ impl wkt::message::Message for ListFrameworkAuditsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFrameworkAuditsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFrameworkAuditsResponse {
     type PageItem = crate::model::FrameworkAudit;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5554,7 +5554,7 @@ impl wkt::message::Message for ListFrameworksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFrameworksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFrameworksResponse {
     type PageItem = crate::model::Framework;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5992,7 +5992,7 @@ impl wkt::message::Message for ListCloudControlsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCloudControlsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCloudControlsResponse {
     type PageItem = crate::model::CloudControl;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7831,7 +7831,7 @@ impl wkt::message::Message for ListFrameworkDeploymentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFrameworkDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFrameworkDeploymentsResponse {
     type PageItem = crate::model::FrameworkDeployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8047,7 +8047,9 @@ impl wkt::message::Message for ListCloudControlDeploymentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCloudControlDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListCloudControlDeploymentsResponse
+{
     type PageItem = crate::model::CloudControlDeployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8351,7 +8353,9 @@ impl wkt::message::Message for ListFrameworkComplianceSummariesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFrameworkComplianceSummariesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListFrameworkComplianceSummariesResponse
+{
     type PageItem = crate::model::FrameworkComplianceSummary;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8896,7 +8900,7 @@ impl wkt::message::Message for ListFindingSummariesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFindingSummariesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFindingSummariesResponse {
     type PageItem = crate::model::FindingSummary;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9089,7 +9093,9 @@ impl wkt::message::Message for ListControlComplianceSummariesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListControlComplianceSummariesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListControlComplianceSummariesResponse
+{
     type PageItem = crate::model::ControlComplianceSummary;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/stub.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/stub.rs
index 90f39811d4..29e35a13e3 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/stub.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/stub.rs
@@ -42,10 +42,10 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn generate_framework_audit_scope_report(
         &self,
         _req: crate::model::GenerateFrameworkAuditScopeReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>,
+            crate::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -55,9 +55,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn create_framework_audit(
         &self,
         _req: crate::model::CreateFrameworkAuditRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +66,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn list_framework_audits(
         &self,
         _req: crate::model::ListFrameworkAuditsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFrameworkAuditsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFrameworkAuditsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +77,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn get_framework_audit(
         &self,
         _req: crate::model::GetFrameworkAuditRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FrameworkAudit>>,
+        Output = crate::Result<crate::Response<crate::model::FrameworkAudit>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,10 +88,10 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -101,9 +101,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -112,10 +112,10 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -125,9 +125,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -136,8 +136,8 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -145,8 +145,8 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -156,9 +156,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -167,9 +167,9 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -189,9 +189,9 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn update_cm_enrollment(
         &self,
         _req: crate::model::UpdateCmEnrollmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CmEnrollment>>,
+        Output = crate::Result<crate::Response<crate::model::CmEnrollment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,10 +200,10 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn calculate_effective_cm_enrollment(
         &self,
         _req: crate::model::CalculateEffectiveCmEnrollmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>,
+            crate::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -213,10 +213,10 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -226,9 +226,9 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -237,10 +237,10 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -250,9 +250,9 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -261,8 +261,8 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -270,8 +270,8 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -292,9 +292,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_frameworks(
         &self,
         _req: crate::model::ListFrameworksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFrameworksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFrameworksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -303,10 +303,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_framework(
         &self,
         _req: crate::model::GetFrameworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Framework>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Framework>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -314,10 +313,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn create_framework(
         &self,
         _req: crate::model::CreateFrameworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Framework>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Framework>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -325,10 +323,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn update_framework(
         &self,
         _req: crate::model::UpdateFrameworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Framework>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Framework>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -336,8 +333,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_framework(
         &self,
         _req: crate::model::DeleteFrameworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -345,9 +342,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_cloud_controls(
         &self,
         _req: crate::model::ListCloudControlsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCloudControlsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCloudControlsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -356,9 +353,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_cloud_control(
         &self,
         _req: crate::model::GetCloudControlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CloudControl>>,
+        Output = crate::Result<crate::Response<crate::model::CloudControl>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -367,9 +364,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn create_cloud_control(
         &self,
         _req: crate::model::CreateCloudControlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CloudControl>>,
+        Output = crate::Result<crate::Response<crate::model::CloudControl>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -378,9 +375,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn update_cloud_control(
         &self,
         _req: crate::model::UpdateCloudControlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CloudControl>>,
+        Output = crate::Result<crate::Response<crate::model::CloudControl>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -389,8 +386,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_cloud_control(
         &self,
         _req: crate::model::DeleteCloudControlRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -398,10 +395,10 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -411,9 +408,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -422,10 +419,10 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -435,9 +432,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -446,8 +443,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -455,8 +452,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -477,9 +474,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn create_framework_deployment(
         &self,
         _req: crate::model::CreateFrameworkDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -488,9 +485,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn delete_framework_deployment(
         &self,
         _req: crate::model::DeleteFrameworkDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -499,9 +496,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn get_framework_deployment(
         &self,
         _req: crate::model::GetFrameworkDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FrameworkDeployment>>,
+        Output = crate::Result<crate::Response<crate::model::FrameworkDeployment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -510,11 +507,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn list_framework_deployments(
         &self,
         _req: crate::model::ListFrameworkDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListFrameworkDeploymentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListFrameworkDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -523,9 +518,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn get_cloud_control_deployment(
         &self,
         _req: crate::model::GetCloudControlDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CloudControlDeployment>>,
+        Output = crate::Result<crate::Response<crate::model::CloudControlDeployment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -534,11 +529,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn list_cloud_control_deployments(
         &self,
         _req: crate::model::ListCloudControlDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListCloudControlDeploymentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListCloudControlDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -547,10 +540,10 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -560,9 +553,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -571,10 +564,10 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -584,9 +577,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -595,8 +588,8 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -604,8 +597,8 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -615,9 +608,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -626,9 +619,9 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -648,10 +641,10 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn list_framework_compliance_summaries(
         &self,
         _req: crate::model::ListFrameworkComplianceSummariesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListFrameworkComplianceSummariesResponse>,
+            crate::Response<crate::model::ListFrameworkComplianceSummariesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -661,9 +654,9 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn list_finding_summaries(
         &self,
         _req: crate::model::ListFindingSummariesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFindingSummariesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFindingSummariesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -672,9 +665,9 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn fetch_framework_compliance_report(
         &self,
         _req: crate::model::FetchFrameworkComplianceReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FrameworkComplianceReport>>,
+        Output = crate::Result<crate::Response<crate::model::FrameworkComplianceReport>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -683,10 +676,10 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn list_control_compliance_summaries(
         &self,
         _req: crate::model::ListControlComplianceSummariesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListControlComplianceSummariesResponse>,
+            crate::Response<crate::model::ListControlComplianceSummariesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -696,10 +689,10 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn aggregate_framework_compliance_report(
         &self,
         _req: crate::model::AggregateFrameworkComplianceReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::AggregateFrameworkComplianceReportResponse>,
+            crate::Response<crate::model::AggregateFrameworkComplianceReportResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -709,10 +702,10 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -722,9 +715,9 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -733,10 +726,10 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -746,9 +739,9 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -757,8 +750,8 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -766,8 +759,8 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/stub/dynamic.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/stub/dynamic.rs
index 94dec9f84a..58c0fa8ee9 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/stub/dynamic.rs
@@ -20,76 +20,72 @@ pub trait Audit: std::fmt::Debug + Send + Sync {
     async fn generate_framework_audit_scope_report(
         &self,
         req: crate::model::GenerateFrameworkAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>>;
 
     async fn create_framework_audit(
         &self,
         req: crate::model::CreateFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_framework_audits(
         &self,
         req: crate::model::ListFrameworkAuditsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFrameworkAuditsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworkAuditsResponse>>;
 
     async fn get_framework_audit(
         &self,
         req: crate::model::GetFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FrameworkAudit>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FrameworkAudit>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Audit] also implement [Audit].
@@ -99,10 +95,9 @@ impl<T: super::Audit> Audit for T {
     async fn generate_framework_audit_scope_report(
         &self,
         req: crate::model::GenerateFrameworkAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>>
+    {
         T::generate_framework_audit_scope_report(self, req, options).await
     }
 
@@ -110,8 +105,8 @@ impl<T: super::Audit> Audit for T {
     async fn create_framework_audit(
         &self,
         req: crate::model::CreateFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_framework_audit(self, req, options).await
     }
 
@@ -119,8 +114,8 @@ impl<T: super::Audit> Audit for T {
     async fn list_framework_audits(
         &self,
         req: crate::model::ListFrameworkAuditsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFrameworkAuditsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworkAuditsResponse>> {
         T::list_framework_audits(self, req, options).await
     }
 
@@ -128,8 +123,8 @@ impl<T: super::Audit> Audit for T {
     async fn get_framework_audit(
         &self,
         req: crate::model::GetFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FrameworkAudit>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FrameworkAudit>> {
         T::get_framework_audit(self, req, options).await
     }
 
@@ -137,9 +132,8 @@ impl<T: super::Audit> Audit for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -147,8 +141,8 @@ impl<T: super::Audit> Audit for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -156,10 +150,9 @@ impl<T: super::Audit> Audit for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -167,8 +160,8 @@ impl<T: super::Audit> Audit for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -176,8 +169,8 @@ impl<T: super::Audit> Audit for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -185,22 +178,22 @@ impl<T: super::Audit> Audit for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -211,52 +204,50 @@ pub trait CmEnrollmentService: std::fmt::Debug + Send + Sync {
     async fn update_cm_enrollment(
         &self,
         req: crate::model::UpdateCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CmEnrollment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CmEnrollment>>;
 
     async fn calculate_effective_cm_enrollment(
         &self,
         req: crate::model::CalculateEffectiveCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::CmEnrollmentService] also implement [CmEnrollmentService].
@@ -266,8 +257,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn update_cm_enrollment(
         &self,
         req: crate::model::UpdateCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CmEnrollment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CmEnrollment>> {
         T::update_cm_enrollment(self, req, options).await
     }
 
@@ -275,9 +266,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn calculate_effective_cm_enrollment(
         &self,
         req: crate::model::CalculateEffectiveCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>> {
         T::calculate_effective_cm_enrollment(self, req, options).await
     }
 
@@ -285,9 +275,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -295,8 +284,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -304,10 +293,9 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -315,8 +303,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -324,8 +312,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -333,8 +321,8 @@ impl<T: super::CmEnrollmentService> CmEnrollmentService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -345,100 +333,98 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     async fn list_frameworks(
         &self,
         req: crate::model::ListFrameworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFrameworksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworksResponse>>;
 
     async fn get_framework(
         &self,
         req: crate::model::GetFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Framework>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Framework>>;
 
     async fn create_framework(
         &self,
         req: crate::model::CreateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Framework>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Framework>>;
 
     async fn update_framework(
         &self,
         req: crate::model::UpdateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Framework>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Framework>>;
 
     async fn delete_framework(
         &self,
         req: crate::model::DeleteFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_cloud_controls(
         &self,
         req: crate::model::ListCloudControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCloudControlsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCloudControlsResponse>>;
 
     async fn get_cloud_control(
         &self,
         req: crate::model::GetCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControl>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControl>>;
 
     async fn create_cloud_control(
         &self,
         req: crate::model::CreateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControl>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControl>>;
 
     async fn update_cloud_control(
         &self,
         req: crate::model::UpdateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControl>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControl>>;
 
     async fn delete_cloud_control(
         &self,
         req: crate::model::DeleteCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Config] also implement [Config].
@@ -448,8 +434,8 @@ impl<T: super::Config> Config for T {
     async fn list_frameworks(
         &self,
         req: crate::model::ListFrameworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFrameworksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworksResponse>> {
         T::list_frameworks(self, req, options).await
     }
 
@@ -457,8 +443,8 @@ impl<T: super::Config> Config for T {
     async fn get_framework(
         &self,
         req: crate::model::GetFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Framework>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Framework>> {
         T::get_framework(self, req, options).await
     }
 
@@ -466,8 +452,8 @@ impl<T: super::Config> Config for T {
     async fn create_framework(
         &self,
         req: crate::model::CreateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Framework>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Framework>> {
         T::create_framework(self, req, options).await
     }
 
@@ -475,8 +461,8 @@ impl<T: super::Config> Config for T {
     async fn update_framework(
         &self,
         req: crate::model::UpdateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Framework>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Framework>> {
         T::update_framework(self, req, options).await
     }
 
@@ -484,8 +470,8 @@ impl<T: super::Config> Config for T {
     async fn delete_framework(
         &self,
         req: crate::model::DeleteFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_framework(self, req, options).await
     }
 
@@ -493,8 +479,8 @@ impl<T: super::Config> Config for T {
     async fn list_cloud_controls(
         &self,
         req: crate::model::ListCloudControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCloudControlsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCloudControlsResponse>> {
         T::list_cloud_controls(self, req, options).await
     }
 
@@ -502,8 +488,8 @@ impl<T: super::Config> Config for T {
     async fn get_cloud_control(
         &self,
         req: crate::model::GetCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControl>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControl>> {
         T::get_cloud_control(self, req, options).await
     }
 
@@ -511,8 +497,8 @@ impl<T: super::Config> Config for T {
     async fn create_cloud_control(
         &self,
         req: crate::model::CreateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControl>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControl>> {
         T::create_cloud_control(self, req, options).await
     }
 
@@ -520,8 +506,8 @@ impl<T: super::Config> Config for T {
     async fn update_cloud_control(
         &self,
         req: crate::model::UpdateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControl>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControl>> {
         T::update_cloud_control(self, req, options).await
     }
 
@@ -529,8 +515,8 @@ impl<T: super::Config> Config for T {
     async fn delete_cloud_control(
         &self,
         req: crate::model::DeleteCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_cloud_control(self, req, options).await
     }
 
@@ -538,9 +524,8 @@ impl<T: super::Config> Config for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -548,8 +533,8 @@ impl<T: super::Config> Config for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -557,10 +542,9 @@ impl<T: super::Config> Config for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -568,8 +552,8 @@ impl<T: super::Config> Config for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -577,8 +561,8 @@ impl<T: super::Config> Config for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -586,8 +570,8 @@ impl<T: super::Config> Config for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -598,86 +582,84 @@ pub trait Deployment: std::fmt::Debug + Send + Sync {
     async fn create_framework_deployment(
         &self,
         req: crate::model::CreateFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_framework_deployment(
         &self,
         req: crate::model::DeleteFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_framework_deployment(
         &self,
         req: crate::model::GetFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FrameworkDeployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FrameworkDeployment>>;
 
     async fn list_framework_deployments(
         &self,
         req: crate::model::ListFrameworkDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFrameworkDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworkDeploymentsResponse>>;
 
     async fn get_cloud_control_deployment(
         &self,
         req: crate::model::GetCloudControlDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControlDeployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControlDeployment>>;
 
     async fn list_cloud_control_deployments(
         &self,
         req: crate::model::ListCloudControlDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCloudControlDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCloudControlDeploymentsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Deployment] also implement [Deployment].
@@ -687,8 +669,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn create_framework_deployment(
         &self,
         req: crate::model::CreateFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_framework_deployment(self, req, options).await
     }
 
@@ -696,8 +678,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn delete_framework_deployment(
         &self,
         req: crate::model::DeleteFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_framework_deployment(self, req, options).await
     }
 
@@ -705,8 +687,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn get_framework_deployment(
         &self,
         req: crate::model::GetFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FrameworkDeployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FrameworkDeployment>> {
         T::get_framework_deployment(self, req, options).await
     }
 
@@ -714,9 +696,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn list_framework_deployments(
         &self,
         req: crate::model::ListFrameworkDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFrameworkDeploymentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworkDeploymentsResponse>> {
         T::list_framework_deployments(self, req, options).await
     }
 
@@ -724,8 +705,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn get_cloud_control_deployment(
         &self,
         req: crate::model::GetCloudControlDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudControlDeployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudControlDeployment>> {
         T::get_cloud_control_deployment(self, req, options).await
     }
 
@@ -733,9 +714,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn list_cloud_control_deployments(
         &self,
         req: crate::model::ListCloudControlDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCloudControlDeploymentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCloudControlDeploymentsResponse>> {
         T::list_cloud_control_deployments(self, req, options).await
     }
 
@@ -743,9 +723,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -753,8 +732,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -762,10 +741,9 @@ impl<T: super::Deployment> Deployment for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -773,8 +751,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -782,8 +760,8 @@ impl<T: super::Deployment> Deployment for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -791,22 +769,22 @@ impl<T: super::Deployment> Deployment for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -817,74 +795,68 @@ pub trait Monitoring: std::fmt::Debug + Send + Sync {
     async fn list_framework_compliance_summaries(
         &self,
         req: crate::model::ListFrameworkComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListFrameworkComplianceSummariesResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworkComplianceSummariesResponse>>;
 
     async fn list_finding_summaries(
         &self,
         req: crate::model::ListFindingSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFindingSummariesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFindingSummariesResponse>>;
 
     async fn fetch_framework_compliance_report(
         &self,
         req: crate::model::FetchFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FrameworkComplianceReport>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FrameworkComplianceReport>>;
 
     async fn list_control_compliance_summaries(
         &self,
         req: crate::model::ListControlComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListControlComplianceSummariesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListControlComplianceSummariesResponse>>;
 
     async fn aggregate_framework_compliance_report(
         &self,
         req: crate::model::AggregateFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::AggregateFrameworkComplianceReportResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AggregateFrameworkComplianceReportResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Monitoring] also implement [Monitoring].
@@ -894,10 +866,9 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn list_framework_compliance_summaries(
         &self,
         req: crate::model::ListFrameworkComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListFrameworkComplianceSummariesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFrameworkComplianceSummariesResponse>>
+    {
         T::list_framework_compliance_summaries(self, req, options).await
     }
 
@@ -905,8 +876,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn list_finding_summaries(
         &self,
         req: crate::model::ListFindingSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFindingSummariesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFindingSummariesResponse>> {
         T::list_finding_summaries(self, req, options).await
     }
 
@@ -914,8 +885,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn fetch_framework_compliance_report(
         &self,
         req: crate::model::FetchFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FrameworkComplianceReport>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FrameworkComplianceReport>> {
         T::fetch_framework_compliance_report(self, req, options).await
     }
 
@@ -923,9 +894,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn list_control_compliance_summaries(
         &self,
         req: crate::model::ListControlComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListControlComplianceSummariesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListControlComplianceSummariesResponse>> {
         T::list_control_compliance_summaries(self, req, options).await
     }
 
@@ -933,10 +903,9 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn aggregate_framework_compliance_report(
         &self,
         req: crate::model::AggregateFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::AggregateFrameworkComplianceReportResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AggregateFrameworkComplianceReportResponse>>
+    {
         T::aggregate_framework_compliance_report(self, req, options).await
     }
 
@@ -944,9 +913,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -954,8 +922,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -963,10 +931,9 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -974,8 +941,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -983,8 +950,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -992,8 +959,8 @@ impl<T: super::Monitoring> Monitoring for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/tracing.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/tracing.rs
index e657edb9e7..7d0254fdc5 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/tracing.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/tracing.rs
@@ -41,9 +41,8 @@ where
     async fn generate_framework_audit_scope_report(
         &self,
         req: crate::model::GenerateFrameworkAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>> {
         self.inner
             .generate_framework_audit_scope_report(req, options)
             .await
@@ -53,8 +52,8 @@ where
     async fn create_framework_audit(
         &self,
         req: crate::model::CreateFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_framework_audit(req, options).await
     }
 
@@ -62,8 +61,8 @@ where
     async fn list_framework_audits(
         &self,
         req: crate::model::ListFrameworkAuditsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworkAuditsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworkAuditsResponse>> {
         self.inner.list_framework_audits(req, options).await
     }
 
@@ -71,8 +70,8 @@ where
     async fn get_framework_audit(
         &self,
         req: crate::model::GetFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FrameworkAudit>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FrameworkAudit>> {
         self.inner.get_framework_audit(req, options).await
     }
 
@@ -80,8 +79,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -89,8 +88,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -98,9 +97,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -108,8 +106,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -117,8 +115,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -126,22 +124,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -172,8 +170,8 @@ where
     async fn update_cm_enrollment(
         &self,
         req: crate::model::UpdateCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CmEnrollment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CmEnrollment>> {
         self.inner.update_cm_enrollment(req, options).await
     }
 
@@ -181,8 +179,8 @@ where
     async fn calculate_effective_cm_enrollment(
         &self,
         req: crate::model::CalculateEffectiveCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>> {
         self.inner
             .calculate_effective_cm_enrollment(req, options)
             .await
@@ -192,8 +190,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -201,8 +199,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -210,9 +208,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -220,8 +217,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -229,8 +226,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -238,8 +235,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -270,8 +267,8 @@ where
     async fn list_frameworks(
         &self,
         req: crate::model::ListFrameworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworksResponse>> {
         self.inner.list_frameworks(req, options).await
     }
 
@@ -279,8 +276,8 @@ where
     async fn get_framework(
         &self,
         req: crate::model::GetFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Framework>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Framework>> {
         self.inner.get_framework(req, options).await
     }
 
@@ -288,8 +285,8 @@ where
     async fn create_framework(
         &self,
         req: crate::model::CreateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Framework>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Framework>> {
         self.inner.create_framework(req, options).await
     }
 
@@ -297,8 +294,8 @@ where
     async fn update_framework(
         &self,
         req: crate::model::UpdateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Framework>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Framework>> {
         self.inner.update_framework(req, options).await
     }
 
@@ -306,8 +303,8 @@ where
     async fn delete_framework(
         &self,
         req: crate::model::DeleteFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_framework(req, options).await
     }
 
@@ -315,8 +312,8 @@ where
     async fn list_cloud_controls(
         &self,
         req: crate::model::ListCloudControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCloudControlsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCloudControlsResponse>> {
         self.inner.list_cloud_controls(req, options).await
     }
 
@@ -324,8 +321,8 @@ where
     async fn get_cloud_control(
         &self,
         req: crate::model::GetCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControl>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControl>> {
         self.inner.get_cloud_control(req, options).await
     }
 
@@ -333,8 +330,8 @@ where
     async fn create_cloud_control(
         &self,
         req: crate::model::CreateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControl>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControl>> {
         self.inner.create_cloud_control(req, options).await
     }
 
@@ -342,8 +339,8 @@ where
     async fn update_cloud_control(
         &self,
         req: crate::model::UpdateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControl>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControl>> {
         self.inner.update_cloud_control(req, options).await
     }
 
@@ -351,8 +348,8 @@ where
     async fn delete_cloud_control(
         &self,
         req: crate::model::DeleteCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_cloud_control(req, options).await
     }
 
@@ -360,8 +357,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -369,8 +366,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -378,9 +375,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -388,8 +384,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -397,8 +393,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -406,8 +402,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -438,8 +434,8 @@ where
     async fn create_framework_deployment(
         &self,
         req: crate::model::CreateFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_framework_deployment(req, options).await
     }
 
@@ -447,8 +443,8 @@ where
     async fn delete_framework_deployment(
         &self,
         req: crate::model::DeleteFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_framework_deployment(req, options).await
     }
 
@@ -456,8 +452,8 @@ where
     async fn get_framework_deployment(
         &self,
         req: crate::model::GetFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FrameworkDeployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FrameworkDeployment>> {
         self.inner.get_framework_deployment(req, options).await
     }
 
@@ -465,8 +461,8 @@ where
     async fn list_framework_deployments(
         &self,
         req: crate::model::ListFrameworkDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworkDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworkDeploymentsResponse>> {
         self.inner.list_framework_deployments(req, options).await
     }
 
@@ -474,8 +470,8 @@ where
     async fn get_cloud_control_deployment(
         &self,
         req: crate::model::GetCloudControlDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControlDeployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControlDeployment>> {
         self.inner.get_cloud_control_deployment(req, options).await
     }
 
@@ -483,8 +479,8 @@ where
     async fn list_cloud_control_deployments(
         &self,
         req: crate::model::ListCloudControlDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCloudControlDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCloudControlDeploymentsResponse>> {
         self.inner
             .list_cloud_control_deployments(req, options)
             .await
@@ -494,8 +490,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -503,8 +499,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -512,9 +508,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -522,8 +517,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -531,8 +526,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -540,22 +535,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -586,9 +581,8 @@ where
     async fn list_framework_compliance_summaries(
         &self,
         req: crate::model::ListFrameworkComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworkComplianceSummariesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworkComplianceSummariesResponse>> {
         self.inner
             .list_framework_compliance_summaries(req, options)
             .await
@@ -598,8 +592,8 @@ where
     async fn list_finding_summaries(
         &self,
         req: crate::model::ListFindingSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFindingSummariesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFindingSummariesResponse>> {
         self.inner.list_finding_summaries(req, options).await
     }
 
@@ -607,8 +601,8 @@ where
     async fn fetch_framework_compliance_report(
         &self,
         req: crate::model::FetchFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FrameworkComplianceReport>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FrameworkComplianceReport>> {
         self.inner
             .fetch_framework_compliance_report(req, options)
             .await
@@ -618,8 +612,8 @@ where
     async fn list_control_compliance_summaries(
         &self,
         req: crate::model::ListControlComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListControlComplianceSummariesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListControlComplianceSummariesResponse>> {
         self.inner
             .list_control_compliance_summaries(req, options)
             .await
@@ -629,9 +623,8 @@ where
     async fn aggregate_framework_compliance_report(
         &self,
         req: crate::model::AggregateFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AggregateFrameworkComplianceReportResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AggregateFrameworkComplianceReportResponse>> {
         self.inner
             .aggregate_framework_compliance_report(req, options)
             .await
@@ -641,8 +634,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -650,8 +643,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -659,9 +652,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -669,8 +661,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -678,8 +670,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -687,8 +679,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/cloudsecuritycompliance/v1/src/transport.rs b/src/generated/cloud/cloudsecuritycompliance/v1/src/transport.rs
index c9b095b286..66c3c752fa 100644
--- a/src/generated/cloud/cloudsecuritycompliance/v1/src/transport.rs
+++ b/src/generated/cloud/cloudsecuritycompliance/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Audit](super::stub::Audit) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -31,7 +31,7 @@ impl std::fmt::Debug for Audit {
 }
 
 impl Audit {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -41,14 +41,13 @@ impl super::stub::Audit for Audit {
     async fn generate_framework_audit_scope_report(
         &self,
         req: crate::model::GenerateFrameworkAuditScopeReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateFrameworkAuditScopeReportResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -151,9 +150,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -168,13 +167,13 @@ impl super::stub::Audit for Audit {
     async fn create_framework_audit(
         &self,
         req: crate::model::CreateFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -280,9 +279,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -297,13 +296,13 @@ impl super::stub::Audit for Audit {
     async fn list_framework_audits(
         &self,
         req: crate::model::ListFrameworkAuditsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworkAuditsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworkAuditsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415,9 +414,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -432,13 +431,13 @@ impl super::stub::Audit for Audit {
     async fn get_framework_audit(
         &self,
         req: crate::model::GetFrameworkAuditRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FrameworkAudit>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FrameworkAudit>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -553,9 +552,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -570,13 +569,13 @@ impl super::stub::Audit for Audit {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -606,9 +605,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -623,13 +622,13 @@ impl super::stub::Audit for Audit {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -666,9 +665,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -683,14 +682,13 @@ impl super::stub::Audit for Audit {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -732,9 +730,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -749,13 +747,13 @@ impl super::stub::Audit for Audit {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -796,9 +794,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -813,13 +811,13 @@ impl super::stub::Audit for Audit {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -860,9 +858,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -871,24 +869,25 @@ impl super::stub::Audit for Audit {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -929,9 +928,9 @@ impl super::stub::Audit for Audit {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -940,25 +939,26 @@ impl super::stub::Audit for Audit {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -978,7 +978,7 @@ impl std::fmt::Debug for CmEnrollmentService {
 }
 
 impl CmEnrollmentService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -988,13 +988,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn update_cm_enrollment(
         &self,
         req: crate::model::UpdateCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CmEnrollment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CmEnrollment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1157,9 +1157,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1174,13 +1174,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn calculate_effective_cm_enrollment(
         &self,
         req: crate::model::CalculateEffectiveCmEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateEffectiveCmEnrollmentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1289,9 +1289,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1306,13 +1306,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1342,9 +1342,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1359,13 +1359,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1402,9 +1402,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1419,14 +1419,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1468,9 +1467,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1485,13 +1484,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1532,9 +1531,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1549,13 +1548,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1596,9 +1595,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1607,24 +1606,25 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1665,9 +1665,9 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1676,12 +1676,13 @@ impl super::stub::CmEnrollmentService for CmEnrollmentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1700,7 +1701,7 @@ impl std::fmt::Debug for Config {
 }
 
 impl Config {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1710,13 +1711,13 @@ impl super::stub::Config for Config {
     async fn list_frameworks(
         &self,
         req: crate::model::ListFrameworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1755,9 +1756,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1772,13 +1773,13 @@ impl super::stub::Config for Config {
     async fn get_framework(
         &self,
         req: crate::model::GetFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Framework>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Framework>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1820,9 +1821,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1837,13 +1838,13 @@ impl super::stub::Config for Config {
     async fn create_framework(
         &self,
         req: crate::model::CreateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Framework>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Framework>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1881,9 +1882,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1898,13 +1899,13 @@ impl super::stub::Config for Config {
     async fn update_framework(
         &self,
         req: crate::model::UpdateFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Framework>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Framework>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1964,9 +1965,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1981,13 +1982,13 @@ impl super::stub::Config for Config {
     async fn delete_framework(
         &self,
         req: crate::model::DeleteFrameworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2028,9 +2029,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2039,24 +2040,25 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_cloud_controls(
         &self,
         req: crate::model::ListCloudControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCloudControlsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCloudControlsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2095,9 +2097,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2112,13 +2114,13 @@ impl super::stub::Config for Config {
     async fn get_cloud_control(
         &self,
         req: crate::model::GetCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControl>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControl>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2160,9 +2162,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2177,13 +2179,13 @@ impl super::stub::Config for Config {
     async fn create_cloud_control(
         &self,
         req: crate::model::CreateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControl>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControl>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2221,9 +2223,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2238,13 +2240,13 @@ impl super::stub::Config for Config {
     async fn update_cloud_control(
         &self,
         req: crate::model::UpdateCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControl>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControl>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2303,9 +2305,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2320,13 +2322,13 @@ impl super::stub::Config for Config {
     async fn delete_cloud_control(
         &self,
         req: crate::model::DeleteCloudControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2367,9 +2369,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2378,24 +2380,25 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2425,9 +2428,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2442,13 +2445,13 @@ impl super::stub::Config for Config {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2485,9 +2488,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2502,14 +2505,13 @@ impl super::stub::Config for Config {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2551,9 +2553,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2568,13 +2570,13 @@ impl super::stub::Config for Config {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2615,9 +2617,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2632,13 +2634,13 @@ impl super::stub::Config for Config {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2679,9 +2681,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2690,24 +2692,25 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2748,9 +2751,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2759,12 +2762,13 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -2783,7 +2787,7 @@ impl std::fmt::Debug for Deployment {
 }
 
 impl Deployment {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2793,13 +2797,13 @@ impl super::stub::Deployment for Deployment {
     async fn create_framework_deployment(
         &self,
         req: crate::model::CreateFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2838,9 +2842,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2855,13 +2859,13 @@ impl super::stub::Deployment for Deployment {
     async fn delete_framework_deployment(
         &self,
         req: crate::model::DeleteFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2903,9 +2907,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2920,13 +2924,13 @@ impl super::stub::Deployment for Deployment {
     async fn get_framework_deployment(
         &self,
         req: crate::model::GetFrameworkDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FrameworkDeployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FrameworkDeployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2967,9 +2971,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2984,13 +2988,13 @@ impl super::stub::Deployment for Deployment {
     async fn list_framework_deployments(
         &self,
         req: crate::model::ListFrameworkDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworkDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworkDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3031,9 +3035,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3048,13 +3052,13 @@ impl super::stub::Deployment for Deployment {
     async fn get_cloud_control_deployment(
         &self,
         req: crate::model::GetCloudControlDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudControlDeployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudControlDeployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3095,9 +3099,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3112,13 +3116,13 @@ impl super::stub::Deployment for Deployment {
     async fn list_cloud_control_deployments(
         &self,
         req: crate::model::ListCloudControlDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCloudControlDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCloudControlDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3159,9 +3163,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3176,13 +3180,13 @@ impl super::stub::Deployment for Deployment {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3212,9 +3216,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3229,13 +3233,13 @@ impl super::stub::Deployment for Deployment {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3272,9 +3276,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3289,14 +3293,13 @@ impl super::stub::Deployment for Deployment {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3338,9 +3341,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3355,13 +3358,13 @@ impl super::stub::Deployment for Deployment {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3402,9 +3405,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3419,13 +3422,13 @@ impl super::stub::Deployment for Deployment {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3466,9 +3469,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3477,24 +3480,25 @@ impl super::stub::Deployment for Deployment {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3535,9 +3539,9 @@ impl super::stub::Deployment for Deployment {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3546,25 +3550,26 @@ impl super::stub::Deployment for Deployment {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3584,7 +3589,7 @@ impl std::fmt::Debug for Monitoring {
 }
 
 impl Monitoring {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3594,14 +3599,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn list_framework_compliance_summaries(
         &self,
         req: crate::model::ListFrameworkComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFrameworkComplianceSummariesResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFrameworkComplianceSummariesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3713,9 +3717,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3730,13 +3734,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn list_finding_summaries(
         &self,
         req: crate::model::ListFindingSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFindingSummariesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFindingSummariesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3884,9 +3888,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3901,13 +3905,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn fetch_framework_compliance_report(
         &self,
         req: crate::model::FetchFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FrameworkComplianceReport>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FrameworkComplianceReport>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4058,9 +4062,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4075,13 +4079,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn list_control_compliance_summaries(
         &self,
         req: crate::model::ListControlComplianceSummariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListControlComplianceSummariesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListControlComplianceSummariesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4241,9 +4245,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4258,14 +4262,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn aggregate_framework_compliance_report(
         &self,
         req: crate::model::AggregateFrameworkComplianceReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AggregateFrameworkComplianceReportResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AggregateFrameworkComplianceReportResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4419,9 +4422,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4436,13 +4439,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4472,9 +4475,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4489,13 +4492,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4532,9 +4535,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4549,14 +4552,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4598,9 +4600,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4615,13 +4617,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4662,9 +4664,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4679,13 +4681,13 @@ impl super::stub::Monitoring for Monitoring {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4726,9 +4728,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4737,24 +4739,25 @@ impl super::stub::Monitoring for Monitoring {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4795,9 +4798,9 @@ impl super::stub::Monitoring for Monitoring {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4806,11 +4809,12 @@ impl super::stub::Monitoring for Monitoring {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml b/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml
index e2b25c78b6..5be725a872 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/builder.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/builder.rs
index c1b50a3944..e58e50b8b1 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/builder.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod license_management_service {
     /// A builder for [LicenseManagementService][crate::client::LicenseManagementService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_commerce_consumer_procurement_v1::*;
     /// # use builder::license_management_service::ClientBuilder;
     /// # use client::LicenseManagementService;
@@ -30,19 +30,18 @@ pub mod license_management_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::LicenseManagementService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = LicenseManagementService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod license_management_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::LicenseManagementService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod license_management_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod license_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::license_management_service::GetLicensePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod license_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod license_management_service {
             (*self.0.stub)
                 .get_license_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetLicensePoolRequest::name].
@@ -127,8 +126,8 @@ pub mod license_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLicensePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLicensePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -138,7 +137,7 @@ pub mod license_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::license_management_service::UpdateLicensePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -169,7 +168,7 @@ pub mod license_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -179,7 +178,7 @@ pub mod license_management_service {
             (*self.0.stub)
                 .update_license_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [license_pool][crate::model::UpdateLicensePoolRequest::license_pool].
@@ -228,8 +227,8 @@ pub mod license_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateLicensePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateLicensePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -239,7 +238,7 @@ pub mod license_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::license_management_service::Assign;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -267,7 +266,7 @@ pub mod license_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -277,7 +276,7 @@ pub mod license_management_service {
             (*self.0.stub)
                 .assign(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::AssignRequest::parent].
@@ -303,8 +302,8 @@ pub mod license_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Assign {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Assign {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -314,7 +313,7 @@ pub mod license_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::license_management_service::Unassign;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -342,7 +341,7 @@ pub mod license_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -352,7 +351,7 @@ pub mod license_management_service {
             (*self.0.stub)
                 .unassign(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::UnassignRequest::parent].
@@ -378,8 +377,8 @@ pub mod license_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Unassign {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Unassign {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -389,8 +388,8 @@ pub mod license_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::license_management_service::EnumerateLicensedUsers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -424,7 +423,7 @@ pub mod license_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -434,15 +433,15 @@ pub mod license_management_service {
             (*self.0.stub)
                 .enumerate_licensed_users(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::EnumerateLicensedUsersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -451,17 +450,17 @@ pub mod license_management_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::EnumerateLicensedUsersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -487,8 +486,8 @@ pub mod license_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnumerateLicensedUsers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnumerateLicensedUsers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -498,7 +497,7 @@ pub mod license_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::license_management_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -529,7 +528,7 @@ pub mod license_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -539,7 +538,7 @@ pub mod license_management_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -550,8 +549,8 @@ pub mod license_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -563,7 +562,7 @@ pub mod consumer_procurement_service {
     /// A builder for [ConsumerProcurementService][crate::client::ConsumerProcurementService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_commerce_consumer_procurement_v1::*;
     /// # use builder::consumer_procurement_service::ClientBuilder;
     /// # use client::ConsumerProcurementService;
@@ -573,19 +572,18 @@ pub mod consumer_procurement_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConsumerProcurementService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConsumerProcurementService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -596,7 +594,7 @@ pub mod consumer_procurement_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConsumerProcurementService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -609,7 +607,7 @@ pub mod consumer_procurement_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -619,7 +617,7 @@ pub mod consumer_procurement_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::consumer_procurement_service::PlaceOrder;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -648,7 +646,7 @@ pub mod consumer_procurement_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -663,7 +661,7 @@ pub mod consumer_procurement_service {
             (*self.0.stub)
                 .place_order(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `place_order`.
@@ -680,7 +678,7 @@ pub mod consumer_procurement_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -742,8 +740,8 @@ pub mod consumer_procurement_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PlaceOrder {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PlaceOrder {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -753,7 +751,7 @@ pub mod consumer_procurement_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::consumer_procurement_service::GetOrder;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -781,7 +779,7 @@ pub mod consumer_procurement_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -791,7 +789,7 @@ pub mod consumer_procurement_service {
             (*self.0.stub)
                 .get_order(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetOrderRequest::name].
@@ -804,8 +802,8 @@ pub mod consumer_procurement_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOrder {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOrder {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -815,8 +813,8 @@ pub mod consumer_procurement_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::consumer_procurement_service::ListOrders;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -847,7 +845,7 @@ pub mod consumer_procurement_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -857,13 +855,13 @@ pub mod consumer_procurement_service {
             (*self.0.stub)
                 .list_orders(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListOrdersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListOrdersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -872,15 +870,17 @@ pub mod consumer_procurement_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListOrdersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListOrdersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -912,8 +912,8 @@ pub mod consumer_procurement_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOrders {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOrders {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -923,7 +923,7 @@ pub mod consumer_procurement_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::consumer_procurement_service::ModifyOrder;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -952,7 +952,7 @@ pub mod consumer_procurement_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -967,7 +967,7 @@ pub mod consumer_procurement_service {
             (*self.0.stub)
                 .modify_order(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `modify_order`.
@@ -984,7 +984,7 @@ pub mod consumer_procurement_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1044,8 +1044,8 @@ pub mod consumer_procurement_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ModifyOrder {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ModifyOrder {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1055,7 +1055,7 @@ pub mod consumer_procurement_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::consumer_procurement_service::CancelOrder;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1084,7 +1084,7 @@ pub mod consumer_procurement_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1099,7 +1099,7 @@ pub mod consumer_procurement_service {
             (*self.0.stub)
                 .cancel_order(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `cancel_order`.
@@ -1116,7 +1116,7 @@ pub mod consumer_procurement_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1170,8 +1170,8 @@ pub mod consumer_procurement_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOrder {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOrder {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1181,7 +1181,7 @@ pub mod consumer_procurement_service {
     /// # Example
     /// ```
     /// # use google_cloud_commerce_consumer_procurement_v1::builder::consumer_procurement_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_commerce_consumer_procurement_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1212,7 +1212,7 @@ pub mod consumer_procurement_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1222,7 +1222,7 @@ pub mod consumer_procurement_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1233,8 +1233,8 @@ pub mod consumer_procurement_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/client.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/client.rs
index 90c6b0c2dd..b5c4e293bb 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/client.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_commerce_consumer_procurement_v1::client::LicenseManagementService;
 /// let client = LicenseManagementService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Commerce Consumer Procurement API.
@@ -66,15 +66,13 @@ impl LicenseManagementService {
     /// Returns a builder for [LicenseManagementService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_commerce_consumer_procurement_v1::client::LicenseManagementService;
     /// let client = LicenseManagementService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::license_management_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::license_management_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::license_management_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl LicenseManagementService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::LicenseManagementService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -110,13 +108,13 @@ impl LicenseManagementService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LicenseManagementService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LicenseManagementService> {
         super::transport::LicenseManagementService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LicenseManagementService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LicenseManagementService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::LicenseManagementService::new)
@@ -163,7 +161,7 @@ impl LicenseManagementService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_commerce_consumer_procurement_v1::client::ConsumerProcurementService;
 /// let client = ConsumerProcurementService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Commerce Consumer Procurement API.
@@ -218,15 +216,13 @@ impl ConsumerProcurementService {
     /// Returns a builder for [ConsumerProcurementService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_commerce_consumer_procurement_v1::client::ConsumerProcurementService;
     /// let client = ConsumerProcurementService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::consumer_procurement_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::consumer_procurement_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::consumer_procurement_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -244,14 +240,14 @@ impl ConsumerProcurementService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::ConsumerProcurementService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -262,13 +258,13 @@ impl ConsumerProcurementService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConsumerProcurementService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConsumerProcurementService> {
         super::transport::ConsumerProcurementService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConsumerProcurementService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConsumerProcurementService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConsumerProcurementService::new)
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/lib.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/lib.rs
index cc2a2c59d8..0fac75423f 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/lib.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/lib.rs
@@ -45,8 +45,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -81,3 +81,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
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 87e2030e19..8f59c4ee92 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/model.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -893,7 +893,7 @@ impl wkt::message::Message for EnumerateLicensedUsersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for EnumerateLicensedUsersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for EnumerateLicensedUsersResponse {
     type PageItem = crate::model::LicensedUser;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2308,7 +2308,7 @@ impl wkt::message::Message for ListOrdersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListOrdersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListOrdersResponse {
     type PageItem = crate::model::Order;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/stub.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/stub.rs
index e66ed02043..b08b427969 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/stub.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     fn get_license_pool(
         &self,
         _req: crate::model::GetLicensePoolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LicensePool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::LicensePool>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     fn update_license_pool(
         &self,
         _req: crate::model::UpdateLicensePoolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LicensePool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::LicensePool>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +62,9 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     fn assign(
         &self,
         _req: crate::model::AssignRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AssignResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AssignResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +73,9 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     fn unassign(
         &self,
         _req: crate::model::UnassignRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UnassignResponse>>,
+        Output = crate::Result<crate::Response<crate::model::UnassignResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,11 +84,9 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     fn enumerate_licensed_users(
         &self,
         _req: crate::model::EnumerateLicensedUsersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::EnumerateLicensedUsersResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::EnumerateLicensedUsersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +95,9 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,9 +119,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     fn place_order(
         &self,
         _req: crate::model::PlaceOrderRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,10 +130,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     fn get_order(
         &self,
         _req: crate::model::GetOrderRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Order>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Order>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -145,9 +140,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     fn list_orders(
         &self,
         _req: crate::model::ListOrdersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListOrdersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListOrdersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,9 +151,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     fn modify_order(
         &self,
         _req: crate::model::ModifyOrderRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,9 +162,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     fn cancel_order(
         &self,
         _req: crate::model::CancelOrderRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +173,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -191,9 +186,9 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -202,8 +197,8 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/stub/dynamic.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/stub/dynamic.rs
index 2a2a4617ae..f07cfa7a8c 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/stub/dynamic.rs
@@ -20,38 +20,38 @@ pub trait LicenseManagementService: std::fmt::Debug + Send + Sync {
     async fn get_license_pool(
         &self,
         req: crate::model::GetLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicensePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicensePool>>;
 
     async fn update_license_pool(
         &self,
         req: crate::model::UpdateLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicensePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicensePool>>;
 
     async fn assign(
         &self,
         req: crate::model::AssignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AssignResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AssignResponse>>;
 
     async fn unassign(
         &self,
         req: crate::model::UnassignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UnassignResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UnassignResponse>>;
 
     async fn enumerate_licensed_users(
         &self,
         req: crate::model::EnumerateLicensedUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EnumerateLicensedUsersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EnumerateLicensedUsersResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::LicenseManagementService] also implement [LicenseManagementService].
@@ -61,8 +61,8 @@ impl<T: super::LicenseManagementService> LicenseManagementService for T {
     async fn get_license_pool(
         &self,
         req: crate::model::GetLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicensePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicensePool>> {
         T::get_license_pool(self, req, options).await
     }
 
@@ -70,8 +70,8 @@ impl<T: super::LicenseManagementService> LicenseManagementService for T {
     async fn update_license_pool(
         &self,
         req: crate::model::UpdateLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicensePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicensePool>> {
         T::update_license_pool(self, req, options).await
     }
 
@@ -79,8 +79,8 @@ impl<T: super::LicenseManagementService> LicenseManagementService for T {
     async fn assign(
         &self,
         req: crate::model::AssignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AssignResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AssignResponse>> {
         T::assign(self, req, options).await
     }
 
@@ -88,8 +88,8 @@ impl<T: super::LicenseManagementService> LicenseManagementService for T {
     async fn unassign(
         &self,
         req: crate::model::UnassignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UnassignResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UnassignResponse>> {
         T::unassign(self, req, options).await
     }
 
@@ -97,8 +97,8 @@ impl<T: super::LicenseManagementService> LicenseManagementService for T {
     async fn enumerate_licensed_users(
         &self,
         req: crate::model::EnumerateLicensedUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EnumerateLicensedUsersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EnumerateLicensedUsersResponse>> {
         T::enumerate_licensed_users(self, req, options).await
     }
 
@@ -106,8 +106,8 @@ impl<T: super::LicenseManagementService> LicenseManagementService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
@@ -118,48 +118,48 @@ pub trait ConsumerProcurementService: std::fmt::Debug + Send + Sync {
     async fn place_order(
         &self,
         req: crate::model::PlaceOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_order(
         &self,
         req: crate::model::GetOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Order>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Order>>;
 
     async fn list_orders(
         &self,
         req: crate::model::ListOrdersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOrdersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOrdersResponse>>;
 
     async fn modify_order(
         &self,
         req: crate::model::ModifyOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_order(
         &self,
         req: crate::model::CancelOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ConsumerProcurementService] also implement [ConsumerProcurementService].
@@ -169,8 +169,8 @@ impl<T: super::ConsumerProcurementService> ConsumerProcurementService for T {
     async fn place_order(
         &self,
         req: crate::model::PlaceOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::place_order(self, req, options).await
     }
 
@@ -178,8 +178,8 @@ impl<T: super::ConsumerProcurementService> ConsumerProcurementService for T {
     async fn get_order(
         &self,
         req: crate::model::GetOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Order>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Order>> {
         T::get_order(self, req, options).await
     }
 
@@ -187,8 +187,8 @@ impl<T: super::ConsumerProcurementService> ConsumerProcurementService for T {
     async fn list_orders(
         &self,
         req: crate::model::ListOrdersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListOrdersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListOrdersResponse>> {
         T::list_orders(self, req, options).await
     }
 
@@ -196,8 +196,8 @@ impl<T: super::ConsumerProcurementService> ConsumerProcurementService for T {
     async fn modify_order(
         &self,
         req: crate::model::ModifyOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::modify_order(self, req, options).await
     }
 
@@ -205,8 +205,8 @@ impl<T: super::ConsumerProcurementService> ConsumerProcurementService for T {
     async fn cancel_order(
         &self,
         req: crate::model::CancelOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::cancel_order(self, req, options).await
     }
 
@@ -214,22 +214,22 @@ impl<T: super::ConsumerProcurementService> ConsumerProcurementService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/tracing.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/tracing.rs
index 35e3664971..b34071b180 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/tracing.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_license_pool(
         &self,
         req: crate::model::GetLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicensePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicensePool>> {
         self.inner.get_license_pool(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_license_pool(
         &self,
         req: crate::model::UpdateLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicensePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicensePool>> {
         self.inner.update_license_pool(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn assign(
         &self,
         req: crate::model::AssignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AssignResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AssignResponse>> {
         self.inner.assign(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn unassign(
         &self,
         req: crate::model::UnassignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UnassignResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UnassignResponse>> {
         self.inner.unassign(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn enumerate_licensed_users(
         &self,
         req: crate::model::EnumerateLicensedUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EnumerateLicensedUsersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EnumerateLicensedUsersResponse>> {
         self.inner.enumerate_licensed_users(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
@@ -118,8 +118,8 @@ where
     async fn place_order(
         &self,
         req: crate::model::PlaceOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.place_order(req, options).await
     }
 
@@ -127,8 +127,8 @@ where
     async fn get_order(
         &self,
         req: crate::model::GetOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Order>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Order>> {
         self.inner.get_order(req, options).await
     }
 
@@ -136,8 +136,8 @@ where
     async fn list_orders(
         &self,
         req: crate::model::ListOrdersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOrdersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOrdersResponse>> {
         self.inner.list_orders(req, options).await
     }
 
@@ -145,8 +145,8 @@ where
     async fn modify_order(
         &self,
         req: crate::model::ModifyOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.modify_order(req, options).await
     }
 
@@ -154,8 +154,8 @@ where
     async fn cancel_order(
         &self,
         req: crate::model::CancelOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.cancel_order(req, options).await
     }
 
@@ -163,22 +163,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
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 e42e29e664..5092ea3c54 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/transport.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [LicenseManagementService](super::stub::LicenseManagementService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for LicenseManagementService {
 }
 
 impl LicenseManagementService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
     async fn get_license_pool(
         &self,
         req: crate::model::GetLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicensePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicensePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
     async fn update_license_pool(
         &self,
         req: crate::model::UpdateLicensePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicensePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicensePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -168,9 +168,9 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -185,13 +185,13 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
     async fn assign(
         &self,
         req: crate::model::AssignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AssignResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AssignResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -230,9 +230,9 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -247,13 +247,13 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
     async fn unassign(
         &self,
         req: crate::model::UnassignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UnassignResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UnassignResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -292,9 +292,9 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -309,13 +309,13 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
     async fn enumerate_licensed_users(
         &self,
         req: crate::model::EnumerateLicensedUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EnumerateLicensedUsersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EnumerateLicensedUsersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -356,9 +356,9 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -373,13 +373,13 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -420,9 +420,9 @@ impl super::stub::LicenseManagementService for LicenseManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -450,7 +450,7 @@ impl std::fmt::Debug for ConsumerProcurementService {
 }
 
 impl ConsumerProcurementService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -460,13 +460,13 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
     async fn place_order(
         &self,
         req: crate::model::PlaceOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -499,9 +499,9 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -516,13 +516,13 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
     async fn get_order(
         &self,
         req: crate::model::GetOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Order>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Order>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -559,9 +559,9 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -576,13 +576,13 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
     async fn list_orders(
         &self,
         req: crate::model::ListOrdersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListOrdersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListOrdersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -618,9 +618,9 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -635,13 +635,13 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
     async fn modify_order(
         &self,
         req: crate::model::ModifyOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -678,9 +678,9 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -695,13 +695,13 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
     async fn cancel_order(
         &self,
         req: crate::model::CancelOrderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -738,9 +738,9 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -755,13 +755,13 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -802,9 +802,9 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -818,15 +818,15 @@ impl super::stub::ConsumerProcurementService for ConsumerProcurementService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/compute/v1/Cargo.toml b/src/generated/cloud/compute/v1/Cargo.toml
index 86e9c461df..27ce7631b1 100644
--- a/src/generated/cloud/compute/v1/Cargo.toml
+++ b/src/generated/cloud/compute/v1/Cargo.toml
@@ -264,8 +264,8 @@ all-features = true
 [dependencies]
 async-trait.workspace      = true
 bytes.workspace            = true
-gax.workspace              = true
 gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
 google-cloud-lro.workspace = true
 google-cloud-rpc.workspace = true
 lazy_static.workspace      = true
diff --git a/src/generated/cloud/compute/v1/src/builder.rs b/src/generated/cloud/compute/v1/src/builder.rs
index 3bd680b650..9273e1b140 100644
--- a/src/generated/cloud/compute/v1/src/builder.rs
+++ b/src/generated/cloud/compute/v1/src/builder.rs
@@ -22,7 +22,7 @@ pub mod accelerator_types {
     /// A builder for [AcceleratorTypes][crate::client::AcceleratorTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::accelerator_types::ClientBuilder;
     /// # use client::AcceleratorTypes;
@@ -32,19 +32,18 @@ pub mod accelerator_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AcceleratorTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AcceleratorTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -55,7 +54,7 @@ pub mod accelerator_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AcceleratorTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -68,7 +67,7 @@ pub mod accelerator_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -78,8 +77,8 @@ pub mod accelerator_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::accelerator_types::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -115,7 +114,7 @@ pub mod accelerator_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125,14 +124,16 @@ pub mod accelerator_types {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AcceleratorTypeAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::AcceleratorTypeAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -140,17 +141,17 @@ pub mod accelerator_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::AcceleratorTypeAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -288,8 +289,8 @@ pub mod accelerator_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -299,7 +300,7 @@ pub mod accelerator_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::accelerator_types::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -330,7 +331,7 @@ pub mod accelerator_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -340,7 +341,7 @@ pub mod accelerator_types {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [accelerator_type][crate::model::accelerator_types::GetRequest::accelerator_type].
@@ -363,8 +364,8 @@ pub mod accelerator_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -374,8 +375,8 @@ pub mod accelerator_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::accelerator_types::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -409,7 +410,7 @@ pub mod accelerator_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -419,13 +420,13 @@ pub mod accelerator_types {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AcceleratorTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::AcceleratorTypeList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -434,15 +435,17 @@ pub mod accelerator_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AcceleratorTypeList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::AcceleratorTypeList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -550,8 +553,8 @@ pub mod accelerator_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -565,7 +568,7 @@ pub mod addresses {
     /// A builder for [Addresses][crate::client::Addresses].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::addresses::ClientBuilder;
     /// # use client::Addresses;
@@ -575,19 +578,18 @@ pub mod addresses {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Addresses;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Addresses;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -598,7 +600,7 @@ pub mod addresses {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Addresses>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -611,7 +613,7 @@ pub mod addresses {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -621,8 +623,8 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -656,7 +658,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -666,13 +668,13 @@ pub mod addresses {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AddressAggregatedList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::AddressAggregatedList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -681,15 +683,17 @@ pub mod addresses {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AddressAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::AddressAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -827,8 +831,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -838,7 +842,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -869,7 +873,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -879,7 +883,7 @@ pub mod addresses {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -892,7 +896,7 @@ pub mod addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -959,8 +963,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -970,7 +974,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -998,7 +1002,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1008,7 +1012,7 @@ pub mod addresses {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [address][crate::model::addresses::GetRequest::address].
@@ -1031,8 +1035,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1042,7 +1046,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1073,7 +1077,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1083,7 +1087,7 @@ pub mod addresses {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -1096,7 +1100,7 @@ pub mod addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -1175,8 +1179,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1186,8 +1190,8 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1218,7 +1222,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1228,13 +1232,14 @@ pub mod addresses {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AddressList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::AddressList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -1242,15 +1247,15 @@ pub mod addresses {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AddressList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::AddressList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1358,8 +1363,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1369,7 +1374,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::Move;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1397,7 +1402,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1407,7 +1412,7 @@ pub mod addresses {
             (*self.0.stub)
                 .r#move(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `r#move`.
@@ -1420,7 +1425,7 @@ pub mod addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -1505,8 +1510,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Move {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Move {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1516,7 +1521,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1547,7 +1552,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1557,7 +1562,7 @@ pub mod addresses {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -1570,7 +1575,7 @@ pub mod addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -1655,8 +1660,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1666,7 +1671,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1699,7 +1704,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1709,7 +1714,7 @@ pub mod addresses {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::addresses::TestIamPermissionsRequest::project].
@@ -1750,8 +1755,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1761,7 +1766,7 @@ pub mod addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::addresses::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1792,7 +1797,7 @@ pub mod addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1802,7 +1807,7 @@ pub mod addresses {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -1825,8 +1830,8 @@ pub mod addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1840,7 +1845,7 @@ pub mod advice {
     /// A builder for [Advice][crate::client::Advice].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::advice::ClientBuilder;
     /// # use client::Advice;
@@ -1850,19 +1855,18 @@ pub mod advice {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Advice;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Advice;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1873,7 +1877,7 @@ pub mod advice {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Advice>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1884,7 +1888,7 @@ pub mod advice {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1894,7 +1898,7 @@ pub mod advice {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::advice::CalendarMode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1923,7 +1927,7 @@ pub mod advice {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1933,7 +1937,7 @@ pub mod advice {
             (*self.0.stub)
                 .calendar_mode(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::advice::CalendarModeRequest::project].
@@ -1968,8 +1972,8 @@ pub mod advice {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CalendarMode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CalendarMode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1983,7 +1987,7 @@ pub mod autoscalers {
     /// A builder for [Autoscalers][crate::client::Autoscalers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::autoscalers::ClientBuilder;
     /// # use client::Autoscalers;
@@ -1993,19 +1997,18 @@ pub mod autoscalers {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Autoscalers;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Autoscalers;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2016,7 +2019,7 @@ pub mod autoscalers {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Autoscalers>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2029,7 +2032,7 @@ pub mod autoscalers {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2039,8 +2042,8 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2074,7 +2077,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2084,14 +2087,16 @@ pub mod autoscalers {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AutoscalerAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::AutoscalerAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -2099,15 +2104,17 @@ pub mod autoscalers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AutoscalerAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::AutoscalerAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2245,8 +2252,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2256,7 +2263,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2287,7 +2294,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2297,7 +2304,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -2310,7 +2317,7 @@ pub mod autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -2377,8 +2384,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2388,7 +2395,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2419,7 +2426,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2429,7 +2436,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [autoscaler][crate::model::autoscalers::GetRequest::autoscaler].
@@ -2452,8 +2459,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2463,7 +2470,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2494,7 +2501,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2504,7 +2511,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -2517,7 +2524,7 @@ pub mod autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -2596,8 +2603,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2607,8 +2614,8 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2642,7 +2649,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2652,13 +2659,13 @@ pub mod autoscalers {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AutoscalerList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::AutoscalerList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -2667,15 +2674,15 @@ pub mod autoscalers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AutoscalerList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::AutoscalerList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2783,8 +2790,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2794,7 +2801,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2825,7 +2832,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2835,7 +2842,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -2848,7 +2855,7 @@ pub mod autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -2945,8 +2952,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2956,7 +2963,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2989,7 +2996,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2999,7 +3006,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::autoscalers::TestIamPermissionsRequest::project].
@@ -3040,8 +3047,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3051,7 +3058,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3082,7 +3089,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3092,7 +3099,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -3105,7 +3112,7 @@ pub mod autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -3202,8 +3209,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3213,7 +3220,7 @@ pub mod autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::autoscalers::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3244,7 +3251,7 @@ pub mod autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3254,7 +3261,7 @@ pub mod autoscalers {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -3277,8 +3284,8 @@ pub mod autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3292,7 +3299,7 @@ pub mod backend_buckets {
     /// A builder for [BackendBuckets][crate::client::BackendBuckets].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::backend_buckets::ClientBuilder;
     /// # use client::BackendBuckets;
@@ -3302,19 +3309,18 @@ pub mod backend_buckets {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BackendBuckets;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BackendBuckets;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3325,7 +3331,7 @@ pub mod backend_buckets {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BackendBuckets>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3338,7 +3344,7 @@ pub mod backend_buckets {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3348,7 +3354,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::AddSignedUrlKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3381,7 +3387,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3391,7 +3397,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .add_signed_url_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_signed_url_key`.
@@ -3404,7 +3410,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -3480,8 +3486,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddSignedUrlKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddSignedUrlKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3491,7 +3497,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3522,7 +3528,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3532,7 +3538,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -3545,7 +3551,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -3603,8 +3609,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3614,7 +3620,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::DeleteSignedUrlKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3647,7 +3653,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3657,7 +3663,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .delete_signed_url_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_signed_url_key`.
@@ -3670,7 +3676,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -3734,8 +3740,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSignedUrlKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSignedUrlKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3745,7 +3751,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3776,7 +3782,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3786,7 +3792,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backend_bucket][crate::model::backend_buckets::GetRequest::backend_bucket].
@@ -3803,8 +3809,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3814,7 +3820,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3845,7 +3851,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3855,7 +3861,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::backend_buckets::GetIamPolicyRequest::options_requested_policy_version].
@@ -3893,8 +3899,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3904,7 +3910,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3935,7 +3941,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3945,7 +3951,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -3958,7 +3964,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -4028,8 +4034,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4039,8 +4045,8 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4074,7 +4080,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4084,13 +4090,13 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::BackendBucketList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::BackendBucketList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -4099,15 +4105,15 @@ pub mod backend_buckets {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::BackendBucketList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::BackendBucketList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4209,8 +4215,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4220,7 +4226,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4251,7 +4257,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4261,7 +4267,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -4274,7 +4280,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -4350,8 +4356,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4361,7 +4367,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::SetEdgeSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4396,7 +4402,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4406,7 +4412,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .set_edge_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_edge_security_policy`.
@@ -4419,7 +4425,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -4495,8 +4501,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetEdgeSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetEdgeSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4506,7 +4512,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4537,7 +4543,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4547,7 +4553,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::backend_buckets::SetIamPolicyRequest::project].
@@ -4582,8 +4588,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4593,7 +4599,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4626,7 +4632,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4636,7 +4642,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::backend_buckets::TestIamPermissionsRequest::project].
@@ -4671,8 +4677,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4682,7 +4688,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4713,7 +4719,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4723,7 +4729,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -4736,7 +4742,7 @@ pub mod backend_buckets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -4812,8 +4818,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4823,7 +4829,7 @@ pub mod backend_buckets {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_buckets::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4854,7 +4860,7 @@ pub mod backend_buckets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4864,7 +4870,7 @@ pub mod backend_buckets {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -4881,8 +4887,8 @@ pub mod backend_buckets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4896,7 +4902,7 @@ pub mod backend_services {
     /// A builder for [BackendServices][crate::client::BackendServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::backend_services::ClientBuilder;
     /// # use client::BackendServices;
@@ -4906,19 +4912,18 @@ pub mod backend_services {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BackendServices;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BackendServices;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4929,7 +4934,7 @@ pub mod backend_services {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BackendServices>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4942,7 +4947,7 @@ pub mod backend_services {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4952,7 +4957,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::AddSignedUrlKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4985,7 +4990,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4995,7 +5000,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .add_signed_url_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_signed_url_key`.
@@ -5008,7 +5013,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -5084,8 +5089,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddSignedUrlKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddSignedUrlKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5095,8 +5100,8 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5132,7 +5137,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5142,14 +5147,16 @@ pub mod backend_services {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::BackendServiceAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::BackendServiceAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -5157,17 +5164,17 @@ pub mod backend_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::BackendServiceAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5305,8 +5312,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5316,7 +5323,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5347,7 +5354,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5357,7 +5364,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -5370,7 +5377,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -5428,8 +5435,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5439,7 +5446,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::DeleteSignedUrlKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5472,7 +5479,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5482,7 +5489,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .delete_signed_url_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_signed_url_key`.
@@ -5495,7 +5502,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -5559,8 +5566,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSignedUrlKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSignedUrlKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5570,7 +5577,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5601,7 +5608,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5611,7 +5618,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backend_service][crate::model::backend_services::GetRequest::backend_service].
@@ -5628,8 +5635,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5639,7 +5646,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::GetEffectiveSecurityPolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5674,7 +5681,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5684,7 +5691,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .get_effective_security_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backend_service][crate::model::backend_services::GetEffectiveSecurityPoliciesRequest::backend_service].
@@ -5701,8 +5708,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEffectiveSecurityPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEffectiveSecurityPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5712,7 +5719,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::GetHealth;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5743,7 +5750,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5753,7 +5760,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .get_health(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backend_service][crate::model::backend_services::GetHealthRequest::backend_service].
@@ -5788,8 +5795,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHealth {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHealth {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5799,7 +5806,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5830,7 +5837,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5840,7 +5847,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::backend_services::GetIamPolicyRequest::options_requested_policy_version].
@@ -5878,8 +5885,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5889,7 +5896,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5920,7 +5927,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5930,7 +5937,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -5943,7 +5950,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -6013,8 +6020,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6024,8 +6031,8 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6059,7 +6066,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6069,13 +6076,13 @@ pub mod backend_services {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::BackendServiceList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::BackendServiceList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -6084,15 +6091,17 @@ pub mod backend_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::BackendServiceList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::BackendServiceList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6194,8 +6203,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6205,8 +6214,8 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::ListUsable;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6240,7 +6249,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6250,14 +6259,16 @@ pub mod backend_services {
             (*self.0.stub)
                 .list_usable(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::BackendServiceListUsable, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::BackendServiceListUsable,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -6265,15 +6276,17 @@ pub mod backend_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::BackendServiceListUsable, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::BackendServiceListUsable,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6375,8 +6388,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListUsable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListUsable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6386,7 +6399,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6417,7 +6430,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6427,7 +6440,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -6440,7 +6453,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -6516,8 +6529,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6527,7 +6540,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::SetEdgeSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6562,7 +6575,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6572,7 +6585,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .set_edge_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_edge_security_policy`.
@@ -6585,7 +6598,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -6661,8 +6674,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetEdgeSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetEdgeSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6672,7 +6685,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6703,7 +6716,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6713,7 +6726,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::backend_services::SetIamPolicyRequest::project].
@@ -6748,8 +6761,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6759,7 +6772,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::SetSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6792,7 +6805,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6802,7 +6815,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .set_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_security_policy`.
@@ -6815,7 +6828,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -6891,8 +6904,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6902,7 +6915,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6935,7 +6948,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6945,7 +6958,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::backend_services::TestIamPermissionsRequest::project].
@@ -6980,8 +6993,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6991,7 +7004,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7022,7 +7035,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7032,7 +7045,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -7045,7 +7058,7 @@ pub mod backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -7121,8 +7134,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7132,7 +7145,7 @@ pub mod backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::backend_services::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7163,7 +7176,7 @@ pub mod backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7173,7 +7186,7 @@ pub mod backend_services {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -7190,8 +7203,8 @@ pub mod backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7205,7 +7218,7 @@ pub mod cross_site_networks {
     /// A builder for [CrossSiteNetworks][crate::client::CrossSiteNetworks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::cross_site_networks::ClientBuilder;
     /// # use client::CrossSiteNetworks;
@@ -7215,19 +7228,18 @@ pub mod cross_site_networks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CrossSiteNetworks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CrossSiteNetworks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7238,7 +7250,7 @@ pub mod cross_site_networks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CrossSiteNetworks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7251,7 +7263,7 @@ pub mod cross_site_networks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7261,7 +7273,7 @@ pub mod cross_site_networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::cross_site_networks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7292,7 +7304,7 @@ pub mod cross_site_networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7302,7 +7314,7 @@ pub mod cross_site_networks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -7315,7 +7327,7 @@ pub mod cross_site_networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -7373,8 +7385,8 @@ pub mod cross_site_networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7384,7 +7396,7 @@ pub mod cross_site_networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::cross_site_networks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7415,7 +7427,7 @@ pub mod cross_site_networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7425,7 +7437,7 @@ pub mod cross_site_networks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [cross_site_network][crate::model::cross_site_networks::GetRequest::cross_site_network].
@@ -7442,8 +7454,8 @@ pub mod cross_site_networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7453,7 +7465,7 @@ pub mod cross_site_networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::cross_site_networks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7484,7 +7496,7 @@ pub mod cross_site_networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7494,7 +7506,7 @@ pub mod cross_site_networks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -7507,7 +7519,7 @@ pub mod cross_site_networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -7595,8 +7607,8 @@ pub mod cross_site_networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7606,8 +7618,8 @@ pub mod cross_site_networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::cross_site_networks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7641,7 +7653,7 @@ pub mod cross_site_networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7651,13 +7663,13 @@ pub mod cross_site_networks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::CrossSiteNetworkList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::CrossSiteNetworkList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -7666,15 +7678,17 @@ pub mod cross_site_networks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::CrossSiteNetworkList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::CrossSiteNetworkList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7776,8 +7790,8 @@ pub mod cross_site_networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7787,7 +7801,7 @@ pub mod cross_site_networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::cross_site_networks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7818,7 +7832,7 @@ pub mod cross_site_networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7828,7 +7842,7 @@ pub mod cross_site_networks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -7841,7 +7855,7 @@ pub mod cross_site_networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -7953,8 +7967,8 @@ pub mod cross_site_networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7964,7 +7978,7 @@ pub mod cross_site_networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::cross_site_networks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7995,7 +8009,7 @@ pub mod cross_site_networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8005,7 +8019,7 @@ pub mod cross_site_networks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -8022,8 +8036,8 @@ pub mod cross_site_networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8037,7 +8051,7 @@ pub mod disk_types {
     /// A builder for [DiskTypes][crate::client::DiskTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::disk_types::ClientBuilder;
     /// # use client::DiskTypes;
@@ -8047,19 +8061,18 @@ pub mod disk_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DiskTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DiskTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8070,7 +8083,7 @@ pub mod disk_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DiskTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8083,7 +8096,7 @@ pub mod disk_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8093,8 +8106,8 @@ pub mod disk_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disk_types::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8128,7 +8141,7 @@ pub mod disk_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8138,14 +8151,16 @@ pub mod disk_types {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DiskTypeAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::DiskTypeAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -8153,15 +8168,17 @@ pub mod disk_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DiskTypeAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::DiskTypeAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8299,8 +8316,8 @@ pub mod disk_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8310,7 +8327,7 @@ pub mod disk_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disk_types::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8338,7 +8355,7 @@ pub mod disk_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8348,7 +8365,7 @@ pub mod disk_types {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [disk_type][crate::model::disk_types::GetRequest::disk_type].
@@ -8371,8 +8388,8 @@ pub mod disk_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8382,8 +8399,8 @@ pub mod disk_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disk_types::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8417,7 +8434,7 @@ pub mod disk_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8427,13 +8444,14 @@ pub mod disk_types {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DiskTypeList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::DiskTypeList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -8441,15 +8459,15 @@ pub mod disk_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DiskTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::DiskTypeList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8557,8 +8575,8 @@ pub mod disk_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8572,7 +8590,7 @@ pub mod disks {
     /// A builder for [Disks][crate::client::Disks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::disks::ClientBuilder;
     /// # use client::Disks;
@@ -8582,19 +8600,18 @@ pub mod disks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Disks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Disks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8605,7 +8622,7 @@ pub mod disks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Disks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8616,7 +8633,7 @@ pub mod disks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8626,7 +8643,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::AddResourcePolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8655,7 +8672,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8665,7 +8682,7 @@ pub mod disks {
             (*self.0.stub)
                 .add_resource_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_resource_policies`.
@@ -8678,7 +8695,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -8763,8 +8780,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddResourcePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddResourcePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8774,8 +8791,8 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8807,7 +8824,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8817,13 +8834,13 @@ pub mod disks {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DiskAggregatedList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::DiskAggregatedList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -8832,15 +8849,17 @@ pub mod disks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DiskAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::DiskAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8978,8 +8997,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8989,7 +9008,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::BulkInsert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9018,7 +9037,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9028,7 +9047,7 @@ pub mod disks {
             (*self.0.stub)
                 .bulk_insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_insert`.
@@ -9041,7 +9060,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -9120,8 +9139,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkInsert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkInsert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9131,7 +9150,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::BulkSetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9160,7 +9179,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9170,7 +9189,7 @@ pub mod disks {
             (*self.0.stub)
                 .bulk_set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_set_labels`.
@@ -9183,7 +9202,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -9280,8 +9299,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkSetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkSetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9291,7 +9310,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::CreateSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9320,7 +9339,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9330,7 +9349,7 @@ pub mod disks {
             (*self.0.stub)
                 .create_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_snapshot`.
@@ -9343,7 +9362,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -9446,8 +9465,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9457,7 +9476,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9483,7 +9502,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9493,7 +9512,7 @@ pub mod disks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -9506,7 +9525,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -9573,8 +9592,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9584,7 +9603,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9610,7 +9629,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9620,7 +9639,7 @@ pub mod disks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [disk][crate::model::disks::GetRequest::disk].
@@ -9643,8 +9662,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9654,7 +9673,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9683,7 +9702,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9693,7 +9712,7 @@ pub mod disks {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::disks::GetIamPolicyRequest::options_requested_policy_version].
@@ -9737,8 +9756,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9748,7 +9767,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9774,7 +9793,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9784,7 +9803,7 @@ pub mod disks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -9797,7 +9816,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -9894,8 +9913,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9905,8 +9924,8 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9935,7 +9954,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9945,13 +9964,14 @@ pub mod disks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DiskList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::DiskList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -9959,14 +9979,15 @@ pub mod disks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DiskList, gax::error::Error> {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::DiskList, crate::Error>
+        {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10074,8 +10095,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10085,7 +10106,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::RemoveResourcePolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10116,7 +10137,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10126,7 +10147,7 @@ pub mod disks {
             (*self.0.stub)
                 .remove_resource_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_resource_policies`.
@@ -10139,7 +10160,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -10224,8 +10245,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveResourcePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveResourcePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10235,7 +10256,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::Resize;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10261,7 +10282,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10271,7 +10292,7 @@ pub mod disks {
             (*self.0.stub)
                 .resize(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize`.
@@ -10284,7 +10305,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -10369,8 +10390,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Resize {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Resize {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10380,7 +10401,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10409,7 +10430,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10419,7 +10440,7 @@ pub mod disks {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::disks::SetIamPolicyRequest::project].
@@ -10460,8 +10481,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10471,7 +10492,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10500,7 +10521,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10510,7 +10531,7 @@ pub mod disks {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -10523,7 +10544,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -10608,8 +10629,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10619,7 +10640,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::StartAsyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10650,7 +10671,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10660,7 +10681,7 @@ pub mod disks {
             (*self.0.stub)
                 .start_async_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_async_replication`.
@@ -10673,7 +10694,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -10758,8 +10779,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartAsyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartAsyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10769,7 +10790,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::StopAsyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10800,7 +10821,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10810,7 +10831,7 @@ pub mod disks {
             (*self.0.stub)
                 .stop_async_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_async_replication`.
@@ -10823,7 +10844,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -10890,8 +10911,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopAsyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopAsyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10901,7 +10922,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::StopGroupAsyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10932,7 +10953,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10942,7 +10963,7 @@ pub mod disks {
             (*self.0.stub)
                 .stop_group_async_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_group_async_replication`.
@@ -10955,7 +10976,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -11034,8 +11055,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopGroupAsyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopGroupAsyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11045,7 +11066,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11074,7 +11095,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11084,7 +11105,7 @@ pub mod disks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::disks::TestIamPermissionsRequest::project].
@@ -11125,8 +11146,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11136,7 +11157,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11162,7 +11183,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11172,7 +11193,7 @@ pub mod disks {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -11185,7 +11206,7 @@ pub mod disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -11306,8 +11327,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11317,7 +11338,7 @@ pub mod disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::disks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11346,7 +11367,7 @@ pub mod disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11356,7 +11377,7 @@ pub mod disks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -11379,8 +11400,8 @@ pub mod disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11394,7 +11415,7 @@ pub mod external_vpn_gateways {
     /// A builder for [ExternalVpnGateways][crate::client::ExternalVpnGateways].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::external_vpn_gateways::ClientBuilder;
     /// # use client::ExternalVpnGateways;
@@ -11404,19 +11425,18 @@ pub mod external_vpn_gateways {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ExternalVpnGateways;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ExternalVpnGateways;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11427,7 +11447,7 @@ pub mod external_vpn_gateways {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ExternalVpnGateways>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11440,7 +11460,7 @@ pub mod external_vpn_gateways {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11450,7 +11470,7 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11481,7 +11501,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11491,7 +11511,7 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -11504,7 +11524,7 @@ pub mod external_vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -11562,8 +11582,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11573,7 +11593,7 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11604,7 +11624,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11614,7 +11634,7 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [external_vpn_gateway][crate::model::external_vpn_gateways::GetRequest::external_vpn_gateway].
@@ -11631,8 +11651,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11642,7 +11662,7 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11673,7 +11693,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11683,7 +11703,7 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -11696,7 +11716,7 @@ pub mod external_vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -11766,8 +11786,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11777,8 +11797,8 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11812,7 +11832,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11822,14 +11842,16 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ExternalVpnGatewayList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ExternalVpnGatewayList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -11837,15 +11859,17 @@ pub mod external_vpn_gateways {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ExternalVpnGatewayList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ExternalVpnGatewayList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11947,8 +11971,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11958,7 +11982,7 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11989,7 +12013,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11999,7 +12023,7 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -12012,7 +12036,7 @@ pub mod external_vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -12070,8 +12094,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12081,7 +12105,7 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12116,7 +12140,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12126,7 +12150,7 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::external_vpn_gateways::TestIamPermissionsRequest::project].
@@ -12161,8 +12185,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12172,7 +12196,7 @@ pub mod external_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::external_vpn_gateways::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12203,7 +12227,7 @@ pub mod external_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12213,7 +12237,7 @@ pub mod external_vpn_gateways {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -12230,8 +12254,8 @@ pub mod external_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12245,7 +12269,7 @@ pub mod firewall_policies {
     /// A builder for [FirewallPolicies][crate::client::FirewallPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::firewall_policies::ClientBuilder;
     /// # use client::FirewallPolicies;
@@ -12255,19 +12279,18 @@ pub mod firewall_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FirewallPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FirewallPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -12278,7 +12301,7 @@ pub mod firewall_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FirewallPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -12291,7 +12314,7 @@ pub mod firewall_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -12301,7 +12324,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::AddAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12334,7 +12357,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12344,7 +12367,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .add_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_association`.
@@ -12357,7 +12380,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12445,8 +12468,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12456,7 +12479,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::AddRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12487,7 +12510,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12497,7 +12520,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .add_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_rule`.
@@ -12510,7 +12533,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12577,8 +12600,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12588,7 +12611,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::CloneRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12619,7 +12642,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12629,7 +12652,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .clone_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `clone_rules`.
@@ -12642,7 +12665,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12709,8 +12732,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CloneRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CloneRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12720,7 +12743,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12751,7 +12774,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12761,7 +12784,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -12774,7 +12797,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12823,8 +12846,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12834,7 +12857,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12865,7 +12888,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12875,7 +12898,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::firewall_policies::GetRequest::firewall_policy].
@@ -12886,8 +12909,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12897,7 +12920,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::GetAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12930,7 +12953,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12940,7 +12963,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .get_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::firewall_policies::GetAssociationRequest::firewall_policy].
@@ -12969,8 +12992,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12980,7 +13003,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13011,7 +13034,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13021,7 +13044,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::firewall_policies::GetIamPolicyRequest::options_requested_policy_version].
@@ -13053,8 +13076,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13064,7 +13087,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13095,7 +13118,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13105,7 +13128,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::firewall_policies::GetRuleRequest::firewall_policy].
@@ -13134,8 +13157,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13145,7 +13168,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13176,7 +13199,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13186,7 +13209,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -13199,7 +13222,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13278,8 +13301,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13289,8 +13312,8 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13324,7 +13347,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13334,13 +13357,13 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::FirewallPolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::FirewallPolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -13349,15 +13372,17 @@ pub mod firewall_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::FirewallPolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::FirewallPolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13471,8 +13496,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13482,7 +13507,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::ListAssociations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13515,7 +13540,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13525,7 +13550,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .list_associations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [target_resource][crate::model::firewall_policies::ListAssociationsRequest::target_resource].
@@ -13548,8 +13573,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssociations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssociations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13559,7 +13584,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::Move;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13590,7 +13615,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13600,7 +13625,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .r#move(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `r#move`.
@@ -13613,7 +13638,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13680,8 +13705,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Move {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Move {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13691,7 +13716,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13722,7 +13747,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13732,7 +13757,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -13745,7 +13770,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13812,8 +13837,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13823,7 +13848,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::PatchRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13854,7 +13879,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13864,7 +13889,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .patch_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_rule`.
@@ -13877,7 +13902,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -13962,8 +13987,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13973,7 +13998,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::RemoveAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14006,7 +14031,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14016,7 +14041,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .remove_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_association`.
@@ -14029,7 +14054,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14096,8 +14121,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14107,7 +14132,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::RemoveRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14138,7 +14163,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14148,7 +14173,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .remove_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_rule`.
@@ -14161,7 +14186,7 @@ pub mod firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14228,8 +14253,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14239,7 +14264,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14270,7 +14295,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14280,7 +14305,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][crate::model::firewall_policies::SetIamPolicyRequest::resource].
@@ -14309,8 +14334,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14320,7 +14345,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14353,7 +14378,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14363,7 +14388,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][crate::model::firewall_policies::TestIamPermissionsRequest::resource].
@@ -14392,8 +14417,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14403,7 +14428,7 @@ pub mod firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewall_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14436,7 +14461,7 @@ pub mod firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14446,7 +14471,7 @@ pub mod firewall_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_organization_operations::GetRequest::operation].
@@ -14475,8 +14500,8 @@ pub mod firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14490,7 +14515,7 @@ pub mod firewalls {
     /// A builder for [Firewalls][crate::client::Firewalls].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::firewalls::ClientBuilder;
     /// # use client::Firewalls;
@@ -14500,19 +14525,18 @@ pub mod firewalls {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Firewalls;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Firewalls;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -14523,7 +14547,7 @@ pub mod firewalls {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Firewalls>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -14536,7 +14560,7 @@ pub mod firewalls {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -14546,7 +14570,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14577,7 +14601,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14587,7 +14611,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -14600,7 +14624,7 @@ pub mod firewalls {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -14658,8 +14682,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14669,7 +14693,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14697,7 +14721,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14707,7 +14731,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall][crate::model::firewalls::GetRequest::firewall].
@@ -14724,8 +14748,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14735,7 +14759,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14766,7 +14790,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14776,7 +14800,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -14789,7 +14813,7 @@ pub mod firewalls {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -14859,8 +14883,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14870,8 +14894,8 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14902,7 +14926,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14912,13 +14936,14 @@ pub mod firewalls {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::FirewallList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::FirewallList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -14926,15 +14951,15 @@ pub mod firewalls {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::FirewallList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::FirewallList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15036,8 +15061,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15047,7 +15072,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15078,7 +15103,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15088,7 +15113,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -15101,7 +15126,7 @@ pub mod firewalls {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -15177,8 +15202,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15188,7 +15213,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15221,7 +15246,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15231,7 +15256,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::firewalls::TestIamPermissionsRequest::project].
@@ -15266,8 +15291,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15277,7 +15302,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15308,7 +15333,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15318,7 +15343,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -15331,7 +15356,7 @@ pub mod firewalls {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -15407,8 +15432,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15418,7 +15443,7 @@ pub mod firewalls {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::firewalls::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15449,7 +15474,7 @@ pub mod firewalls {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15459,7 +15484,7 @@ pub mod firewalls {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -15476,8 +15501,8 @@ pub mod firewalls {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15491,7 +15516,7 @@ pub mod forwarding_rules {
     /// A builder for [ForwardingRules][crate::client::ForwardingRules].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::forwarding_rules::ClientBuilder;
     /// # use client::ForwardingRules;
@@ -15501,19 +15526,18 @@ pub mod forwarding_rules {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ForwardingRules;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ForwardingRules;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -15524,7 +15548,7 @@ pub mod forwarding_rules {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ForwardingRules>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -15537,7 +15561,7 @@ pub mod forwarding_rules {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -15547,8 +15571,8 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15584,7 +15608,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15594,14 +15618,16 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ForwardingRuleAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ForwardingRuleAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -15609,17 +15635,17 @@ pub mod forwarding_rules {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ForwardingRuleAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15757,8 +15783,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15768,7 +15794,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15799,7 +15825,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15809,7 +15835,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -15822,7 +15848,7 @@ pub mod forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -15889,8 +15915,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15900,7 +15926,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15931,7 +15957,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15941,7 +15967,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [forwarding_rule][crate::model::forwarding_rules::GetRequest::forwarding_rule].
@@ -15964,8 +15990,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15975,7 +16001,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16006,7 +16032,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16016,7 +16042,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -16029,7 +16055,7 @@ pub mod forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -16108,8 +16134,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16119,8 +16145,8 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16154,7 +16180,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16164,13 +16190,13 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ForwardingRuleList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ForwardingRuleList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -16179,15 +16205,17 @@ pub mod forwarding_rules {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ForwardingRuleList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ForwardingRuleList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16295,8 +16323,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16306,7 +16334,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16337,7 +16365,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16347,7 +16375,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -16360,7 +16388,7 @@ pub mod forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -16445,8 +16473,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16456,7 +16484,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16487,7 +16515,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16497,7 +16525,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -16510,7 +16538,7 @@ pub mod forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -16595,8 +16623,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16606,7 +16634,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::SetTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16637,7 +16665,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16647,7 +16675,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .set_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_target`.
@@ -16660,7 +16688,7 @@ pub mod forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -16745,8 +16773,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16756,7 +16784,7 @@ pub mod forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::forwarding_rules::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16787,7 +16815,7 @@ pub mod forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16797,7 +16825,7 @@ pub mod forwarding_rules {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -16820,8 +16848,8 @@ pub mod forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16835,7 +16863,7 @@ pub mod future_reservations {
     /// A builder for [FutureReservations][crate::client::FutureReservations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::future_reservations::ClientBuilder;
     /// # use client::FutureReservations;
@@ -16845,19 +16873,18 @@ pub mod future_reservations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FutureReservations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FutureReservations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -16868,7 +16895,7 @@ pub mod future_reservations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FutureReservations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -16881,7 +16908,7 @@ pub mod future_reservations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -16891,8 +16918,8 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16928,7 +16955,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16938,15 +16965,15 @@ pub mod future_reservations {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FutureReservationsAggregatedListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -16955,17 +16982,17 @@ pub mod future_reservations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FutureReservationsAggregatedListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17103,8 +17130,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17114,7 +17141,7 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::Cancel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17145,7 +17172,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17155,7 +17182,7 @@ pub mod future_reservations {
             (*self.0.stub)
                 .cancel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `cancel`.
@@ -17168,7 +17195,7 @@ pub mod future_reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -17235,8 +17262,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Cancel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Cancel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17246,7 +17273,7 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17277,7 +17304,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17287,7 +17314,7 @@ pub mod future_reservations {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -17300,7 +17327,7 @@ pub mod future_reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -17367,8 +17394,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17378,7 +17405,7 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17409,7 +17436,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17419,7 +17446,7 @@ pub mod future_reservations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [future_reservation][crate::model::future_reservations::GetRequest::future_reservation].
@@ -17442,8 +17469,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17453,7 +17480,7 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17484,7 +17511,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17494,7 +17521,7 @@ pub mod future_reservations {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -17507,7 +17534,7 @@ pub mod future_reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -17586,8 +17613,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17597,8 +17624,8 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17632,7 +17659,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17642,15 +17669,15 @@ pub mod future_reservations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FutureReservationsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -17659,17 +17686,17 @@ pub mod future_reservations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FutureReservationsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17777,8 +17804,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17788,7 +17815,7 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17819,7 +17846,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17829,7 +17856,7 @@ pub mod future_reservations {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -17842,7 +17869,7 @@ pub mod future_reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -17945,8 +17972,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17956,7 +17983,7 @@ pub mod future_reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::future_reservations::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17987,7 +18014,7 @@ pub mod future_reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17997,7 +18024,7 @@ pub mod future_reservations {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -18020,8 +18047,8 @@ pub mod future_reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18035,7 +18062,7 @@ pub mod global_addresses {
     /// A builder for [GlobalAddresses][crate::client::GlobalAddresses].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::global_addresses::ClientBuilder;
     /// # use client::GlobalAddresses;
@@ -18045,19 +18072,18 @@ pub mod global_addresses {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GlobalAddresses;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GlobalAddresses;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -18068,7 +18094,7 @@ pub mod global_addresses {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GlobalAddresses>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -18081,7 +18107,7 @@ pub mod global_addresses {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -18091,7 +18117,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18122,7 +18148,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18132,7 +18158,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -18145,7 +18171,7 @@ pub mod global_addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -18203,8 +18229,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18214,7 +18240,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18245,7 +18271,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18255,7 +18281,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [address][crate::model::global_addresses::GetRequest::address].
@@ -18272,8 +18298,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18283,7 +18309,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18314,7 +18340,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18324,7 +18350,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -18337,7 +18363,7 @@ pub mod global_addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -18407,8 +18433,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18418,8 +18444,8 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18453,7 +18479,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18463,13 +18489,14 @@ pub mod global_addresses {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AddressList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::AddressList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -18477,15 +18504,15 @@ pub mod global_addresses {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AddressList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::AddressList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18587,8 +18614,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18598,7 +18625,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::Move;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18629,7 +18656,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18639,7 +18666,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .r#move(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `r#move`.
@@ -18652,7 +18679,7 @@ pub mod global_addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -18728,8 +18755,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Move {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Move {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18739,7 +18766,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18770,7 +18797,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18780,7 +18807,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -18793,7 +18820,7 @@ pub mod global_addresses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -18851,8 +18878,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18862,7 +18889,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18895,7 +18922,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18905,7 +18932,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::global_addresses::TestIamPermissionsRequest::project].
@@ -18940,8 +18967,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18951,7 +18978,7 @@ pub mod global_addresses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_addresses::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18982,7 +19009,7 @@ pub mod global_addresses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18992,7 +19019,7 @@ pub mod global_addresses {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -19009,8 +19036,8 @@ pub mod global_addresses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19024,7 +19051,7 @@ pub mod global_forwarding_rules {
     /// A builder for [GlobalForwardingRules][crate::client::GlobalForwardingRules].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::global_forwarding_rules::ClientBuilder;
     /// # use client::GlobalForwardingRules;
@@ -19034,19 +19061,18 @@ pub mod global_forwarding_rules {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GlobalForwardingRules;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GlobalForwardingRules;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -19057,7 +19083,7 @@ pub mod global_forwarding_rules {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GlobalForwardingRules>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -19070,7 +19096,7 @@ pub mod global_forwarding_rules {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -19080,7 +19106,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19111,7 +19137,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19121,7 +19147,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -19134,7 +19160,7 @@ pub mod global_forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -19192,8 +19218,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19203,7 +19229,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19234,7 +19260,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19244,7 +19270,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [forwarding_rule][crate::model::global_forwarding_rules::GetRequest::forwarding_rule].
@@ -19261,8 +19287,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19272,7 +19298,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19303,7 +19329,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19313,7 +19339,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -19326,7 +19352,7 @@ pub mod global_forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -19396,8 +19422,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19407,8 +19433,8 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19442,7 +19468,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19452,13 +19478,13 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ForwardingRuleList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ForwardingRuleList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -19467,15 +19493,17 @@ pub mod global_forwarding_rules {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ForwardingRuleList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ForwardingRuleList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19577,8 +19605,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19588,7 +19616,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19619,7 +19647,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19629,7 +19657,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -19642,7 +19670,7 @@ pub mod global_forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -19718,8 +19746,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19729,7 +19757,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19760,7 +19788,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19770,7 +19798,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -19783,7 +19811,7 @@ pub mod global_forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -19841,8 +19869,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19852,7 +19880,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::SetTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19883,7 +19911,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19893,7 +19921,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .set_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_target`.
@@ -19906,7 +19934,7 @@ pub mod global_forwarding_rules {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -19982,8 +20010,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19993,7 +20021,7 @@ pub mod global_forwarding_rules {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_forwarding_rules::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20024,7 +20052,7 @@ pub mod global_forwarding_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20034,7 +20062,7 @@ pub mod global_forwarding_rules {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -20051,8 +20079,8 @@ pub mod global_forwarding_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20066,7 +20094,7 @@ pub mod global_network_endpoint_groups {
     /// A builder for [GlobalNetworkEndpointGroups][crate::client::GlobalNetworkEndpointGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::global_network_endpoint_groups::ClientBuilder;
     /// # use client::GlobalNetworkEndpointGroups;
@@ -20076,19 +20104,18 @@ pub mod global_network_endpoint_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GlobalNetworkEndpointGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GlobalNetworkEndpointGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -20099,7 +20126,7 @@ pub mod global_network_endpoint_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GlobalNetworkEndpointGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -20112,7 +20139,7 @@ pub mod global_network_endpoint_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -20122,7 +20149,7 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::AttachNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20157,7 +20184,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20167,7 +20194,7 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .attach_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `attach_network_endpoints`.
@@ -20180,7 +20207,7 @@ pub mod global_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -20256,8 +20283,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AttachNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AttachNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20267,7 +20294,7 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20300,7 +20327,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20310,7 +20337,7 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -20323,7 +20350,7 @@ pub mod global_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -20381,8 +20408,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20392,7 +20419,7 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::DetachNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20427,7 +20454,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20437,7 +20464,7 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .detach_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `detach_network_endpoints`.
@@ -20450,7 +20477,7 @@ pub mod global_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -20526,8 +20553,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20537,7 +20564,7 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20568,7 +20595,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20578,7 +20605,7 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network_endpoint_group][crate::model::global_network_endpoint_groups::GetRequest::network_endpoint_group].
@@ -20595,8 +20622,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20606,7 +20633,7 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20639,7 +20666,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20649,7 +20676,7 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -20662,7 +20689,7 @@ pub mod global_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -20732,8 +20759,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20743,8 +20770,8 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20778,7 +20805,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20788,14 +20815,16 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NetworkEndpointGroupList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NetworkEndpointGroupList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -20803,15 +20832,17 @@ pub mod global_network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NetworkEndpointGroupList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NetworkEndpointGroupList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20913,8 +20944,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20924,8 +20955,8 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::ListNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20963,7 +20994,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20973,15 +21004,15 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .list_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkEndpointGroupsListNetworkEndpoints,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -20990,17 +21021,17 @@ pub mod global_network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkEndpointGroupsListNetworkEndpoints,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21108,8 +21139,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21119,7 +21150,7 @@ pub mod global_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_network_endpoint_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21150,7 +21181,7 @@ pub mod global_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21160,7 +21191,7 @@ pub mod global_network_endpoint_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -21177,8 +21208,8 @@ pub mod global_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21192,7 +21223,7 @@ pub mod global_operations {
     /// A builder for [GlobalOperations][crate::client::GlobalOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::global_operations::ClientBuilder;
     /// # use client::GlobalOperations;
@@ -21202,19 +21233,18 @@ pub mod global_operations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GlobalOperations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GlobalOperations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -21225,7 +21255,7 @@ pub mod global_operations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GlobalOperations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -21238,7 +21268,7 @@ pub mod global_operations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -21248,8 +21278,8 @@ pub mod global_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_operations::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21285,7 +21315,7 @@ pub mod global_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21295,14 +21325,16 @@ pub mod global_operations {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::OperationAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::OperationAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -21310,15 +21342,17 @@ pub mod global_operations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::OperationAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::OperationAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21456,8 +21490,8 @@ pub mod global_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21467,7 +21501,7 @@ pub mod global_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_operations::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21498,7 +21532,7 @@ pub mod global_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21508,7 +21542,7 @@ pub mod global_operations {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::DeleteRequest::operation].
@@ -21525,8 +21559,8 @@ pub mod global_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21536,7 +21570,7 @@ pub mod global_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_operations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21567,7 +21601,7 @@ pub mod global_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21577,7 +21611,7 @@ pub mod global_operations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -21594,8 +21628,8 @@ pub mod global_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21605,8 +21639,8 @@ pub mod global_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_operations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21640,7 +21674,7 @@ pub mod global_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21650,13 +21684,13 @@ pub mod global_operations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::OperationList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -21665,15 +21699,15 @@ pub mod global_operations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::OperationList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21775,8 +21809,8 @@ pub mod global_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21786,7 +21820,7 @@ pub mod global_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_operations::Wait;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21817,7 +21851,7 @@ pub mod global_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21827,7 +21861,7 @@ pub mod global_operations {
             (*self.0.stub)
                 .wait(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::WaitRequest::operation].
@@ -21844,8 +21878,8 @@ pub mod global_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Wait {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Wait {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21859,7 +21893,7 @@ pub mod global_organization_operations {
     /// A builder for [GlobalOrganizationOperations][crate::client::GlobalOrganizationOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::global_organization_operations::ClientBuilder;
     /// # use client::GlobalOrganizationOperations;
@@ -21869,19 +21903,18 @@ pub mod global_organization_operations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GlobalOrganizationOperations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GlobalOrganizationOperations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -21892,7 +21925,7 @@ pub mod global_organization_operations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GlobalOrganizationOperations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -21905,7 +21938,7 @@ pub mod global_organization_operations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -21915,7 +21948,7 @@ pub mod global_organization_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_organization_operations::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21948,7 +21981,7 @@ pub mod global_organization_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21958,7 +21991,7 @@ pub mod global_organization_operations {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_organization_operations::DeleteRequest::operation].
@@ -21987,8 +22020,8 @@ pub mod global_organization_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21998,7 +22031,7 @@ pub mod global_organization_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_organization_operations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22029,7 +22062,7 @@ pub mod global_organization_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22039,7 +22072,7 @@ pub mod global_organization_operations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_organization_operations::GetRequest::operation].
@@ -22068,8 +22101,8 @@ pub mod global_organization_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22079,8 +22112,8 @@ pub mod global_organization_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_organization_operations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -22114,7 +22147,7 @@ pub mod global_organization_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22124,13 +22157,13 @@ pub mod global_organization_operations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::OperationList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -22139,15 +22172,15 @@ pub mod global_organization_operations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::OperationList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22261,8 +22294,8 @@ pub mod global_organization_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22276,7 +22309,7 @@ pub mod global_public_delegated_prefixes {
     /// A builder for [GlobalPublicDelegatedPrefixes][crate::client::GlobalPublicDelegatedPrefixes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::global_public_delegated_prefixes::ClientBuilder;
     /// # use client::GlobalPublicDelegatedPrefixes;
@@ -22286,19 +22319,18 @@ pub mod global_public_delegated_prefixes {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GlobalPublicDelegatedPrefixes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GlobalPublicDelegatedPrefixes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -22309,7 +22341,7 @@ pub mod global_public_delegated_prefixes {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GlobalPublicDelegatedPrefixes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -22322,7 +22354,7 @@ pub mod global_public_delegated_prefixes {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -22332,7 +22364,7 @@ pub mod global_public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_public_delegated_prefixes::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22367,7 +22399,7 @@ pub mod global_public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22377,7 +22409,7 @@ pub mod global_public_delegated_prefixes {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -22390,7 +22422,7 @@ pub mod global_public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -22448,8 +22480,8 @@ pub mod global_public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22459,7 +22491,7 @@ pub mod global_public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_public_delegated_prefixes::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22490,7 +22522,7 @@ pub mod global_public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22500,7 +22532,7 @@ pub mod global_public_delegated_prefixes {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::global_public_delegated_prefixes::GetRequest::project].
@@ -22517,8 +22549,8 @@ pub mod global_public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22528,7 +22560,7 @@ pub mod global_public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_public_delegated_prefixes::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22563,7 +22595,7 @@ pub mod global_public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22573,7 +22605,7 @@ pub mod global_public_delegated_prefixes {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -22586,7 +22618,7 @@ pub mod global_public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -22656,8 +22688,8 @@ pub mod global_public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22667,8 +22699,8 @@ pub mod global_public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_public_delegated_prefixes::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -22704,7 +22736,7 @@ pub mod global_public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22714,14 +22746,16 @@ pub mod global_public_delegated_prefixes {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PublicDelegatedPrefixList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::PublicDelegatedPrefixList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -22729,15 +22763,17 @@ pub mod global_public_delegated_prefixes {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::PublicDelegatedPrefixList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::PublicDelegatedPrefixList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22839,8 +22875,8 @@ pub mod global_public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22850,7 +22886,7 @@ pub mod global_public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_public_delegated_prefixes::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22883,7 +22919,7 @@ pub mod global_public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22893,7 +22929,7 @@ pub mod global_public_delegated_prefixes {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -22906,7 +22942,7 @@ pub mod global_public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -22982,8 +23018,8 @@ pub mod global_public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22993,7 +23029,7 @@ pub mod global_public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::global_public_delegated_prefixes::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23024,7 +23060,7 @@ pub mod global_public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23034,7 +23070,7 @@ pub mod global_public_delegated_prefixes {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -23051,8 +23087,8 @@ pub mod global_public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23066,7 +23102,7 @@ pub mod health_checks {
     /// A builder for [HealthChecks][crate::client::HealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::health_checks::ClientBuilder;
     /// # use client::HealthChecks;
@@ -23076,19 +23112,18 @@ pub mod health_checks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::HealthChecks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = HealthChecks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -23099,7 +23134,7 @@ pub mod health_checks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::HealthChecks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -23112,7 +23147,7 @@ pub mod health_checks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -23122,8 +23157,8 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -23157,7 +23192,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23167,14 +23202,16 @@ pub mod health_checks {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::HealthChecksAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::HealthChecksAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -23182,17 +23219,17 @@ pub mod health_checks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::HealthChecksAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -23330,8 +23367,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23341,7 +23378,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23372,7 +23409,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23382,7 +23419,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -23395,7 +23432,7 @@ pub mod health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -23453,8 +23490,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23464,7 +23501,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23495,7 +23532,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23505,7 +23542,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [health_check][crate::model::health_checks::GetRequest::health_check].
@@ -23522,8 +23559,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23533,7 +23570,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23564,7 +23601,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23574,7 +23611,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -23587,7 +23624,7 @@ pub mod health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -23657,8 +23694,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23668,8 +23705,8 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -23703,7 +23740,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23713,13 +23750,13 @@ pub mod health_checks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::HealthCheckList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::HealthCheckList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -23728,15 +23765,15 @@ pub mod health_checks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::HealthCheckList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::HealthCheckList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -23838,8 +23875,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23849,7 +23886,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23880,7 +23917,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23890,7 +23927,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -23903,7 +23940,7 @@ pub mod health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -23979,8 +24016,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23990,7 +24027,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24023,7 +24060,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24033,7 +24070,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::health_checks::TestIamPermissionsRequest::project].
@@ -24068,8 +24105,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24079,7 +24116,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24110,7 +24147,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24120,7 +24157,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -24133,7 +24170,7 @@ pub mod health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -24209,8 +24246,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24220,7 +24257,7 @@ pub mod health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::health_checks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24251,7 +24288,7 @@ pub mod health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24261,7 +24298,7 @@ pub mod health_checks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -24278,8 +24315,8 @@ pub mod health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24293,7 +24330,7 @@ pub mod http_health_checks {
     /// A builder for [HttpHealthChecks][crate::client::HttpHealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::http_health_checks::ClientBuilder;
     /// # use client::HttpHealthChecks;
@@ -24303,19 +24340,18 @@ pub mod http_health_checks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::HttpHealthChecks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = HttpHealthChecks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -24326,7 +24362,7 @@ pub mod http_health_checks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::HttpHealthChecks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -24339,7 +24375,7 @@ pub mod http_health_checks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -24349,7 +24385,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24380,7 +24416,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24390,7 +24426,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -24403,7 +24439,7 @@ pub mod http_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -24461,8 +24497,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24472,7 +24508,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24503,7 +24539,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24513,7 +24549,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [http_health_check][crate::model::http_health_checks::GetRequest::http_health_check].
@@ -24530,8 +24566,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24541,7 +24577,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24572,7 +24608,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24582,7 +24618,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -24595,7 +24631,7 @@ pub mod http_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -24665,8 +24701,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24676,8 +24712,8 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -24711,7 +24747,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24721,13 +24757,13 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::HttpHealthCheckList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::HttpHealthCheckList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -24736,15 +24772,17 @@ pub mod http_health_checks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::HttpHealthCheckList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::HttpHealthCheckList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -24846,8 +24884,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24857,7 +24895,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -24888,7 +24926,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -24898,7 +24936,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -24911,7 +24949,7 @@ pub mod http_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -24987,8 +25025,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -24998,7 +25036,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25033,7 +25071,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25043,7 +25081,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::http_health_checks::TestIamPermissionsRequest::project].
@@ -25078,8 +25116,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25089,7 +25127,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25120,7 +25158,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25130,7 +25168,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -25143,7 +25181,7 @@ pub mod http_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -25219,8 +25257,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25230,7 +25268,7 @@ pub mod http_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::http_health_checks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25261,7 +25299,7 @@ pub mod http_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25271,7 +25309,7 @@ pub mod http_health_checks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -25288,8 +25326,8 @@ pub mod http_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25303,7 +25341,7 @@ pub mod https_health_checks {
     /// A builder for [HttpsHealthChecks][crate::client::HttpsHealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::https_health_checks::ClientBuilder;
     /// # use client::HttpsHealthChecks;
@@ -25313,19 +25351,18 @@ pub mod https_health_checks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::HttpsHealthChecks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = HttpsHealthChecks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -25336,7 +25373,7 @@ pub mod https_health_checks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::HttpsHealthChecks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -25349,7 +25386,7 @@ pub mod https_health_checks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -25359,7 +25396,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25390,7 +25427,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25400,7 +25437,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -25413,7 +25450,7 @@ pub mod https_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -25471,8 +25508,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25482,7 +25519,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25513,7 +25550,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25523,7 +25560,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [https_health_check][crate::model::https_health_checks::GetRequest::https_health_check].
@@ -25540,8 +25577,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25551,7 +25588,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25582,7 +25619,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25592,7 +25629,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -25605,7 +25642,7 @@ pub mod https_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -25675,8 +25712,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25686,8 +25723,8 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -25721,7 +25758,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25731,13 +25768,13 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::HttpsHealthCheckList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::HttpsHealthCheckList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -25746,15 +25783,17 @@ pub mod https_health_checks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::HttpsHealthCheckList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::HttpsHealthCheckList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -25856,8 +25895,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -25867,7 +25906,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -25898,7 +25937,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -25908,7 +25947,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -25921,7 +25960,7 @@ pub mod https_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -25997,8 +26036,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26008,7 +26047,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26043,7 +26082,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26053,7 +26092,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::https_health_checks::TestIamPermissionsRequest::project].
@@ -26088,8 +26127,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26099,7 +26138,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26130,7 +26169,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26140,7 +26179,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -26153,7 +26192,7 @@ pub mod https_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -26229,8 +26268,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26240,7 +26279,7 @@ pub mod https_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::https_health_checks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26271,7 +26310,7 @@ pub mod https_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26281,7 +26320,7 @@ pub mod https_health_checks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -26298,8 +26337,8 @@ pub mod https_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26313,7 +26352,7 @@ pub mod image_family_views {
     /// A builder for [ImageFamilyViews][crate::client::ImageFamilyViews].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::image_family_views::ClientBuilder;
     /// # use client::ImageFamilyViews;
@@ -26323,19 +26362,18 @@ pub mod image_family_views {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ImageFamilyViews;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ImageFamilyViews;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -26346,7 +26384,7 @@ pub mod image_family_views {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ImageFamilyViews>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -26359,7 +26397,7 @@ pub mod image_family_views {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -26369,7 +26407,7 @@ pub mod image_family_views {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::image_family_views::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26400,7 +26438,7 @@ pub mod image_family_views {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26410,7 +26448,7 @@ pub mod image_family_views {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [family][crate::model::image_family_views::GetRequest::family].
@@ -26433,8 +26471,8 @@ pub mod image_family_views {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26448,7 +26486,7 @@ pub mod images {
     /// A builder for [Images][crate::client::Images].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::images::ClientBuilder;
     /// # use client::Images;
@@ -26458,19 +26496,18 @@ pub mod images {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Images;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Images;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -26481,7 +26518,7 @@ pub mod images {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Images>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -26492,7 +26529,7 @@ pub mod images {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -26502,7 +26539,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26528,7 +26565,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26538,7 +26575,7 @@ pub mod images {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -26551,7 +26588,7 @@ pub mod images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -26609,8 +26646,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26620,7 +26657,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::Deprecate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26649,7 +26686,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26659,7 +26696,7 @@ pub mod images {
             (*self.0.stub)
                 .deprecate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deprecate`.
@@ -26672,7 +26709,7 @@ pub mod images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -26748,8 +26785,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Deprecate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Deprecate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26759,7 +26796,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26785,7 +26822,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26795,7 +26832,7 @@ pub mod images {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [image][crate::model::images::GetRequest::image].
@@ -26812,8 +26849,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26823,7 +26860,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::GetFromFamily;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26852,7 +26889,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26862,7 +26899,7 @@ pub mod images {
             (*self.0.stub)
                 .get_from_family(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [family][crate::model::images::GetFromFamilyRequest::family].
@@ -26879,8 +26916,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFromFamily {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFromFamily {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26890,7 +26927,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -26919,7 +26956,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -26929,7 +26966,7 @@ pub mod images {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::images::GetIamPolicyRequest::options_requested_policy_version].
@@ -26967,8 +27004,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -26978,7 +27015,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27004,7 +27041,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27014,7 +27051,7 @@ pub mod images {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -27027,7 +27064,7 @@ pub mod images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -27115,8 +27152,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27126,8 +27163,8 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -27156,7 +27193,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27166,13 +27203,14 @@ pub mod images {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ImageList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ImageList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -27180,15 +27218,15 @@ pub mod images {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ImageList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ImageList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -27290,8 +27328,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27301,7 +27339,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27327,7 +27365,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27337,7 +27375,7 @@ pub mod images {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -27350,7 +27388,7 @@ pub mod images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -27426,8 +27464,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27437,7 +27475,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27466,7 +27504,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27476,7 +27514,7 @@ pub mod images {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::images::SetIamPolicyRequest::project].
@@ -27511,8 +27549,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27522,7 +27560,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27551,7 +27589,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27561,7 +27599,7 @@ pub mod images {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -27574,7 +27612,7 @@ pub mod images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -27632,8 +27670,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27643,7 +27681,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27672,7 +27710,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27682,7 +27720,7 @@ pub mod images {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::images::TestIamPermissionsRequest::project].
@@ -27717,8 +27755,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27728,7 +27766,7 @@ pub mod images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::images::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27757,7 +27795,7 @@ pub mod images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27767,7 +27805,7 @@ pub mod images {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -27784,8 +27822,8 @@ pub mod images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -27799,7 +27837,7 @@ pub mod instance_group_manager_resize_requests {
     /// A builder for [InstanceGroupManagerResizeRequests][crate::client::InstanceGroupManagerResizeRequests].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instance_group_manager_resize_requests::ClientBuilder;
     /// # use client::InstanceGroupManagerResizeRequests;
@@ -27809,19 +27847,18 @@ pub mod instance_group_manager_resize_requests {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstanceGroupManagerResizeRequests;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstanceGroupManagerResizeRequests;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -27832,7 +27869,7 @@ pub mod instance_group_manager_resize_requests {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstanceGroupManagerResizeRequests>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -27847,7 +27884,7 @@ pub mod instance_group_manager_resize_requests {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -27857,7 +27894,7 @@ pub mod instance_group_manager_resize_requests {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_manager_resize_requests::Cancel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -27894,7 +27931,7 @@ pub mod instance_group_manager_resize_requests {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -27904,7 +27941,7 @@ pub mod instance_group_manager_resize_requests {
             (*self.0.stub)
                 .cancel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `cancel`.
@@ -27917,7 +27954,7 @@ pub mod instance_group_manager_resize_requests {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -27990,8 +28027,8 @@ pub mod instance_group_manager_resize_requests {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Cancel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Cancel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28001,7 +28038,7 @@ pub mod instance_group_manager_resize_requests {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_manager_resize_requests::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28038,7 +28075,7 @@ pub mod instance_group_manager_resize_requests {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28048,7 +28085,7 @@ pub mod instance_group_manager_resize_requests {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -28061,7 +28098,7 @@ pub mod instance_group_manager_resize_requests {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -28134,8 +28171,8 @@ pub mod instance_group_manager_resize_requests {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28145,7 +28182,7 @@ pub mod instance_group_manager_resize_requests {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_manager_resize_requests::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28182,7 +28219,7 @@ pub mod instance_group_manager_resize_requests {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28192,7 +28229,7 @@ pub mod instance_group_manager_resize_requests {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_group_manager][crate::model::instance_group_manager_resize_requests::GetRequest::instance_group_manager].
@@ -28221,8 +28258,8 @@ pub mod instance_group_manager_resize_requests {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28232,7 +28269,7 @@ pub mod instance_group_manager_resize_requests {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_manager_resize_requests::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28269,7 +28306,7 @@ pub mod instance_group_manager_resize_requests {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28279,7 +28316,7 @@ pub mod instance_group_manager_resize_requests {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -28292,7 +28329,7 @@ pub mod instance_group_manager_resize_requests {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -28377,8 +28414,8 @@ pub mod instance_group_manager_resize_requests {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28388,8 +28425,8 @@ pub mod instance_group_manager_resize_requests {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_manager_resize_requests::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -28429,7 +28466,7 @@ pub mod instance_group_manager_resize_requests {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28441,15 +28478,15 @@ pub mod instance_group_manager_resize_requests {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InstanceGroupManagerResizeRequestsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -28458,17 +28495,17 @@ pub mod instance_group_manager_resize_requests {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupManagerResizeRequestsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -28582,8 +28619,8 @@ pub mod instance_group_manager_resize_requests {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28593,7 +28630,7 @@ pub mod instance_group_manager_resize_requests {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_manager_resize_requests::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28626,7 +28663,7 @@ pub mod instance_group_manager_resize_requests {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28636,7 +28673,7 @@ pub mod instance_group_manager_resize_requests {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -28659,8 +28696,8 @@ pub mod instance_group_manager_resize_requests {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28674,7 +28711,7 @@ pub mod instance_group_managers {
     /// A builder for [InstanceGroupManagers][crate::client::InstanceGroupManagers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instance_group_managers::ClientBuilder;
     /// # use client::InstanceGroupManagers;
@@ -28684,19 +28721,18 @@ pub mod instance_group_managers {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstanceGroupManagers;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstanceGroupManagers;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -28707,7 +28743,7 @@ pub mod instance_group_managers {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstanceGroupManagers>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -28720,7 +28756,7 @@ pub mod instance_group_managers {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -28730,7 +28766,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::AbandonInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -28765,7 +28801,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28775,7 +28811,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .abandon_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `abandon_instances`.
@@ -28788,7 +28824,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -28873,8 +28909,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AbandonInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AbandonInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -28884,8 +28920,8 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -28923,7 +28959,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -28933,15 +28969,15 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InstanceGroupManagerAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -28950,17 +28986,17 @@ pub mod instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupManagerAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -29098,8 +29134,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29109,7 +29145,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::ApplyUpdatesToInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29144,7 +29180,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29154,7 +29190,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .apply_updates_to_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `apply_updates_to_instances`.
@@ -29167,7 +29203,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -29234,8 +29270,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApplyUpdatesToInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApplyUpdatesToInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29245,7 +29281,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::CreateInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29280,7 +29316,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29290,7 +29326,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .create_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instances`.
@@ -29303,7 +29339,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -29388,8 +29424,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29399,7 +29435,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29430,7 +29466,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29440,7 +29476,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -29453,7 +29489,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -29520,8 +29556,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29531,7 +29567,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::DeleteInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29566,7 +29602,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29576,7 +29612,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .delete_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instances`.
@@ -29589,7 +29625,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -29674,8 +29710,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29685,7 +29721,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::DeletePerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29720,7 +29756,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29730,7 +29766,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .delete_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_per_instance_configs`.
@@ -29743,7 +29779,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -29810,8 +29846,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29821,7 +29857,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29852,7 +29888,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29862,7 +29898,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_group_manager][crate::model::instance_group_managers::GetRequest::instance_group_manager].
@@ -29885,8 +29921,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -29896,7 +29932,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -29927,7 +29963,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -29937,7 +29973,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -29950,7 +29986,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -30029,8 +30065,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30040,8 +30076,8 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -30075,7 +30111,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30085,14 +30121,16 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceGroupManagerList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InstanceGroupManagerList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -30100,15 +30138,17 @@ pub mod instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceGroupManagerList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstanceGroupManagerList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -30216,8 +30256,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30227,8 +30267,8 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::ListErrors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -30262,7 +30302,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30272,15 +30312,15 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .list_errors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InstanceGroupManagersListErrorsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -30289,17 +30329,17 @@ pub mod instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupManagersListErrorsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -30413,8 +30453,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListErrors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListErrors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30424,8 +30464,8 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::ListManagedInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -30463,7 +30503,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30475,15 +30515,15 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .list_managed_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InstanceGroupManagersListManagedInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -30492,17 +30532,17 @@ pub mod instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupManagersListManagedInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -30616,8 +30656,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListManagedInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListManagedInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30627,8 +30667,8 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::ListPerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -30666,7 +30706,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30678,15 +30718,15 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .list_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InstanceGroupManagersListPerInstanceConfigsResp,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -30695,17 +30735,17 @@ pub mod instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupManagersListPerInstanceConfigsResp,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -30819,8 +30859,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30830,7 +30870,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -30861,7 +30901,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -30871,7 +30911,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -30884,7 +30924,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -30969,8 +31009,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -30980,7 +31020,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::PatchPerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31015,7 +31055,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31025,7 +31065,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .patch_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_per_instance_configs`.
@@ -31038,7 +31078,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -31123,8 +31163,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchPerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchPerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31134,7 +31174,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::RecreateInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31169,7 +31209,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31179,7 +31219,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .recreate_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `recreate_instances`.
@@ -31192,7 +31232,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -31277,8 +31317,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RecreateInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RecreateInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31288,7 +31328,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::Resize;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31319,7 +31359,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31329,7 +31369,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .resize(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize`.
@@ -31342,7 +31382,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -31415,8 +31455,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Resize {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Resize {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31426,7 +31466,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::ResumeInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31461,7 +31501,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31471,7 +31511,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .resume_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resume_instances`.
@@ -31484,7 +31524,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -31569,8 +31609,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31580,7 +31620,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::SetInstanceTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31615,7 +31655,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31625,7 +31665,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .set_instance_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_instance_template`.
@@ -31638,7 +31678,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -31723,8 +31763,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetInstanceTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetInstanceTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31734,7 +31774,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::SetTargetPools;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31769,7 +31809,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31779,7 +31819,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .set_target_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_target_pools`.
@@ -31792,7 +31832,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -31877,8 +31917,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetTargetPools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetTargetPools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -31888,7 +31928,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::StartInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -31923,7 +31963,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -31933,7 +31973,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .start_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_instances`.
@@ -31946,7 +31986,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -32031,8 +32071,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32042,7 +32082,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::StopInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32077,7 +32117,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32087,7 +32127,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .stop_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_instances`.
@@ -32100,7 +32140,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -32185,8 +32225,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32196,7 +32236,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::SuspendInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32231,7 +32271,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32241,7 +32281,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .suspend_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `suspend_instances`.
@@ -32254,7 +32294,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -32339,8 +32379,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuspendInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuspendInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32350,7 +32390,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::UpdatePerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32385,7 +32425,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32395,7 +32435,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .update_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_per_instance_configs`.
@@ -32408,7 +32448,7 @@ pub mod instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -32493,8 +32533,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32504,7 +32544,7 @@ pub mod instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_group_managers::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32535,7 +32575,7 @@ pub mod instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32545,7 +32585,7 @@ pub mod instance_group_managers {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -32568,8 +32608,8 @@ pub mod instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32583,7 +32623,7 @@ pub mod instance_groups {
     /// A builder for [InstanceGroups][crate::client::InstanceGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instance_groups::ClientBuilder;
     /// # use client::InstanceGroups;
@@ -32593,19 +32633,18 @@ pub mod instance_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstanceGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstanceGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -32616,7 +32655,7 @@ pub mod instance_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstanceGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -32629,7 +32668,7 @@ pub mod instance_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -32639,7 +32678,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::AddInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -32670,7 +32709,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32680,7 +32719,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .add_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_instances`.
@@ -32693,7 +32732,7 @@ pub mod instance_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -32778,8 +32817,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -32789,8 +32828,8 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -32824,7 +32863,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -32834,14 +32873,16 @@ pub mod instance_groups {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceGroupAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InstanceGroupAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -32849,17 +32890,17 @@ pub mod instance_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -32997,8 +33038,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33008,7 +33049,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33039,7 +33080,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33049,7 +33090,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -33062,7 +33103,7 @@ pub mod instance_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -33129,8 +33170,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33140,7 +33181,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33171,7 +33212,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33181,7 +33222,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_group][crate::model::instance_groups::GetRequest::instance_group].
@@ -33204,8 +33245,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33215,7 +33256,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33246,7 +33287,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33256,7 +33297,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -33269,7 +33310,7 @@ pub mod instance_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -33348,8 +33389,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33359,8 +33400,8 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -33394,7 +33435,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33404,13 +33445,13 @@ pub mod instance_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceGroupList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstanceGroupList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -33419,15 +33460,15 @@ pub mod instance_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceGroupList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::InstanceGroupList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -33535,8 +33576,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33546,8 +33587,8 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -33581,7 +33622,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33591,14 +33632,16 @@ pub mod instance_groups {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceGroupsListInstances, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InstanceGroupsListInstances,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -33606,17 +33649,17 @@ pub mod instance_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceGroupsListInstances,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -33748,8 +33791,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33759,7 +33802,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::RemoveInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33792,7 +33835,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33802,7 +33845,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .remove_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_instances`.
@@ -33815,7 +33858,7 @@ pub mod instance_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -33900,8 +33943,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -33911,7 +33954,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::SetNamedPorts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -33942,7 +33985,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -33952,7 +33995,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .set_named_ports(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_named_ports`.
@@ -33965,7 +34008,7 @@ pub mod instance_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -34050,8 +34093,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetNamedPorts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetNamedPorts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34061,7 +34104,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34094,7 +34137,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34104,7 +34147,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instance_groups::TestIamPermissionsRequest::project].
@@ -34145,8 +34188,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34156,7 +34199,7 @@ pub mod instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34187,7 +34230,7 @@ pub mod instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34197,7 +34240,7 @@ pub mod instance_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -34220,8 +34263,8 @@ pub mod instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34235,7 +34278,7 @@ pub mod instance_settings {
     /// A builder for [InstanceSettings][crate::client::InstanceSettings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instance_settings::ClientBuilder;
     /// # use client::InstanceSettings;
@@ -34245,19 +34288,18 @@ pub mod instance_settings {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstanceSettings;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstanceSettings;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -34268,7 +34310,7 @@ pub mod instance_settings {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstanceSettings>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -34281,7 +34323,7 @@ pub mod instance_settings {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -34291,7 +34333,7 @@ pub mod instance_settings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_settings::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34322,7 +34364,7 @@ pub mod instance_settings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34332,7 +34374,7 @@ pub mod instance_settings {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instance_settings::GetRequest::project].
@@ -34349,8 +34391,8 @@ pub mod instance_settings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34360,7 +34402,7 @@ pub mod instance_settings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_settings::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34391,7 +34433,7 @@ pub mod instance_settings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34401,7 +34443,7 @@ pub mod instance_settings {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -34414,7 +34456,7 @@ pub mod instance_settings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -34511,8 +34553,8 @@ pub mod instance_settings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34522,7 +34564,7 @@ pub mod instance_settings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_settings::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34553,7 +34595,7 @@ pub mod instance_settings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34563,7 +34605,7 @@ pub mod instance_settings {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -34586,8 +34628,8 @@ pub mod instance_settings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34601,7 +34643,7 @@ pub mod instance_templates {
     /// A builder for [InstanceTemplates][crate::client::InstanceTemplates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instance_templates::ClientBuilder;
     /// # use client::InstanceTemplates;
@@ -34611,19 +34653,18 @@ pub mod instance_templates {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstanceTemplates;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstanceTemplates;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -34634,7 +34675,7 @@ pub mod instance_templates {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstanceTemplates>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -34647,7 +34688,7 @@ pub mod instance_templates {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -34657,8 +34698,8 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -34694,7 +34735,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34704,15 +34745,15 @@ pub mod instance_templates {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InstanceTemplateAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -34721,17 +34762,17 @@ pub mod instance_templates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstanceTemplateAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -34869,8 +34910,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -34880,7 +34921,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -34911,7 +34952,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -34921,7 +34962,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -34934,7 +34975,7 @@ pub mod instance_templates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -34992,8 +35033,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35003,7 +35044,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35034,7 +35075,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35044,7 +35085,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_template][crate::model::instance_templates::GetRequest::instance_template].
@@ -35061,8 +35102,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35072,7 +35113,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35103,7 +35144,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35113,7 +35154,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::instance_templates::GetIamPolicyRequest::options_requested_policy_version].
@@ -35151,8 +35192,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35162,7 +35203,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35193,7 +35234,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35203,7 +35244,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -35216,7 +35257,7 @@ pub mod instance_templates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -35286,8 +35327,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35297,8 +35338,8 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -35332,7 +35373,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35342,13 +35383,13 @@ pub mod instance_templates {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceTemplateList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstanceTemplateList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -35357,15 +35398,17 @@ pub mod instance_templates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceTemplateList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstanceTemplateList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -35467,8 +35510,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35478,7 +35521,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35509,7 +35552,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35519,7 +35562,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instance_templates::SetIamPolicyRequest::project].
@@ -35554,8 +35597,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35565,7 +35608,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35600,7 +35643,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35610,7 +35653,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instance_templates::TestIamPermissionsRequest::project].
@@ -35645,8 +35688,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35656,7 +35699,7 @@ pub mod instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instance_templates::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35687,7 +35730,7 @@ pub mod instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35697,7 +35740,7 @@ pub mod instance_templates {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -35714,8 +35757,8 @@ pub mod instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35729,7 +35772,7 @@ pub mod instances {
     /// A builder for [Instances][crate::client::Instances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instances::ClientBuilder;
     /// # use client::Instances;
@@ -35739,19 +35782,18 @@ pub mod instances {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Instances;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Instances;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -35762,7 +35804,7 @@ pub mod instances {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Instances>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -35775,7 +35817,7 @@ pub mod instances {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -35785,7 +35827,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::AddAccessConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35816,7 +35858,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35826,7 +35868,7 @@ pub mod instances {
             (*self.0.stub)
                 .add_access_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_access_config`.
@@ -35839,7 +35881,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -35930,8 +35972,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAccessConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAccessConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -35941,7 +35983,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::AddNetworkInterface;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -35974,7 +36016,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -35984,7 +36026,7 @@ pub mod instances {
             (*self.0.stub)
                 .add_network_interface(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_network_interface`.
@@ -35997,7 +36039,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -36082,8 +36124,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddNetworkInterface {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddNetworkInterface {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36093,7 +36135,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::AddResourcePolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36126,7 +36168,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36136,7 +36178,7 @@ pub mod instances {
             (*self.0.stub)
                 .add_resource_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_resource_policies`.
@@ -36149,7 +36191,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -36234,8 +36276,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddResourcePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddResourcePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36245,8 +36287,8 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -36280,7 +36322,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36290,14 +36332,16 @@ pub mod instances {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InstanceAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -36305,15 +36349,17 @@ pub mod instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstanceAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -36451,8 +36497,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36462,7 +36508,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::AttachDisk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36493,7 +36539,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36503,7 +36549,7 @@ pub mod instances {
             (*self.0.stub)
                 .attach_disk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `attach_disk`.
@@ -36516,7 +36562,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -36619,8 +36665,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AttachDisk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AttachDisk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36630,7 +36676,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::BulkInsert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36661,7 +36707,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36671,7 +36717,7 @@ pub mod instances {
             (*self.0.stub)
                 .bulk_insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_insert`.
@@ -36684,7 +36730,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -36763,8 +36809,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkInsert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkInsert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36774,7 +36820,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36805,7 +36851,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36815,7 +36861,7 @@ pub mod instances {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -36828,7 +36874,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -36895,8 +36941,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -36906,7 +36952,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::DeleteAccessConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -36939,7 +36985,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -36949,7 +36995,7 @@ pub mod instances {
             (*self.0.stub)
                 .delete_access_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_access_config`.
@@ -36962,7 +37008,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -37041,8 +37087,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAccessConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAccessConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37052,7 +37098,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::DeleteNetworkInterface;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37085,7 +37131,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37095,7 +37141,7 @@ pub mod instances {
             (*self.0.stub)
                 .delete_network_interface(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_network_interface`.
@@ -37108,7 +37154,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -37181,8 +37227,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNetworkInterface {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNetworkInterface {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37192,7 +37238,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::DetachDisk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37223,7 +37269,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37233,7 +37279,7 @@ pub mod instances {
             (*self.0.stub)
                 .detach_disk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `detach_disk`.
@@ -37246,7 +37292,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -37319,8 +37365,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachDisk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachDisk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37330,7 +37376,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37358,7 +37404,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37368,7 +37414,7 @@ pub mod instances {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::GetRequest::instance].
@@ -37391,8 +37437,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37402,7 +37448,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetEffectiveFirewalls;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37435,7 +37481,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37445,7 +37491,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_effective_firewalls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::GetEffectiveFirewallsRequest::instance].
@@ -37474,8 +37520,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEffectiveFirewalls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEffectiveFirewalls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37485,7 +37531,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetGuestAttributes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37518,7 +37564,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37528,7 +37574,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_guest_attributes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::GetGuestAttributesRequest::instance].
@@ -37587,8 +37633,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGuestAttributes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGuestAttributes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37598,7 +37644,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37629,7 +37675,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37639,7 +37685,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::instances::GetIamPolicyRequest::options_requested_policy_version].
@@ -37683,8 +37729,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37694,7 +37740,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetScreenshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37725,7 +37771,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37735,7 +37781,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_screenshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::GetScreenshotRequest::instance].
@@ -37758,8 +37804,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetScreenshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetScreenshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37769,7 +37815,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetSerialPortOutput;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37802,7 +37848,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37812,7 +37858,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_serial_port_output(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::GetSerialPortOutputRequest::instance].
@@ -37871,8 +37917,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSerialPortOutput {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSerialPortOutput {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37882,7 +37928,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetShieldedInstanceIdentity;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37917,7 +37963,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -37927,7 +37973,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_shielded_instance_identity(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::GetShieldedInstanceIdentityRequest::instance].
@@ -37950,8 +37996,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetShieldedInstanceIdentity {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetShieldedInstanceIdentity {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -37961,7 +38007,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -37992,7 +38038,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38002,7 +38048,7 @@ pub mod instances {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -38015,7 +38061,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -38130,8 +38176,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38141,8 +38187,8 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -38173,7 +38219,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38183,13 +38229,14 @@ pub mod instances {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstanceList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -38197,15 +38244,15 @@ pub mod instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::InstanceList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -38313,8 +38360,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38324,8 +38371,8 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::ListReferrers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -38359,7 +38406,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38369,13 +38416,13 @@ pub mod instances {
             (*self.0.stub)
                 .list_referrers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceListReferrers, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstanceListReferrers, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -38384,15 +38431,17 @@ pub mod instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceListReferrers, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstanceListReferrers,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -38506,8 +38555,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReferrers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReferrers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38517,7 +38566,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::PerformMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38550,7 +38599,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38560,7 +38609,7 @@ pub mod instances {
             (*self.0.stub)
                 .perform_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `perform_maintenance`.
@@ -38573,7 +38622,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -38640,8 +38689,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PerformMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PerformMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38651,7 +38700,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::RemoveResourcePolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38684,7 +38733,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38694,7 +38743,7 @@ pub mod instances {
             (*self.0.stub)
                 .remove_resource_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_resource_policies`.
@@ -38707,7 +38756,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -38792,8 +38841,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveResourcePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveResourcePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38803,7 +38852,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::ReportHostAsFaulty;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38836,7 +38885,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38846,7 +38895,7 @@ pub mod instances {
             (*self.0.stub)
                 .report_host_as_faulty(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `report_host_as_faulty`.
@@ -38859,7 +38908,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -38944,8 +38993,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReportHostAsFaulty {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReportHostAsFaulty {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -38955,7 +39004,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Reset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -38986,7 +39035,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -38996,7 +39045,7 @@ pub mod instances {
             (*self.0.stub)
                 .reset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reset`.
@@ -39009,7 +39058,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -39076,8 +39125,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Reset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Reset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39087,7 +39136,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Resume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39118,7 +39167,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39128,7 +39177,7 @@ pub mod instances {
             (*self.0.stub)
                 .resume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resume`.
@@ -39141,7 +39190,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -39208,8 +39257,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Resume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Resume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39219,7 +39268,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SendDiagnosticInterrupt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39252,7 +39301,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39262,7 +39311,7 @@ pub mod instances {
             (*self.0.stub)
                 .send_diagnostic_interrupt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance][crate::model::instances::SendDiagnosticInterruptRequest::instance].
@@ -39285,8 +39334,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SendDiagnosticInterrupt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SendDiagnosticInterrupt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39296,7 +39345,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetDeletionProtection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39329,7 +39378,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39339,7 +39388,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_deletion_protection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_deletion_protection`.
@@ -39352,7 +39401,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -39437,8 +39486,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetDeletionProtection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetDeletionProtection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39448,7 +39497,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetDiskAutoDelete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39479,7 +39528,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39489,7 +39538,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_disk_auto_delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_disk_auto_delete`.
@@ -39502,7 +39551,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -39581,8 +39630,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetDiskAutoDelete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetDiskAutoDelete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39592,7 +39641,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39623,7 +39672,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39633,7 +39682,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instances::SetIamPolicyRequest::project].
@@ -39674,8 +39723,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39685,7 +39734,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39716,7 +39765,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39726,7 +39775,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -39739,7 +39788,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -39824,8 +39873,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39835,7 +39884,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetMachineResources;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -39868,7 +39917,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -39878,7 +39927,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_machine_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_machine_resources`.
@@ -39891,7 +39940,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -39976,8 +40025,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetMachineResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetMachineResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -39987,7 +40036,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetMachineType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40018,7 +40067,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40028,7 +40077,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_machine_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_machine_type`.
@@ -40041,7 +40090,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -40126,8 +40175,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetMachineType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetMachineType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40137,7 +40186,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40168,7 +40217,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40178,7 +40227,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_metadata`.
@@ -40191,7 +40240,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -40276,8 +40325,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40287,7 +40336,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetMinCpuPlatform;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40318,7 +40367,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40328,7 +40377,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_min_cpu_platform(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_min_cpu_platform`.
@@ -40341,7 +40390,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -40426,8 +40475,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetMinCpuPlatform {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetMinCpuPlatform {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40437,7 +40486,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetName;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40468,7 +40517,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40478,7 +40527,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_name(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_name`.
@@ -40491,7 +40540,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -40576,8 +40625,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetName {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetName {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40587,7 +40636,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetScheduling;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40618,7 +40667,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40628,7 +40677,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_scheduling(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_scheduling`.
@@ -40641,7 +40690,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -40726,8 +40775,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetScheduling {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetScheduling {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40737,7 +40786,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40768,7 +40817,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40778,7 +40827,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_security_policy`.
@@ -40791,7 +40840,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -40876,8 +40925,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -40887,7 +40936,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetServiceAccount;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -40918,7 +40967,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -40928,7 +40977,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_service_account(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_service_account`.
@@ -40941,7 +40990,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41026,8 +41075,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetServiceAccount {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetServiceAccount {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41037,7 +41086,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetShieldedInstanceIntegrityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41072,7 +41121,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41082,7 +41131,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_shielded_instance_integrity_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_shielded_instance_integrity_policy`.
@@ -41095,7 +41144,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41180,8 +41229,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetShieldedInstanceIntegrityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetShieldedInstanceIntegrityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41191,7 +41240,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SetTags;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41222,7 +41271,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41232,7 +41281,7 @@ pub mod instances {
             (*self.0.stub)
                 .set_tags(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_tags`.
@@ -41245,7 +41294,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41330,8 +41379,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetTags {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetTags {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41341,7 +41390,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::SimulateMaintenanceEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41374,7 +41423,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41384,7 +41433,7 @@ pub mod instances {
             (*self.0.stub)
                 .simulate_maintenance_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `simulate_maintenance_event`.
@@ -41397,7 +41446,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41485,8 +41534,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SimulateMaintenanceEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SimulateMaintenanceEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41496,7 +41545,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Start;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41527,7 +41576,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41537,7 +41586,7 @@ pub mod instances {
             (*self.0.stub)
                 .start(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start`.
@@ -41550,7 +41599,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41617,8 +41666,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Start {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Start {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41628,7 +41677,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::StartWithEncryptionKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41661,7 +41710,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41671,7 +41720,7 @@ pub mod instances {
             (*self.0.stub)
                 .start_with_encryption_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_with_encryption_key`.
@@ -41684,7 +41733,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41769,8 +41818,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartWithEncryptionKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartWithEncryptionKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41780,7 +41829,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Stop;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41808,7 +41857,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41818,7 +41867,7 @@ pub mod instances {
             (*self.0.stub)
                 .stop(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop`.
@@ -41831,7 +41880,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -41916,8 +41965,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Stop {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Stop {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -41927,7 +41976,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Suspend;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -41958,7 +42007,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -41968,7 +42017,7 @@ pub mod instances {
             (*self.0.stub)
                 .suspend(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `suspend`.
@@ -41981,7 +42030,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -42066,8 +42115,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Suspend {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Suspend {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42077,7 +42126,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42110,7 +42159,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42120,7 +42169,7 @@ pub mod instances {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instances::TestIamPermissionsRequest::project].
@@ -42161,8 +42210,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42172,7 +42221,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42203,7 +42252,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42213,7 +42262,7 @@ pub mod instances {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -42226,7 +42275,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -42354,8 +42403,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42365,7 +42414,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::UpdateAccessConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42398,7 +42447,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42408,7 +42457,7 @@ pub mod instances {
             (*self.0.stub)
                 .update_access_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_access_config`.
@@ -42421,7 +42470,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -42512,8 +42561,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAccessConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAccessConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42523,7 +42572,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::UpdateDisplayDevice;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42556,7 +42605,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42566,7 +42615,7 @@ pub mod instances {
             (*self.0.stub)
                 .update_display_device(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_display_device`.
@@ -42579,7 +42628,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -42664,8 +42713,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDisplayDevice {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDisplayDevice {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42675,7 +42724,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::UpdateNetworkInterface;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42708,7 +42757,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42718,7 +42767,7 @@ pub mod instances {
             (*self.0.stub)
                 .update_network_interface(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_network_interface`.
@@ -42731,7 +42780,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -42822,8 +42871,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateNetworkInterface {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateNetworkInterface {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42833,7 +42882,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::UpdateShieldedInstanceConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -42868,7 +42917,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -42878,7 +42927,7 @@ pub mod instances {
             (*self.0.stub)
                 .update_shielded_instance_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_shielded_instance_config`.
@@ -42891,7 +42940,7 @@ pub mod instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -42976,8 +43025,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateShieldedInstanceConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateShieldedInstanceConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -42987,7 +43036,7 @@ pub mod instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instances::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43018,7 +43067,7 @@ pub mod instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43028,7 +43077,7 @@ pub mod instances {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -43051,8 +43100,8 @@ pub mod instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43066,7 +43115,7 @@ pub mod instant_snapshots {
     /// A builder for [InstantSnapshots][crate::client::InstantSnapshots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::instant_snapshots::ClientBuilder;
     /// # use client::InstantSnapshots;
@@ -43076,19 +43125,18 @@ pub mod instant_snapshots {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InstantSnapshots;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InstantSnapshots;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -43099,7 +43147,7 @@ pub mod instant_snapshots {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InstantSnapshots>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -43112,7 +43160,7 @@ pub mod instant_snapshots {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -43122,8 +43170,8 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -43159,7 +43207,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43169,14 +43217,16 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstantSnapshotAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InstantSnapshotAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -43184,17 +43234,17 @@ pub mod instant_snapshots {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InstantSnapshotAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -43332,8 +43382,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43343,7 +43393,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43374,7 +43424,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43384,7 +43434,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -43397,7 +43447,7 @@ pub mod instant_snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -43464,8 +43514,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43475,7 +43525,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43506,7 +43556,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43516,7 +43566,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instant_snapshot][crate::model::instant_snapshots::GetRequest::instant_snapshot].
@@ -43539,8 +43589,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43550,7 +43600,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43581,7 +43631,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43591,7 +43641,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::instant_snapshots::GetIamPolicyRequest::options_requested_policy_version].
@@ -43635,8 +43685,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43646,7 +43696,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -43677,7 +43727,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43687,7 +43737,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -43700,7 +43750,7 @@ pub mod instant_snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -43779,8 +43829,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43790,8 +43840,8 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -43825,7 +43875,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -43835,13 +43885,13 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstantSnapshotList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstantSnapshotList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -43850,15 +43900,17 @@ pub mod instant_snapshots {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstantSnapshotList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstantSnapshotList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -43966,8 +44018,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -43977,7 +44029,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44008,7 +44060,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44018,7 +44070,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instant_snapshots::SetIamPolicyRequest::project].
@@ -44059,8 +44111,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44070,7 +44122,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44101,7 +44153,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44111,7 +44163,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -44124,7 +44176,7 @@ pub mod instant_snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -44209,8 +44261,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44220,7 +44272,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44253,7 +44305,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44263,7 +44315,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::instant_snapshots::TestIamPermissionsRequest::project].
@@ -44304,8 +44356,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44315,7 +44367,7 @@ pub mod instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::instant_snapshots::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44346,7 +44398,7 @@ pub mod instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44356,7 +44408,7 @@ pub mod instant_snapshots {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -44379,8 +44431,8 @@ pub mod instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44394,7 +44446,7 @@ pub mod interconnect_attachment_groups {
     /// A builder for [InterconnectAttachmentGroups][crate::client::InterconnectAttachmentGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::interconnect_attachment_groups::ClientBuilder;
     /// # use client::InterconnectAttachmentGroups;
@@ -44404,19 +44456,18 @@ pub mod interconnect_attachment_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InterconnectAttachmentGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InterconnectAttachmentGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -44427,7 +44478,7 @@ pub mod interconnect_attachment_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InterconnectAttachmentGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -44440,7 +44491,7 @@ pub mod interconnect_attachment_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -44450,7 +44501,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44483,7 +44534,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44493,7 +44544,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -44506,7 +44557,7 @@ pub mod interconnect_attachment_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -44567,8 +44618,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44578,7 +44629,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44609,7 +44660,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44619,7 +44670,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_attachment_group][crate::model::interconnect_attachment_groups::GetRequest::interconnect_attachment_group].
@@ -44639,8 +44690,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44650,7 +44701,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44685,7 +44736,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44695,7 +44746,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::interconnect_attachment_groups::GetIamPolicyRequest::options_requested_policy_version].
@@ -44733,8 +44784,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44744,7 +44795,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::GetOperationalStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44779,7 +44830,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44792,7 +44843,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .get_operational_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_attachment_group][crate::model::interconnect_attachment_groups::GetOperationalStatusRequest::interconnect_attachment_group].
@@ -44812,8 +44863,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperationalStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperationalStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44823,7 +44874,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -44856,7 +44907,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -44866,7 +44917,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -44879,7 +44930,7 @@ pub mod interconnect_attachment_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -44949,8 +45000,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -44960,8 +45011,8 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -44995,7 +45046,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45005,15 +45056,15 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InterconnectAttachmentGroupsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -45022,17 +45073,17 @@ pub mod interconnect_attachment_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InterconnectAttachmentGroupsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -45134,8 +45185,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45145,7 +45196,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45176,7 +45227,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45186,7 +45237,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -45199,7 +45250,7 @@ pub mod interconnect_attachment_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -45296,8 +45347,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45307,7 +45358,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45342,7 +45393,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45352,7 +45403,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::interconnect_attachment_groups::SetIamPolicyRequest::project].
@@ -45387,8 +45438,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45398,7 +45449,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45433,7 +45484,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45443,7 +45494,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::interconnect_attachment_groups::TestIamPermissionsRequest::project].
@@ -45478,8 +45529,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45489,7 +45540,7 @@ pub mod interconnect_attachment_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachment_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45520,7 +45571,7 @@ pub mod interconnect_attachment_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45530,7 +45581,7 @@ pub mod interconnect_attachment_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -45547,8 +45598,8 @@ pub mod interconnect_attachment_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45562,7 +45613,7 @@ pub mod interconnect_attachments {
     /// A builder for [InterconnectAttachments][crate::client::InterconnectAttachments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::interconnect_attachments::ClientBuilder;
     /// # use client::InterconnectAttachments;
@@ -45572,19 +45623,18 @@ pub mod interconnect_attachments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InterconnectAttachments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InterconnectAttachments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -45595,7 +45645,7 @@ pub mod interconnect_attachments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InterconnectAttachments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -45608,7 +45658,7 @@ pub mod interconnect_attachments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -45618,8 +45668,8 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -45657,7 +45707,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45667,15 +45717,15 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InterconnectAttachmentAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -45684,17 +45734,17 @@ pub mod interconnect_attachments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InterconnectAttachmentAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -45832,8 +45882,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45843,7 +45893,7 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -45874,7 +45924,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -45884,7 +45934,7 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -45897,7 +45947,7 @@ pub mod interconnect_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -45964,8 +46014,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -45975,7 +46025,7 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46006,7 +46056,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46016,7 +46066,7 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_attachment][crate::model::interconnect_attachments::GetRequest::interconnect_attachment].
@@ -46039,8 +46089,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46050,7 +46100,7 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46081,7 +46131,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46091,7 +46141,7 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -46104,7 +46154,7 @@ pub mod interconnect_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -46201,8 +46251,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46212,8 +46262,8 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -46247,7 +46297,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46257,14 +46307,16 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InterconnectAttachmentList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InterconnectAttachmentList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -46272,17 +46324,17 @@ pub mod interconnect_attachments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InterconnectAttachmentList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -46390,8 +46442,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46401,7 +46453,7 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46432,7 +46484,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46442,7 +46494,7 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -46455,7 +46507,7 @@ pub mod interconnect_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -46540,8 +46592,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46551,7 +46603,7 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46582,7 +46634,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46592,7 +46644,7 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -46605,7 +46657,7 @@ pub mod interconnect_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -46690,8 +46742,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46701,7 +46753,7 @@ pub mod interconnect_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_attachments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46732,7 +46784,7 @@ pub mod interconnect_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46742,7 +46794,7 @@ pub mod interconnect_attachments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -46765,8 +46817,8 @@ pub mod interconnect_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46780,7 +46832,7 @@ pub mod interconnect_groups {
     /// A builder for [InterconnectGroups][crate::client::InterconnectGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::interconnect_groups::ClientBuilder;
     /// # use client::InterconnectGroups;
@@ -46790,19 +46842,18 @@ pub mod interconnect_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InterconnectGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InterconnectGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -46813,7 +46864,7 @@ pub mod interconnect_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InterconnectGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -46826,7 +46877,7 @@ pub mod interconnect_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -46836,7 +46887,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::CreateMembers;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46869,7 +46920,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -46879,7 +46930,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .create_members(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_members`.
@@ -46892,7 +46943,7 @@ pub mod interconnect_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -46950,8 +47001,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMembers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMembers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -46961,7 +47012,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -46992,7 +47043,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47002,7 +47053,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -47015,7 +47066,7 @@ pub mod interconnect_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -47073,8 +47124,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47084,7 +47135,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47115,7 +47166,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47125,7 +47176,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_group][crate::model::interconnect_groups::GetRequest::interconnect_group].
@@ -47142,8 +47193,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47153,7 +47204,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47184,7 +47235,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47194,7 +47245,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::interconnect_groups::GetIamPolicyRequest::options_requested_policy_version].
@@ -47232,8 +47283,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47243,7 +47294,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::GetOperationalStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47278,7 +47329,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47290,7 +47341,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .get_operational_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_group][crate::model::interconnect_groups::GetOperationalStatusRequest::interconnect_group].
@@ -47307,8 +47358,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperationalStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperationalStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47318,7 +47369,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47349,7 +47400,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47359,7 +47410,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -47372,7 +47423,7 @@ pub mod interconnect_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -47442,8 +47493,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47453,8 +47504,8 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -47488,7 +47539,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47498,15 +47549,15 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InterconnectGroupsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -47515,17 +47566,17 @@ pub mod interconnect_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InterconnectGroupsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -47627,8 +47678,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47638,7 +47689,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47669,7 +47720,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47679,7 +47730,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -47692,7 +47743,7 @@ pub mod interconnect_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -47786,8 +47837,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47797,7 +47848,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47828,7 +47879,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47838,7 +47889,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::interconnect_groups::SetIamPolicyRequest::project].
@@ -47873,8 +47924,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47884,7 +47935,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -47919,7 +47970,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -47929,7 +47980,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::interconnect_groups::TestIamPermissionsRequest::project].
@@ -47964,8 +48015,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -47975,7 +48026,7 @@ pub mod interconnect_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48006,7 +48057,7 @@ pub mod interconnect_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48016,7 +48067,7 @@ pub mod interconnect_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -48033,8 +48084,8 @@ pub mod interconnect_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48048,7 +48099,7 @@ pub mod interconnect_locations {
     /// A builder for [InterconnectLocations][crate::client::InterconnectLocations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::interconnect_locations::ClientBuilder;
     /// # use client::InterconnectLocations;
@@ -48058,19 +48109,18 @@ pub mod interconnect_locations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InterconnectLocations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InterconnectLocations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -48081,7 +48131,7 @@ pub mod interconnect_locations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InterconnectLocations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -48094,7 +48144,7 @@ pub mod interconnect_locations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -48104,7 +48154,7 @@ pub mod interconnect_locations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_locations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48135,7 +48185,7 @@ pub mod interconnect_locations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48145,7 +48195,7 @@ pub mod interconnect_locations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_location][crate::model::interconnect_locations::GetRequest::interconnect_location].
@@ -48162,8 +48212,8 @@ pub mod interconnect_locations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48173,8 +48223,8 @@ pub mod interconnect_locations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_locations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -48208,7 +48258,7 @@ pub mod interconnect_locations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48218,14 +48268,16 @@ pub mod interconnect_locations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InterconnectLocationList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::InterconnectLocationList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -48233,15 +48285,17 @@ pub mod interconnect_locations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InterconnectLocationList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InterconnectLocationList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -48343,8 +48397,8 @@ pub mod interconnect_locations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48358,7 +48412,7 @@ pub mod interconnect_remote_locations {
     /// A builder for [InterconnectRemoteLocations][crate::client::InterconnectRemoteLocations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::interconnect_remote_locations::ClientBuilder;
     /// # use client::InterconnectRemoteLocations;
@@ -48368,19 +48422,18 @@ pub mod interconnect_remote_locations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InterconnectRemoteLocations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InterconnectRemoteLocations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -48391,7 +48444,7 @@ pub mod interconnect_remote_locations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InterconnectRemoteLocations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -48404,7 +48457,7 @@ pub mod interconnect_remote_locations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -48414,7 +48467,7 @@ pub mod interconnect_remote_locations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_remote_locations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48445,7 +48498,7 @@ pub mod interconnect_remote_locations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48455,7 +48508,7 @@ pub mod interconnect_remote_locations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect_remote_location][crate::model::interconnect_remote_locations::GetRequest::interconnect_remote_location].
@@ -48475,8 +48528,8 @@ pub mod interconnect_remote_locations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48486,8 +48539,8 @@ pub mod interconnect_remote_locations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnect_remote_locations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -48521,7 +48574,7 @@ pub mod interconnect_remote_locations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48531,15 +48584,15 @@ pub mod interconnect_remote_locations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::InterconnectRemoteLocationList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -48548,17 +48601,17 @@ pub mod interconnect_remote_locations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::InterconnectRemoteLocationList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -48660,8 +48713,8 @@ pub mod interconnect_remote_locations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48675,7 +48728,7 @@ pub mod interconnects {
     /// A builder for [Interconnects][crate::client::Interconnects].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::interconnects::ClientBuilder;
     /// # use client::Interconnects;
@@ -48685,19 +48738,18 @@ pub mod interconnects {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Interconnects;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Interconnects;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -48708,7 +48760,7 @@ pub mod interconnects {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Interconnects>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -48721,7 +48773,7 @@ pub mod interconnects {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -48731,7 +48783,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48762,7 +48814,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48772,7 +48824,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -48785,7 +48837,7 @@ pub mod interconnects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -48843,8 +48895,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48854,7 +48906,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48885,7 +48937,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48895,7 +48947,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect][crate::model::interconnects::GetRequest::interconnect].
@@ -48912,8 +48964,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48923,7 +48975,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::GetDiagnostics;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -48954,7 +49006,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -48964,7 +49016,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .get_diagnostics(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect][crate::model::interconnects::GetDiagnosticsRequest::interconnect].
@@ -48981,8 +49033,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDiagnostics {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDiagnostics {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -48992,7 +49044,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::GetMacsecConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49023,7 +49075,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49033,7 +49085,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .get_macsec_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [interconnect][crate::model::interconnects::GetMacsecConfigRequest::interconnect].
@@ -49050,8 +49102,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMacsecConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMacsecConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49061,7 +49113,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49092,7 +49144,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49102,7 +49154,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -49115,7 +49167,7 @@ pub mod interconnects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -49185,8 +49237,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49196,8 +49248,8 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -49231,7 +49283,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49241,13 +49293,13 @@ pub mod interconnects {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InterconnectList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InterconnectList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -49256,15 +49308,15 @@ pub mod interconnects {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InterconnectList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::InterconnectList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -49366,8 +49418,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49377,7 +49429,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49408,7 +49460,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49418,7 +49470,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -49431,7 +49483,7 @@ pub mod interconnects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -49507,8 +49559,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49518,7 +49570,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49549,7 +49601,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49559,7 +49611,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -49572,7 +49624,7 @@ pub mod interconnects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -49630,8 +49682,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49641,7 +49693,7 @@ pub mod interconnects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::interconnects::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49672,7 +49724,7 @@ pub mod interconnects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49682,7 +49734,7 @@ pub mod interconnects {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -49699,8 +49751,8 @@ pub mod interconnects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49714,7 +49766,7 @@ pub mod license_codes {
     /// A builder for [LicenseCodes][crate::client::LicenseCodes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::license_codes::ClientBuilder;
     /// # use client::LicenseCodes;
@@ -49724,19 +49776,18 @@ pub mod license_codes {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::LicenseCodes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = LicenseCodes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -49747,7 +49798,7 @@ pub mod license_codes {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::LicenseCodes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -49760,7 +49811,7 @@ pub mod license_codes {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -49770,7 +49821,7 @@ pub mod license_codes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::license_codes::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49801,7 +49852,7 @@ pub mod license_codes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49811,7 +49862,7 @@ pub mod license_codes {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [license_code][crate::model::license_codes::GetRequest::license_code].
@@ -49828,8 +49879,8 @@ pub mod license_codes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49839,7 +49890,7 @@ pub mod license_codes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::license_codes::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -49872,7 +49923,7 @@ pub mod license_codes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -49882,7 +49933,7 @@ pub mod license_codes {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::license_codes::TestIamPermissionsRequest::project].
@@ -49917,8 +49968,8 @@ pub mod license_codes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -49932,7 +49983,7 @@ pub mod licenses {
     /// A builder for [Licenses][crate::client::Licenses].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::licenses::ClientBuilder;
     /// # use client::Licenses;
@@ -49942,19 +49993,18 @@ pub mod licenses {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Licenses;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Licenses;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -49965,7 +50015,7 @@ pub mod licenses {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Licenses>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -49976,7 +50026,7 @@ pub mod licenses {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -49986,7 +50036,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50015,7 +50065,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50025,7 +50075,7 @@ pub mod licenses {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -50038,7 +50088,7 @@ pub mod licenses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -50096,8 +50146,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50107,7 +50157,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50133,7 +50183,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50143,7 +50193,7 @@ pub mod licenses {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [license][crate::model::licenses::GetRequest::license].
@@ -50160,8 +50210,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50171,7 +50221,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50200,7 +50250,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50210,7 +50260,7 @@ pub mod licenses {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::licenses::GetIamPolicyRequest::options_requested_policy_version].
@@ -50248,8 +50298,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50259,7 +50309,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50288,7 +50338,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50298,7 +50348,7 @@ pub mod licenses {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -50311,7 +50361,7 @@ pub mod licenses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -50381,8 +50431,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50392,8 +50442,8 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -50422,7 +50472,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50432,13 +50482,13 @@ pub mod licenses {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::LicensesListResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::LicensesListResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -50447,15 +50497,17 @@ pub mod licenses {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::LicensesListResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::LicensesListResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -50557,8 +50609,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50568,7 +50620,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50597,7 +50649,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50607,7 +50659,7 @@ pub mod licenses {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::licenses::SetIamPolicyRequest::project].
@@ -50642,8 +50694,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50653,7 +50705,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50684,7 +50736,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50694,7 +50746,7 @@ pub mod licenses {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::licenses::TestIamPermissionsRequest::project].
@@ -50729,8 +50781,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50740,7 +50792,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50769,7 +50821,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50779,7 +50831,7 @@ pub mod licenses {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -50792,7 +50844,7 @@ pub mod licenses {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -50886,8 +50938,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50897,7 +50949,7 @@ pub mod licenses {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::licenses::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -50926,7 +50978,7 @@ pub mod licenses {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -50936,7 +50988,7 @@ pub mod licenses {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -50953,8 +51005,8 @@ pub mod licenses {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -50968,7 +51020,7 @@ pub mod machine_images {
     /// A builder for [MachineImages][crate::client::MachineImages].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::machine_images::ClientBuilder;
     /// # use client::MachineImages;
@@ -50978,19 +51030,18 @@ pub mod machine_images {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MachineImages;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MachineImages;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -51001,7 +51052,7 @@ pub mod machine_images {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MachineImages>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -51014,7 +51065,7 @@ pub mod machine_images {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -51024,7 +51075,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51055,7 +51106,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51065,7 +51116,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -51078,7 +51129,7 @@ pub mod machine_images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -51136,8 +51187,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51147,7 +51198,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51178,7 +51229,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51188,7 +51239,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [machine_image][crate::model::machine_images::GetRequest::machine_image].
@@ -51205,8 +51256,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51216,7 +51267,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51247,7 +51298,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51257,7 +51308,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::machine_images::GetIamPolicyRequest::options_requested_policy_version].
@@ -51295,8 +51346,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51306,7 +51357,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51337,7 +51388,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51347,7 +51398,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -51360,7 +51411,7 @@ pub mod machine_images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -51448,8 +51499,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51459,8 +51510,8 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -51494,7 +51545,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51504,13 +51555,13 @@ pub mod machine_images {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::MachineImageList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::MachineImageList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -51519,15 +51570,15 @@ pub mod machine_images {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::MachineImageList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::MachineImageList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -51629,8 +51680,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51640,7 +51691,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51671,7 +51722,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51681,7 +51732,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::machine_images::SetIamPolicyRequest::project].
@@ -51716,8 +51767,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51727,7 +51778,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51758,7 +51809,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51768,7 +51819,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -51781,7 +51832,7 @@ pub mod machine_images {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -51839,8 +51890,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51850,7 +51901,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51883,7 +51934,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51893,7 +51944,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::machine_images::TestIamPermissionsRequest::project].
@@ -51928,8 +51979,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -51939,7 +51990,7 @@ pub mod machine_images {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_images::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -51970,7 +52021,7 @@ pub mod machine_images {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -51980,7 +52031,7 @@ pub mod machine_images {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -51997,8 +52048,8 @@ pub mod machine_images {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52012,7 +52063,7 @@ pub mod machine_types {
     /// A builder for [MachineTypes][crate::client::MachineTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::machine_types::ClientBuilder;
     /// # use client::MachineTypes;
@@ -52022,19 +52073,18 @@ pub mod machine_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MachineTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MachineTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -52045,7 +52095,7 @@ pub mod machine_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MachineTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -52058,7 +52108,7 @@ pub mod machine_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -52068,8 +52118,8 @@ pub mod machine_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_types::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -52103,7 +52153,7 @@ pub mod machine_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52113,14 +52163,16 @@ pub mod machine_types {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::MachineTypeAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::MachineTypeAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -52128,15 +52180,17 @@ pub mod machine_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::MachineTypeAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::MachineTypeAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -52274,8 +52328,8 @@ pub mod machine_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52285,7 +52339,7 @@ pub mod machine_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_types::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52316,7 +52370,7 @@ pub mod machine_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52326,7 +52380,7 @@ pub mod machine_types {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [machine_type][crate::model::machine_types::GetRequest::machine_type].
@@ -52349,8 +52403,8 @@ pub mod machine_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52360,8 +52414,8 @@ pub mod machine_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::machine_types::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -52395,7 +52449,7 @@ pub mod machine_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52405,13 +52459,13 @@ pub mod machine_types {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::MachineTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::MachineTypeList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -52420,15 +52474,15 @@ pub mod machine_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::MachineTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::MachineTypeList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -52536,8 +52590,8 @@ pub mod machine_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52551,7 +52605,7 @@ pub mod network_attachments {
     /// A builder for [NetworkAttachments][crate::client::NetworkAttachments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::network_attachments::ClientBuilder;
     /// # use client::NetworkAttachments;
@@ -52561,19 +52615,18 @@ pub mod network_attachments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NetworkAttachments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NetworkAttachments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -52584,7 +52637,7 @@ pub mod network_attachments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NetworkAttachments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -52597,7 +52650,7 @@ pub mod network_attachments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -52607,8 +52660,8 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -52644,7 +52697,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52654,15 +52707,15 @@ pub mod network_attachments {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkAttachmentAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -52671,17 +52724,17 @@ pub mod network_attachments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkAttachmentAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -52819,8 +52872,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52830,7 +52883,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52861,7 +52914,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -52871,7 +52924,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -52884,7 +52937,7 @@ pub mod network_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -52951,8 +53004,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -52962,7 +53015,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -52993,7 +53046,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53003,7 +53056,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network_attachment][crate::model::network_attachments::GetRequest::network_attachment].
@@ -53026,8 +53079,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53037,7 +53090,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53068,7 +53121,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53078,7 +53131,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::network_attachments::GetIamPolicyRequest::options_requested_policy_version].
@@ -53122,8 +53175,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53133,7 +53186,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53164,7 +53217,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53174,7 +53227,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -53187,7 +53240,7 @@ pub mod network_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -53266,8 +53319,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53277,8 +53330,8 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -53312,7 +53365,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53322,13 +53375,13 @@ pub mod network_attachments {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NetworkAttachmentList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::NetworkAttachmentList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -53337,15 +53390,17 @@ pub mod network_attachments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NetworkAttachmentList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NetworkAttachmentList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -53453,8 +53508,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53464,7 +53519,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53495,7 +53550,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53505,7 +53560,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -53518,7 +53573,7 @@ pub mod network_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -53603,8 +53658,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53614,7 +53669,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53645,7 +53700,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53655,7 +53710,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::network_attachments::SetIamPolicyRequest::project].
@@ -53696,8 +53751,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53707,7 +53762,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53742,7 +53797,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53752,7 +53807,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::network_attachments::TestIamPermissionsRequest::project].
@@ -53793,8 +53848,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53804,7 +53859,7 @@ pub mod network_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_attachments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -53835,7 +53890,7 @@ pub mod network_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53845,7 +53900,7 @@ pub mod network_attachments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -53868,8 +53923,8 @@ pub mod network_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -53883,7 +53938,7 @@ pub mod network_edge_security_services {
     /// A builder for [NetworkEdgeSecurityServices][crate::client::NetworkEdgeSecurityServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::network_edge_security_services::ClientBuilder;
     /// # use client::NetworkEdgeSecurityServices;
@@ -53893,19 +53948,18 @@ pub mod network_edge_security_services {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NetworkEdgeSecurityServices;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NetworkEdgeSecurityServices;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53916,7 +53970,7 @@ pub mod network_edge_security_services {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NetworkEdgeSecurityServices>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -53929,7 +53983,7 @@ pub mod network_edge_security_services {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -53939,8 +53993,8 @@ pub mod network_edge_security_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_edge_security_services::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -53978,7 +54032,7 @@ pub mod network_edge_security_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -53988,15 +54042,15 @@ pub mod network_edge_security_services {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkEdgeSecurityServiceAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -54005,17 +54059,17 @@ pub mod network_edge_security_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkEdgeSecurityServiceAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -54153,8 +54207,8 @@ pub mod network_edge_security_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54164,7 +54218,7 @@ pub mod network_edge_security_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_edge_security_services::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54197,7 +54251,7 @@ pub mod network_edge_security_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54207,7 +54261,7 @@ pub mod network_edge_security_services {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -54220,7 +54274,7 @@ pub mod network_edge_security_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -54290,8 +54344,8 @@ pub mod network_edge_security_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54301,7 +54355,7 @@ pub mod network_edge_security_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_edge_security_services::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54332,7 +54386,7 @@ pub mod network_edge_security_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54342,7 +54396,7 @@ pub mod network_edge_security_services {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network_edge_security_service][crate::model::network_edge_security_services::GetRequest::network_edge_security_service].
@@ -54368,8 +54422,8 @@ pub mod network_edge_security_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54379,7 +54433,7 @@ pub mod network_edge_security_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_edge_security_services::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54412,7 +54466,7 @@ pub mod network_edge_security_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54422,7 +54476,7 @@ pub mod network_edge_security_services {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -54435,7 +54489,7 @@ pub mod network_edge_security_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -54532,8 +54586,8 @@ pub mod network_edge_security_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54543,7 +54597,7 @@ pub mod network_edge_security_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_edge_security_services::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54574,7 +54628,7 @@ pub mod network_edge_security_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54584,7 +54638,7 @@ pub mod network_edge_security_services {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -54597,7 +54651,7 @@ pub mod network_edge_security_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -54721,8 +54775,8 @@ pub mod network_edge_security_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54732,7 +54786,7 @@ pub mod network_edge_security_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_edge_security_services::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -54763,7 +54817,7 @@ pub mod network_edge_security_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54773,7 +54827,7 @@ pub mod network_edge_security_services {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -54796,8 +54850,8 @@ pub mod network_edge_security_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -54811,7 +54865,7 @@ pub mod network_endpoint_groups {
     /// A builder for [NetworkEndpointGroups][crate::client::NetworkEndpointGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::network_endpoint_groups::ClientBuilder;
     /// # use client::NetworkEndpointGroups;
@@ -54821,19 +54875,18 @@ pub mod network_endpoint_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NetworkEndpointGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NetworkEndpointGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -54844,7 +54897,7 @@ pub mod network_endpoint_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NetworkEndpointGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -54857,7 +54910,7 @@ pub mod network_endpoint_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -54867,8 +54920,8 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -54906,7 +54959,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -54916,15 +54969,15 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkEndpointGroupAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -54933,17 +54986,17 @@ pub mod network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkEndpointGroupAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -55081,8 +55134,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55092,7 +55145,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::AttachNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55127,7 +55180,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55137,7 +55190,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .attach_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `attach_network_endpoints`.
@@ -55150,7 +55203,7 @@ pub mod network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -55235,8 +55288,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AttachNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AttachNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55246,7 +55299,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55277,7 +55330,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55287,7 +55340,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -55300,7 +55353,7 @@ pub mod network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -55367,8 +55420,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55378,7 +55431,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::DetachNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55413,7 +55466,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55423,7 +55476,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .detach_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `detach_network_endpoints`.
@@ -55436,7 +55489,7 @@ pub mod network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -55521,8 +55574,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55532,7 +55585,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55563,7 +55616,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55573,7 +55626,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network_endpoint_group][crate::model::network_endpoint_groups::GetRequest::network_endpoint_group].
@@ -55596,8 +55649,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55607,7 +55660,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -55638,7 +55691,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55648,7 +55701,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -55661,7 +55714,7 @@ pub mod network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -55740,8 +55793,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55751,8 +55804,8 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -55786,7 +55839,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55796,14 +55849,16 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NetworkEndpointGroupList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NetworkEndpointGroupList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -55811,15 +55866,17 @@ pub mod network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NetworkEndpointGroupList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NetworkEndpointGroupList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -55927,8 +55984,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -55938,8 +55995,8 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::ListNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -55977,7 +56034,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -55987,15 +56044,15 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .list_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkEndpointGroupsListNetworkEndpoints,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -56004,17 +56061,17 @@ pub mod network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkEndpointGroupsListNetworkEndpoints,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -56146,8 +56203,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56157,7 +56214,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56192,7 +56249,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56202,7 +56259,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::network_endpoint_groups::TestIamPermissionsRequest::project].
@@ -56243,8 +56300,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56254,7 +56311,7 @@ pub mod network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_endpoint_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56285,7 +56342,7 @@ pub mod network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56295,7 +56352,7 @@ pub mod network_endpoint_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -56318,8 +56375,8 @@ pub mod network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56333,7 +56390,7 @@ pub mod network_firewall_policies {
     /// A builder for [NetworkFirewallPolicies][crate::client::NetworkFirewallPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::network_firewall_policies::ClientBuilder;
     /// # use client::NetworkFirewallPolicies;
@@ -56343,19 +56400,18 @@ pub mod network_firewall_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NetworkFirewallPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NetworkFirewallPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -56366,7 +56422,7 @@ pub mod network_firewall_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NetworkFirewallPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -56379,7 +56435,7 @@ pub mod network_firewall_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -56389,7 +56445,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::AddAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56424,7 +56480,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56434,7 +56490,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .add_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_association`.
@@ -56447,7 +56503,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -56544,8 +56600,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56555,7 +56611,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::AddPacketMirroringRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56590,7 +56646,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56600,7 +56656,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .add_packet_mirroring_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_packet_mirroring_rule`.
@@ -56613,7 +56669,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -56725,8 +56781,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddPacketMirroringRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddPacketMirroringRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56736,7 +56792,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::AddRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -56767,7 +56823,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56777,7 +56833,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .add_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_rule`.
@@ -56790,7 +56846,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -56902,8 +56958,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -56913,8 +56969,8 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -56952,7 +57008,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -56962,15 +57018,15 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkFirewallPolicyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -56979,17 +57035,17 @@ pub mod network_firewall_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkFirewallPolicyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -57127,8 +57183,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57138,7 +57194,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::CloneRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57171,7 +57227,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57181,7 +57237,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .clone_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `clone_rules`.
@@ -57194,7 +57250,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -57270,8 +57326,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CloneRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CloneRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57281,7 +57337,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57312,7 +57368,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57322,7 +57378,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -57335,7 +57391,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -57393,8 +57449,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57404,7 +57460,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57435,7 +57491,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57445,7 +57501,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::network_firewall_policies::GetRequest::firewall_policy].
@@ -57462,8 +57518,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57473,7 +57529,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::GetAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57508,7 +57564,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57518,7 +57574,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .get_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::network_firewall_policies::GetAssociationRequest::firewall_policy].
@@ -57553,8 +57609,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57564,7 +57620,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57599,7 +57655,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57609,7 +57665,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::network_firewall_policies::GetIamPolicyRequest::options_requested_policy_version].
@@ -57647,8 +57703,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57658,7 +57714,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::GetPacketMirroringRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57693,7 +57749,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57703,7 +57759,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .get_packet_mirroring_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::network_firewall_policies::GetPacketMirroringRuleRequest::firewall_policy].
@@ -57738,8 +57794,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPacketMirroringRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPacketMirroringRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57749,7 +57805,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57780,7 +57836,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57790,7 +57846,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::network_firewall_policies::GetRuleRequest::firewall_policy].
@@ -57825,8 +57881,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57836,7 +57892,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -57867,7 +57923,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -57877,7 +57933,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -57890,7 +57946,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -57960,8 +58016,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -57971,8 +58027,8 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -58006,7 +58062,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58016,13 +58072,13 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::FirewallPolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::FirewallPolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -58031,15 +58087,17 @@ pub mod network_firewall_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::FirewallPolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::FirewallPolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -58141,8 +58199,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58152,7 +58210,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58183,7 +58241,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58193,7 +58251,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -58206,7 +58264,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -58282,8 +58340,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58293,7 +58351,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::PatchPacketMirroringRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58328,7 +58386,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58338,7 +58396,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .patch_packet_mirroring_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_packet_mirroring_rule`.
@@ -58351,7 +58409,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -58445,8 +58503,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchPacketMirroringRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchPacketMirroringRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58456,7 +58514,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::PatchRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58487,7 +58545,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58497,7 +58555,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .patch_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_rule`.
@@ -58510,7 +58568,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -58604,8 +58662,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58615,7 +58673,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::RemoveAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58650,7 +58708,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58660,7 +58718,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .remove_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_association`.
@@ -58673,7 +58731,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -58749,8 +58807,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58760,7 +58818,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::RemovePacketMirroringRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58795,7 +58853,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58805,7 +58863,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .remove_packet_mirroring_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_packet_mirroring_rule`.
@@ -58818,7 +58876,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -58894,8 +58952,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemovePacketMirroringRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemovePacketMirroringRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -58905,7 +58963,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::RemoveRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -58938,7 +58996,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -58948,7 +59006,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .remove_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_rule`.
@@ -58961,7 +59019,7 @@ pub mod network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -59037,8 +59095,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59048,7 +59106,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59083,7 +59141,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59093,7 +59151,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::network_firewall_policies::SetIamPolicyRequest::project].
@@ -59128,8 +59186,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59139,7 +59197,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59174,7 +59232,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59184,7 +59242,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::network_firewall_policies::TestIamPermissionsRequest::project].
@@ -59219,8 +59277,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59230,7 +59288,7 @@ pub mod network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_firewall_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59261,7 +59319,7 @@ pub mod network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59271,7 +59329,7 @@ pub mod network_firewall_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -59288,8 +59346,8 @@ pub mod network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59303,7 +59361,7 @@ pub mod network_profiles {
     /// A builder for [NetworkProfiles][crate::client::NetworkProfiles].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::network_profiles::ClientBuilder;
     /// # use client::NetworkProfiles;
@@ -59313,19 +59371,18 @@ pub mod network_profiles {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NetworkProfiles;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NetworkProfiles;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -59336,7 +59393,7 @@ pub mod network_profiles {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NetworkProfiles>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -59349,7 +59406,7 @@ pub mod network_profiles {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -59359,7 +59416,7 @@ pub mod network_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_profiles::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59390,7 +59447,7 @@ pub mod network_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59400,7 +59457,7 @@ pub mod network_profiles {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network_profile][crate::model::network_profiles::GetRequest::network_profile].
@@ -59417,8 +59474,8 @@ pub mod network_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59428,8 +59485,8 @@ pub mod network_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::network_profiles::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -59463,7 +59520,7 @@ pub mod network_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59473,14 +59530,16 @@ pub mod network_profiles {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NetworkProfilesListResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NetworkProfilesListResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -59488,17 +59547,17 @@ pub mod network_profiles {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkProfilesListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -59600,8 +59659,8 @@ pub mod network_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59615,7 +59674,7 @@ pub mod networks {
     /// A builder for [Networks][crate::client::Networks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::networks::ClientBuilder;
     /// # use client::Networks;
@@ -59625,19 +59684,18 @@ pub mod networks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Networks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Networks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -59648,7 +59706,7 @@ pub mod networks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Networks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -59659,7 +59717,7 @@ pub mod networks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -59669,7 +59727,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::AddPeering;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59698,7 +59756,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59708,7 +59766,7 @@ pub mod networks {
             (*self.0.stub)
                 .add_peering(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_peering`.
@@ -59721,7 +59779,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -59797,8 +59855,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddPeering {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddPeering {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59808,7 +59866,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59837,7 +59895,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59847,7 +59905,7 @@ pub mod networks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -59860,7 +59918,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -59918,8 +59976,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59929,7 +59987,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -59955,7 +60013,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -59965,7 +60023,7 @@ pub mod networks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network][crate::model::networks::GetRequest::network].
@@ -59982,8 +60040,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -59993,7 +60051,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::GetEffectiveFirewalls;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60024,7 +60082,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60034,7 +60092,7 @@ pub mod networks {
             (*self.0.stub)
                 .get_effective_firewalls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network][crate::model::networks::GetEffectiveFirewallsRequest::network].
@@ -60051,8 +60109,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEffectiveFirewalls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEffectiveFirewalls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60062,7 +60120,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60091,7 +60149,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60101,7 +60159,7 @@ pub mod networks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -60114,7 +60172,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -60184,8 +60242,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60195,8 +60253,8 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -60225,7 +60283,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60235,13 +60293,14 @@ pub mod networks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NetworkList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::NetworkList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -60249,15 +60308,15 @@ pub mod networks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NetworkList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::NetworkList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -60359,8 +60418,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60370,8 +60429,8 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::ListPeeringRoutes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -60403,7 +60462,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60413,14 +60472,16 @@ pub mod networks {
             (*self.0.stub)
                 .list_peering_routes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ExchangedPeeringRoutesList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ExchangedPeeringRoutesList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -60428,17 +60489,17 @@ pub mod networks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ExchangedPeeringRoutesList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -60600,8 +60661,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPeeringRoutes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPeeringRoutes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60611,7 +60672,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60637,7 +60698,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60647,7 +60708,7 @@ pub mod networks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -60660,7 +60721,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -60736,8 +60797,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60747,7 +60808,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::RemovePeering;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60776,7 +60837,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60786,7 +60847,7 @@ pub mod networks {
             (*self.0.stub)
                 .remove_peering(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_peering`.
@@ -60799,7 +60860,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -60875,8 +60936,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemovePeering {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemovePeering {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -60886,7 +60947,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::RequestRemovePeering;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -60917,7 +60978,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -60927,7 +60988,7 @@ pub mod networks {
             (*self.0.stub)
                 .request_remove_peering(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `request_remove_peering`.
@@ -60940,7 +61001,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -61016,8 +61077,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RequestRemovePeering {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RequestRemovePeering {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61027,7 +61088,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::SwitchToCustomMode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61058,7 +61119,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61068,7 +61129,7 @@ pub mod networks {
             (*self.0.stub)
                 .switch_to_custom_mode(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `switch_to_custom_mode`.
@@ -61081,7 +61142,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -61139,8 +61200,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SwitchToCustomMode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SwitchToCustomMode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61150,7 +61211,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::UpdatePeering;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61179,7 +61240,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61189,7 +61250,7 @@ pub mod networks {
             (*self.0.stub)
                 .update_peering(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_peering`.
@@ -61202,7 +61263,7 @@ pub mod networks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -61278,8 +61339,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePeering {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePeering {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61289,7 +61350,7 @@ pub mod networks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::networks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61318,7 +61379,7 @@ pub mod networks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61328,7 +61389,7 @@ pub mod networks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -61345,8 +61406,8 @@ pub mod networks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61360,7 +61421,7 @@ pub mod node_groups {
     /// A builder for [NodeGroups][crate::client::NodeGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::node_groups::ClientBuilder;
     /// # use client::NodeGroups;
@@ -61370,19 +61431,18 @@ pub mod node_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NodeGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NodeGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -61393,7 +61453,7 @@ pub mod node_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NodeGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -61406,7 +61466,7 @@ pub mod node_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -61416,7 +61476,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::AddNodes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61447,7 +61507,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61457,7 +61517,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .add_nodes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_nodes`.
@@ -61470,7 +61530,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -61555,8 +61615,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddNodes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddNodes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61566,8 +61626,8 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -61601,7 +61661,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61611,14 +61671,16 @@ pub mod node_groups {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeGroupAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NodeGroupAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -61626,15 +61688,17 @@ pub mod node_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NodeGroupAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NodeGroupAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -61772,8 +61836,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61783,7 +61847,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61814,7 +61878,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61824,7 +61888,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -61837,7 +61901,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -61904,8 +61968,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -61915,7 +61979,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::DeleteNodes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -61946,7 +62010,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -61956,7 +62020,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .delete_nodes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_nodes`.
@@ -61969,7 +62033,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -62054,8 +62118,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNodes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNodes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62065,7 +62129,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62096,7 +62160,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62106,7 +62170,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [node_group][crate::model::node_groups::GetRequest::node_group].
@@ -62129,8 +62193,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62140,7 +62204,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62171,7 +62235,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62181,7 +62245,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::node_groups::GetIamPolicyRequest::options_requested_policy_version].
@@ -62225,8 +62289,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62236,7 +62300,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62267,7 +62331,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62277,7 +62341,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -62290,7 +62354,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -62375,8 +62439,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62386,8 +62450,8 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -62421,7 +62485,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62431,13 +62495,13 @@ pub mod node_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeGroupList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::NodeGroupList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -62446,15 +62510,15 @@ pub mod node_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NodeGroupList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::NodeGroupList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -62562,8 +62626,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62573,8 +62637,8 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::ListNodes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -62608,7 +62672,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62618,13 +62682,13 @@ pub mod node_groups {
             (*self.0.stub)
                 .list_nodes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeGroupsListNodes, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::NodeGroupsListNodes, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -62633,15 +62697,17 @@ pub mod node_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NodeGroupsListNodes, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NodeGroupsListNodes,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -62755,8 +62821,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNodes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNodes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62766,7 +62832,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62797,7 +62863,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62807,7 +62873,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -62820,7 +62886,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -62905,8 +62971,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -62916,7 +62982,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::PerformMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -62949,7 +63015,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -62959,7 +63025,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .perform_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `perform_maintenance`.
@@ -62972,7 +63038,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -63057,8 +63123,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PerformMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PerformMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63068,7 +63134,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63099,7 +63165,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63109,7 +63175,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::node_groups::SetIamPolicyRequest::project].
@@ -63150,8 +63216,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63161,7 +63227,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::SetNodeTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63192,7 +63258,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63202,7 +63268,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .set_node_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_node_template`.
@@ -63215,7 +63281,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -63300,8 +63366,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetNodeTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetNodeTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63311,7 +63377,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::SimulateMaintenanceEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63344,7 +63410,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63354,7 +63420,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .simulate_maintenance_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `simulate_maintenance_event`.
@@ -63367,7 +63433,7 @@ pub mod node_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -63452,8 +63518,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SimulateMaintenanceEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SimulateMaintenanceEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63463,7 +63529,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63496,7 +63562,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63506,7 +63572,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::node_groups::TestIamPermissionsRequest::project].
@@ -63547,8 +63613,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63558,7 +63624,7 @@ pub mod node_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63589,7 +63655,7 @@ pub mod node_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63599,7 +63665,7 @@ pub mod node_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -63622,8 +63688,8 @@ pub mod node_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63637,7 +63703,7 @@ pub mod node_templates {
     /// A builder for [NodeTemplates][crate::client::NodeTemplates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::node_templates::ClientBuilder;
     /// # use client::NodeTemplates;
@@ -63647,19 +63713,18 @@ pub mod node_templates {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NodeTemplates;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NodeTemplates;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -63670,7 +63735,7 @@ pub mod node_templates {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NodeTemplates>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -63683,7 +63748,7 @@ pub mod node_templates {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -63693,8 +63758,8 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -63728,7 +63793,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63738,14 +63803,16 @@ pub mod node_templates {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeTemplateAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NodeTemplateAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -63753,17 +63820,17 @@ pub mod node_templates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NodeTemplateAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -63901,8 +63968,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -63912,7 +63979,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -63943,7 +64010,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -63953,7 +64020,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -63966,7 +64033,7 @@ pub mod node_templates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -64033,8 +64100,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64044,7 +64111,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64075,7 +64142,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64085,7 +64152,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [node_template][crate::model::node_templates::GetRequest::node_template].
@@ -64108,8 +64175,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64119,7 +64186,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64150,7 +64217,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64160,7 +64227,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::node_templates::GetIamPolicyRequest::options_requested_policy_version].
@@ -64204,8 +64271,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64215,7 +64282,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64246,7 +64313,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64256,7 +64323,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -64269,7 +64336,7 @@ pub mod node_templates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -64348,8 +64415,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64359,8 +64426,8 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -64394,7 +64461,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64404,13 +64471,13 @@ pub mod node_templates {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeTemplateList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::NodeTemplateList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -64419,15 +64486,15 @@ pub mod node_templates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NodeTemplateList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::NodeTemplateList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -64535,8 +64602,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64546,7 +64613,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64577,7 +64644,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64587,7 +64654,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::node_templates::SetIamPolicyRequest::project].
@@ -64628,8 +64695,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64639,7 +64706,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64672,7 +64739,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64682,7 +64749,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::node_templates::TestIamPermissionsRequest::project].
@@ -64723,8 +64790,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64734,7 +64801,7 @@ pub mod node_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_templates::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -64765,7 +64832,7 @@ pub mod node_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64775,7 +64842,7 @@ pub mod node_templates {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -64798,8 +64865,8 @@ pub mod node_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -64813,7 +64880,7 @@ pub mod node_types {
     /// A builder for [NodeTypes][crate::client::NodeTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::node_types::ClientBuilder;
     /// # use client::NodeTypes;
@@ -64823,19 +64890,18 @@ pub mod node_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NodeTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NodeTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -64846,7 +64912,7 @@ pub mod node_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NodeTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64859,7 +64925,7 @@ pub mod node_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -64869,8 +64935,8 @@ pub mod node_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_types::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -64904,7 +64970,7 @@ pub mod node_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -64914,14 +64980,16 @@ pub mod node_types {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeTypeAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NodeTypeAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -64929,15 +64997,17 @@ pub mod node_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NodeTypeAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NodeTypeAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -65075,8 +65145,8 @@ pub mod node_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65086,7 +65156,7 @@ pub mod node_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_types::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -65114,7 +65184,7 @@ pub mod node_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65124,7 +65194,7 @@ pub mod node_types {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [node_type][crate::model::node_types::GetRequest::node_type].
@@ -65147,8 +65217,8 @@ pub mod node_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65158,8 +65228,8 @@ pub mod node_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::node_types::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -65193,7 +65263,7 @@ pub mod node_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65203,13 +65273,14 @@ pub mod node_types {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NodeTypeList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::NodeTypeList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -65217,15 +65288,15 @@ pub mod node_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NodeTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::NodeTypeList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -65333,8 +65404,8 @@ pub mod node_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65348,7 +65419,7 @@ pub mod organization_security_policies {
     /// A builder for [OrganizationSecurityPolicies][crate::client::OrganizationSecurityPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::organization_security_policies::ClientBuilder;
     /// # use client::OrganizationSecurityPolicies;
@@ -65358,19 +65429,18 @@ pub mod organization_security_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::OrganizationSecurityPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = OrganizationSecurityPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -65381,7 +65451,7 @@ pub mod organization_security_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::OrganizationSecurityPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -65394,7 +65464,7 @@ pub mod organization_security_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -65404,7 +65474,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::AddAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -65439,7 +65509,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65449,7 +65519,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .add_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_association`.
@@ -65462,7 +65532,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -65550,8 +65620,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65561,7 +65631,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::AddRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -65596,7 +65666,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65606,7 +65676,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .add_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_rule`.
@@ -65619,7 +65689,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -65686,8 +65756,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65697,7 +65767,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::CopyRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -65732,7 +65802,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65742,7 +65812,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .copy_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `copy_rules`.
@@ -65755,7 +65825,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -65822,8 +65892,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CopyRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CopyRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65833,7 +65903,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -65866,7 +65936,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65876,7 +65946,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -65889,7 +65959,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -65938,8 +66008,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -65949,7 +66019,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -65980,7 +66050,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -65990,7 +66060,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [security_policy][crate::model::organization_security_policies::GetRequest::security_policy].
@@ -66001,8 +66071,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66012,7 +66082,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::GetAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66047,7 +66117,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66057,7 +66127,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .get_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::organization_security_policies::GetAssociationRequest::name].
@@ -66086,8 +66156,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66097,7 +66167,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66132,7 +66202,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66142,7 +66212,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [priority][crate::model::organization_security_policies::GetRuleRequest::priority].
@@ -66171,8 +66241,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66182,7 +66252,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66215,7 +66285,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66225,7 +66295,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -66238,7 +66308,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -66317,8 +66387,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66328,8 +66398,8 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -66363,7 +66433,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66373,13 +66443,13 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SecurityPolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SecurityPolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -66388,15 +66458,17 @@ pub mod organization_security_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SecurityPolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SecurityPolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -66510,8 +66582,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66521,7 +66593,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::ListAssociations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66556,7 +66628,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66568,7 +66640,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .list_associations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [target_resource][crate::model::organization_security_policies::ListAssociationsRequest::target_resource].
@@ -66591,8 +66663,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssociations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssociations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66602,7 +66674,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::ListPreconfiguredExpressionSets;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66634,7 +66706,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66646,7 +66718,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .list_preconfigured_expression_sets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [filter][crate::model::organization_security_policies::ListPreconfiguredExpressionSetsRequest::filter].
@@ -66759,8 +66831,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPreconfiguredExpressionSets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPreconfiguredExpressionSets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66770,7 +66842,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::Move;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66801,7 +66873,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66811,7 +66883,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .r#move(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `r#move`.
@@ -66824,7 +66896,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -66891,8 +66963,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Move {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Move {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -66902,7 +66974,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -66933,7 +67005,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -66943,7 +67015,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -66956,7 +67028,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -67023,8 +67095,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67034,7 +67106,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::PatchRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -67069,7 +67141,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67079,7 +67151,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .patch_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_rule`.
@@ -67092,7 +67164,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -67177,8 +67249,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67188,7 +67260,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::RemoveAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -67223,7 +67295,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67233,7 +67305,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .remove_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_association`.
@@ -67246,7 +67318,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -67313,8 +67385,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67324,7 +67396,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::RemoveRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -67359,7 +67431,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67369,7 +67441,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .remove_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_rule`.
@@ -67382,7 +67454,7 @@ pub mod organization_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -67449,8 +67521,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67460,7 +67532,7 @@ pub mod organization_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::organization_security_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -67493,7 +67565,7 @@ pub mod organization_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67503,7 +67575,7 @@ pub mod organization_security_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_organization_operations::GetRequest::operation].
@@ -67532,8 +67604,8 @@ pub mod organization_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67547,7 +67619,7 @@ pub mod packet_mirrorings {
     /// A builder for [PacketMirrorings][crate::client::PacketMirrorings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::packet_mirrorings::ClientBuilder;
     /// # use client::PacketMirrorings;
@@ -67557,19 +67629,18 @@ pub mod packet_mirrorings {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PacketMirrorings;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PacketMirrorings;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -67580,7 +67651,7 @@ pub mod packet_mirrorings {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PacketMirrorings>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -67593,7 +67664,7 @@ pub mod packet_mirrorings {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -67603,8 +67674,8 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -67640,7 +67711,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67650,14 +67721,16 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PacketMirroringAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::PacketMirroringAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -67665,17 +67738,17 @@ pub mod packet_mirrorings {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::PacketMirroringAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -67813,8 +67886,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67824,7 +67897,7 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -67855,7 +67928,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67865,7 +67938,7 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -67878,7 +67951,7 @@ pub mod packet_mirrorings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -67945,8 +68018,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -67956,7 +68029,7 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -67987,7 +68060,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -67997,7 +68070,7 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [packet_mirroring][crate::model::packet_mirrorings::GetRequest::packet_mirroring].
@@ -68020,8 +68093,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68031,7 +68104,7 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -68062,7 +68135,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68072,7 +68145,7 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -68085,7 +68158,7 @@ pub mod packet_mirrorings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -68164,8 +68237,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68175,8 +68248,8 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -68210,7 +68283,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68220,13 +68293,13 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PacketMirroringList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::PacketMirroringList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -68235,15 +68308,17 @@ pub mod packet_mirrorings {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::PacketMirroringList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::PacketMirroringList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -68351,8 +68426,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68362,7 +68437,7 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -68393,7 +68468,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68403,7 +68478,7 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -68416,7 +68491,7 @@ pub mod packet_mirrorings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -68501,8 +68576,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68512,7 +68587,7 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -68545,7 +68620,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68555,7 +68630,7 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::packet_mirrorings::TestIamPermissionsRequest::project].
@@ -68596,8 +68671,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68607,7 +68682,7 @@ pub mod packet_mirrorings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::packet_mirrorings::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -68638,7 +68713,7 @@ pub mod packet_mirrorings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68648,7 +68723,7 @@ pub mod packet_mirrorings {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -68671,8 +68746,8 @@ pub mod packet_mirrorings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68686,7 +68761,7 @@ pub mod preview_features {
     /// A builder for [PreviewFeatures][crate::client::PreviewFeatures].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::preview_features::ClientBuilder;
     /// # use client::PreviewFeatures;
@@ -68696,19 +68771,18 @@ pub mod preview_features {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PreviewFeatures;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PreviewFeatures;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -68719,7 +68793,7 @@ pub mod preview_features {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PreviewFeatures>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -68732,7 +68806,7 @@ pub mod preview_features {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -68742,7 +68816,7 @@ pub mod preview_features {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::preview_features::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -68773,7 +68847,7 @@ pub mod preview_features {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68783,7 +68857,7 @@ pub mod preview_features {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [preview_feature][crate::model::preview_features::GetRequest::preview_feature].
@@ -68800,8 +68874,8 @@ pub mod preview_features {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68811,8 +68885,8 @@ pub mod preview_features {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::preview_features::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -68846,7 +68920,7 @@ pub mod preview_features {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -68856,13 +68930,13 @@ pub mod preview_features {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PreviewFeatureList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::PreviewFeatureList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -68871,15 +68945,17 @@ pub mod preview_features {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::PreviewFeatureList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::PreviewFeatureList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -68981,8 +69057,8 @@ pub mod preview_features {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -68992,7 +69068,7 @@ pub mod preview_features {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::preview_features::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69023,7 +69099,7 @@ pub mod preview_features {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69033,7 +69109,7 @@ pub mod preview_features {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -69046,7 +69122,7 @@ pub mod preview_features {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -69122,8 +69198,8 @@ pub mod preview_features {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69133,7 +69209,7 @@ pub mod preview_features {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::preview_features::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69164,7 +69240,7 @@ pub mod preview_features {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69174,7 +69250,7 @@ pub mod preview_features {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -69191,8 +69267,8 @@ pub mod preview_features {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69206,7 +69282,7 @@ pub mod projects {
     /// A builder for [Projects][crate::client::Projects].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::projects::ClientBuilder;
     /// # use client::Projects;
@@ -69216,19 +69292,18 @@ pub mod projects {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Projects;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Projects;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -69239,7 +69314,7 @@ pub mod projects {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Projects>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -69250,7 +69325,7 @@ pub mod projects {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -69260,7 +69335,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::DisableXpnHost;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69289,7 +69364,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69299,7 +69374,7 @@ pub mod projects {
             (*self.0.stub)
                 .disable_xpn_host(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_xpn_host`.
@@ -69312,7 +69387,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -69364,8 +69439,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisableXpnHost {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisableXpnHost {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69375,7 +69450,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::DisableXpnResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69406,7 +69481,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69416,7 +69491,7 @@ pub mod projects {
             (*self.0.stub)
                 .disable_xpn_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_xpn_resource`.
@@ -69429,7 +69504,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -69499,8 +69574,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisableXpnResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisableXpnResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69510,7 +69585,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::EnableXpnHost;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69539,7 +69614,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69549,7 +69624,7 @@ pub mod projects {
             (*self.0.stub)
                 .enable_xpn_host(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_xpn_host`.
@@ -69562,7 +69637,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -69614,8 +69689,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnableXpnHost {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnableXpnHost {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69625,7 +69700,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::EnableXpnResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69654,7 +69729,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69664,7 +69739,7 @@ pub mod projects {
             (*self.0.stub)
                 .enable_xpn_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_xpn_resource`.
@@ -69677,7 +69752,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -69747,8 +69822,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnableXpnResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnableXpnResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69758,7 +69833,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69784,7 +69859,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69794,7 +69869,7 @@ pub mod projects {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::projects::GetRequest::project].
@@ -69805,8 +69880,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69816,7 +69891,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::GetXpnHost;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -69845,7 +69920,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69855,7 +69930,7 @@ pub mod projects {
             (*self.0.stub)
                 .get_xpn_host(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::projects::GetXpnHostRequest::project].
@@ -69866,8 +69941,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetXpnHost {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetXpnHost {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -69877,8 +69952,8 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::GetXpnResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -69910,7 +69985,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -69920,14 +69995,16 @@ pub mod projects {
             (*self.0.stub)
                 .get_xpn_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ProjectsGetXpnResources, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ProjectsGetXpnResources,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -69935,15 +70012,17 @@ pub mod projects {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ProjectsGetXpnResources, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ProjectsGetXpnResources,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -70045,8 +70124,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetXpnResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetXpnResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70056,8 +70135,8 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::ListXpnHosts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -70089,7 +70168,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70099,13 +70178,14 @@ pub mod projects {
             (*self.0.stub)
                 .list_xpn_hosts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::XpnHostList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::XpnHostList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -70113,15 +70193,15 @@ pub mod projects {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::XpnHostList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::XpnHostList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -70241,8 +70321,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListXpnHosts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListXpnHosts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70252,7 +70332,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::MoveDisk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -70281,7 +70361,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70291,7 +70371,7 @@ pub mod projects {
             (*self.0.stub)
                 .move_disk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `move_disk`.
@@ -70304,7 +70384,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -70374,8 +70454,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveDisk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveDisk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70385,7 +70465,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::MoveInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -70414,7 +70494,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70424,7 +70504,7 @@ pub mod projects {
             (*self.0.stub)
                 .move_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `move_instance`.
@@ -70437,7 +70517,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -70507,8 +70587,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70518,7 +70598,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::SetCloudArmorTier;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -70547,7 +70627,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70557,7 +70637,7 @@ pub mod projects {
             (*self.0.stub)
                 .set_cloud_armor_tier(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_cloud_armor_tier`.
@@ -70570,7 +70650,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -70640,8 +70720,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetCloudArmorTier {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetCloudArmorTier {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70651,7 +70731,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::SetCommonInstanceMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -70682,7 +70762,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70692,7 +70772,7 @@ pub mod projects {
             (*self.0.stub)
                 .set_common_instance_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_common_instance_metadata`.
@@ -70705,7 +70785,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -70775,8 +70855,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetCommonInstanceMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetCommonInstanceMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70786,7 +70866,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::SetDefaultNetworkTier;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -70817,7 +70897,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70827,7 +70907,7 @@ pub mod projects {
             (*self.0.stub)
                 .set_default_network_tier(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_default_network_tier`.
@@ -70840,7 +70920,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -70910,8 +70990,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetDefaultNetworkTier {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetDefaultNetworkTier {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -70921,7 +71001,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::SetUsageExportBucket;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -70952,7 +71032,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -70962,7 +71042,7 @@ pub mod projects {
             (*self.0.stub)
                 .set_usage_export_bucket(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_usage_export_bucket`.
@@ -70975,7 +71055,7 @@ pub mod projects {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -71045,8 +71125,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetUsageExportBucket {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetUsageExportBucket {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71056,7 +71136,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::projects::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71085,7 +71165,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71095,7 +71175,7 @@ pub mod projects {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -71112,8 +71192,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71127,7 +71207,7 @@ pub mod public_advertised_prefixes {
     /// A builder for [PublicAdvertisedPrefixes][crate::client::PublicAdvertisedPrefixes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::public_advertised_prefixes::ClientBuilder;
     /// # use client::PublicAdvertisedPrefixes;
@@ -71137,19 +71217,18 @@ pub mod public_advertised_prefixes {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PublicAdvertisedPrefixes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PublicAdvertisedPrefixes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -71160,7 +71239,7 @@ pub mod public_advertised_prefixes {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PublicAdvertisedPrefixes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -71173,7 +71252,7 @@ pub mod public_advertised_prefixes {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -71183,7 +71262,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::Announce;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71214,7 +71293,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71224,7 +71303,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .announce(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `announce`.
@@ -71237,7 +71316,7 @@ pub mod public_advertised_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -71295,8 +71374,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Announce {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Announce {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71306,7 +71385,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71337,7 +71416,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71347,7 +71426,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -71360,7 +71439,7 @@ pub mod public_advertised_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -71418,8 +71497,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71429,7 +71508,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71460,7 +71539,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71470,7 +71549,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::public_advertised_prefixes::GetRequest::project].
@@ -71487,8 +71566,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71498,7 +71577,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71529,7 +71608,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71539,7 +71618,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -71552,7 +71631,7 @@ pub mod public_advertised_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -71622,8 +71701,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71633,8 +71712,8 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -71668,7 +71747,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71678,14 +71757,16 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PublicAdvertisedPrefixList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::PublicAdvertisedPrefixList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -71693,17 +71774,17 @@ pub mod public_advertised_prefixes {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::PublicAdvertisedPrefixList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -71805,8 +71886,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71816,7 +71897,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71847,7 +71928,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71857,7 +71938,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -71870,7 +71951,7 @@ pub mod public_advertised_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -71946,8 +72027,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -71957,7 +72038,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::Withdraw;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -71988,7 +72069,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -71998,7 +72079,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .withdraw(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `withdraw`.
@@ -72011,7 +72092,7 @@ pub mod public_advertised_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -72069,8 +72150,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Withdraw {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Withdraw {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72080,7 +72161,7 @@ pub mod public_advertised_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_advertised_prefixes::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -72111,7 +72192,7 @@ pub mod public_advertised_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72121,7 +72202,7 @@ pub mod public_advertised_prefixes {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -72138,8 +72219,8 @@ pub mod public_advertised_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72153,7 +72234,7 @@ pub mod public_delegated_prefixes {
     /// A builder for [PublicDelegatedPrefixes][crate::client::PublicDelegatedPrefixes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::public_delegated_prefixes::ClientBuilder;
     /// # use client::PublicDelegatedPrefixes;
@@ -72163,19 +72244,18 @@ pub mod public_delegated_prefixes {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PublicDelegatedPrefixes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PublicDelegatedPrefixes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -72186,7 +72266,7 @@ pub mod public_delegated_prefixes {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PublicDelegatedPrefixes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -72199,7 +72279,7 @@ pub mod public_delegated_prefixes {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -72209,8 +72289,8 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -72248,7 +72328,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72258,15 +72338,15 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::PublicDelegatedPrefixAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -72275,17 +72355,17 @@ pub mod public_delegated_prefixes {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::PublicDelegatedPrefixAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -72423,8 +72503,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72434,7 +72514,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::Announce;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -72465,7 +72545,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72475,7 +72555,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .announce(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `announce`.
@@ -72488,7 +72568,7 @@ pub mod public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -72555,8 +72635,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Announce {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Announce {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72566,7 +72646,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -72597,7 +72677,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72607,7 +72687,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -72620,7 +72700,7 @@ pub mod public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -72687,8 +72767,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72698,7 +72778,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -72729,7 +72809,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72739,7 +72819,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::public_delegated_prefixes::GetRequest::project].
@@ -72762,8 +72842,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72773,7 +72853,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -72804,7 +72884,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72814,7 +72894,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -72827,7 +72907,7 @@ pub mod public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -72906,8 +72986,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -72917,8 +72997,8 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -72952,7 +73032,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -72962,14 +73042,16 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PublicDelegatedPrefixList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::PublicDelegatedPrefixList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -72977,15 +73059,17 @@ pub mod public_delegated_prefixes {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::PublicDelegatedPrefixList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::PublicDelegatedPrefixList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -73093,8 +73177,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73104,7 +73188,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -73135,7 +73219,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73145,7 +73229,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -73158,7 +73242,7 @@ pub mod public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -73243,8 +73327,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73254,7 +73338,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::Withdraw;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -73285,7 +73369,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73295,7 +73379,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .withdraw(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `withdraw`.
@@ -73308,7 +73392,7 @@ pub mod public_delegated_prefixes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -73375,8 +73459,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Withdraw {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Withdraw {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73386,7 +73470,7 @@ pub mod public_delegated_prefixes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::public_delegated_prefixes::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -73417,7 +73501,7 @@ pub mod public_delegated_prefixes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73427,7 +73511,7 @@ pub mod public_delegated_prefixes {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -73450,8 +73534,8 @@ pub mod public_delegated_prefixes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73465,7 +73549,7 @@ pub mod region_autoscalers {
     /// A builder for [RegionAutoscalers][crate::client::RegionAutoscalers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_autoscalers::ClientBuilder;
     /// # use client::RegionAutoscalers;
@@ -73475,19 +73559,18 @@ pub mod region_autoscalers {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionAutoscalers;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionAutoscalers;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -73498,7 +73581,7 @@ pub mod region_autoscalers {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionAutoscalers>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -73511,7 +73594,7 @@ pub mod region_autoscalers {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -73521,7 +73604,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -73552,7 +73635,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73562,7 +73645,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -73575,7 +73658,7 @@ pub mod region_autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -73642,8 +73725,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73653,7 +73736,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -73684,7 +73767,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73694,7 +73777,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [autoscaler][crate::model::region_autoscalers::GetRequest::autoscaler].
@@ -73717,8 +73800,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73728,7 +73811,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -73759,7 +73842,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73769,7 +73852,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -73782,7 +73865,7 @@ pub mod region_autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -73861,8 +73944,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -73872,8 +73955,8 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -73907,7 +73990,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -73917,13 +74000,13 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RegionAutoscalerList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RegionAutoscalerList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -73932,15 +74015,17 @@ pub mod region_autoscalers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RegionAutoscalerList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::RegionAutoscalerList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -74048,8 +74133,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74059,7 +74144,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74090,7 +74175,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74100,7 +74185,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -74113,7 +74198,7 @@ pub mod region_autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -74210,8 +74295,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74221,7 +74306,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74256,7 +74341,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74266,7 +74351,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_autoscalers::TestIamPermissionsRequest::project].
@@ -74307,8 +74392,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74318,7 +74403,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74349,7 +74434,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74359,7 +74444,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -74372,7 +74457,7 @@ pub mod region_autoscalers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -74469,8 +74554,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74480,7 +74565,7 @@ pub mod region_autoscalers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_autoscalers::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74511,7 +74596,7 @@ pub mod region_autoscalers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74521,7 +74606,7 @@ pub mod region_autoscalers {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -74544,8 +74629,8 @@ pub mod region_autoscalers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74559,7 +74644,7 @@ pub mod region_backend_services {
     /// A builder for [RegionBackendServices][crate::client::RegionBackendServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_backend_services::ClientBuilder;
     /// # use client::RegionBackendServices;
@@ -74569,19 +74654,18 @@ pub mod region_backend_services {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionBackendServices;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionBackendServices;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -74592,7 +74676,7 @@ pub mod region_backend_services {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionBackendServices>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -74605,7 +74689,7 @@ pub mod region_backend_services {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74615,7 +74699,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74646,7 +74730,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74656,7 +74740,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -74669,7 +74753,7 @@ pub mod region_backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -74736,8 +74820,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74747,7 +74831,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74778,7 +74862,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74788,7 +74872,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backend_service][crate::model::region_backend_services::GetRequest::backend_service].
@@ -74811,8 +74895,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74822,7 +74906,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::GetHealth;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74853,7 +74937,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74863,7 +74947,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .get_health(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backend_service][crate::model::region_backend_services::GetHealthRequest::backend_service].
@@ -74904,8 +74988,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHealth {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHealth {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -74915,7 +74999,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -74948,7 +75032,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -74958,7 +75042,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::region_backend_services::GetIamPolicyRequest::options_requested_policy_version].
@@ -75002,8 +75086,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75013,7 +75097,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -75044,7 +75128,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75054,7 +75138,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -75067,7 +75151,7 @@ pub mod region_backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -75146,8 +75230,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75157,8 +75241,8 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -75192,7 +75276,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75202,13 +75286,13 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::BackendServiceList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::BackendServiceList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -75217,15 +75301,17 @@ pub mod region_backend_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::BackendServiceList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::BackendServiceList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -75333,8 +75419,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75344,8 +75430,8 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::ListUsable;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -75379,7 +75465,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75389,14 +75475,16 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .list_usable(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::BackendServiceListUsable, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::BackendServiceListUsable,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -75404,15 +75492,17 @@ pub mod region_backend_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::BackendServiceListUsable, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::BackendServiceListUsable,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -75520,8 +75610,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListUsable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListUsable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75531,7 +75621,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -75562,7 +75652,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75572,7 +75662,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -75585,7 +75675,7 @@ pub mod region_backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -75670,8 +75760,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75681,7 +75771,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -75714,7 +75804,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75724,7 +75814,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_backend_services::SetIamPolicyRequest::project].
@@ -75765,8 +75855,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75776,7 +75866,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::SetSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -75811,7 +75901,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75821,7 +75911,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .set_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_security_policy`.
@@ -75834,7 +75924,7 @@ pub mod region_backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -75919,8 +76009,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -75930,7 +76020,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -75965,7 +76055,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -75975,7 +76065,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_backend_services::TestIamPermissionsRequest::project].
@@ -76016,8 +76106,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76027,7 +76117,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -76058,7 +76148,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76068,7 +76158,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -76081,7 +76171,7 @@ pub mod region_backend_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -76166,8 +76256,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76177,7 +76267,7 @@ pub mod region_backend_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_backend_services::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -76208,7 +76298,7 @@ pub mod region_backend_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76218,7 +76308,7 @@ pub mod region_backend_services {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -76241,8 +76331,8 @@ pub mod region_backend_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76256,7 +76346,7 @@ pub mod region_commitments {
     /// A builder for [RegionCommitments][crate::client::RegionCommitments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_commitments::ClientBuilder;
     /// # use client::RegionCommitments;
@@ -76266,19 +76356,18 @@ pub mod region_commitments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionCommitments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionCommitments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -76289,7 +76378,7 @@ pub mod region_commitments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionCommitments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -76302,7 +76391,7 @@ pub mod region_commitments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76312,8 +76401,8 @@ pub mod region_commitments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_commitments::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -76349,7 +76438,7 @@ pub mod region_commitments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76359,14 +76448,16 @@ pub mod region_commitments {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::CommitmentAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::CommitmentAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -76374,15 +76465,17 @@ pub mod region_commitments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::CommitmentAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::CommitmentAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -76520,8 +76613,8 @@ pub mod region_commitments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76531,7 +76624,7 @@ pub mod region_commitments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_commitments::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -76562,7 +76655,7 @@ pub mod region_commitments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76572,7 +76665,7 @@ pub mod region_commitments {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [commitment][crate::model::region_commitments::GetRequest::commitment].
@@ -76595,8 +76688,8 @@ pub mod region_commitments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76606,7 +76699,7 @@ pub mod region_commitments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_commitments::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -76637,7 +76730,7 @@ pub mod region_commitments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76647,7 +76740,7 @@ pub mod region_commitments {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -76660,7 +76753,7 @@ pub mod region_commitments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -76739,8 +76832,8 @@ pub mod region_commitments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76750,8 +76843,8 @@ pub mod region_commitments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_commitments::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -76785,7 +76878,7 @@ pub mod region_commitments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76795,13 +76888,13 @@ pub mod region_commitments {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::CommitmentList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::CommitmentList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -76810,15 +76903,15 @@ pub mod region_commitments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::CommitmentList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::CommitmentList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -76926,8 +77019,8 @@ pub mod region_commitments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -76937,7 +77030,7 @@ pub mod region_commitments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_commitments::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -76968,7 +77061,7 @@ pub mod region_commitments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -76978,7 +77071,7 @@ pub mod region_commitments {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -76991,7 +77084,7 @@ pub mod region_commitments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -77112,8 +77205,8 @@ pub mod region_commitments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -77123,7 +77216,7 @@ pub mod region_commitments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_commitments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -77154,7 +77247,7 @@ pub mod region_commitments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -77164,7 +77257,7 @@ pub mod region_commitments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -77187,8 +77280,8 @@ pub mod region_commitments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -77202,7 +77295,7 @@ pub mod region_disk_types {
     /// A builder for [RegionDiskTypes][crate::client::RegionDiskTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_disk_types::ClientBuilder;
     /// # use client::RegionDiskTypes;
@@ -77212,19 +77305,18 @@ pub mod region_disk_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionDiskTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionDiskTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -77235,7 +77327,7 @@ pub mod region_disk_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionDiskTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -77248,7 +77340,7 @@ pub mod region_disk_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -77258,7 +77350,7 @@ pub mod region_disk_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disk_types::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -77289,7 +77381,7 @@ pub mod region_disk_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -77299,7 +77391,7 @@ pub mod region_disk_types {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [disk_type][crate::model::region_disk_types::GetRequest::disk_type].
@@ -77322,8 +77414,8 @@ pub mod region_disk_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -77333,8 +77425,8 @@ pub mod region_disk_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disk_types::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -77368,7 +77460,7 @@ pub mod region_disk_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -77378,13 +77470,13 @@ pub mod region_disk_types {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RegionDiskTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RegionDiskTypeList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -77393,15 +77485,17 @@ pub mod region_disk_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RegionDiskTypeList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::RegionDiskTypeList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -77509,8 +77603,8 @@ pub mod region_disk_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -77524,7 +77618,7 @@ pub mod region_disks {
     /// A builder for [RegionDisks][crate::client::RegionDisks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_disks::ClientBuilder;
     /// # use client::RegionDisks;
@@ -77534,19 +77628,18 @@ pub mod region_disks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionDisks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionDisks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -77557,7 +77650,7 @@ pub mod region_disks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionDisks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -77570,7 +77663,7 @@ pub mod region_disks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -77580,7 +77673,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::AddResourcePolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -77613,7 +77706,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -77623,7 +77716,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .add_resource_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_resource_policies`.
@@ -77636,7 +77729,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -77721,8 +77814,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddResourcePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddResourcePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -77732,7 +77825,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::BulkInsert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -77763,7 +77856,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -77773,7 +77866,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .bulk_insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_insert`.
@@ -77786,7 +77879,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -77865,8 +77958,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkInsert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkInsert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -77876,7 +77969,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::CreateSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -77907,7 +78000,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -77917,7 +78010,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .create_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_snapshot`.
@@ -77930,7 +78023,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -78015,8 +78108,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78026,7 +78119,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -78057,7 +78150,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78067,7 +78160,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -78080,7 +78173,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -78147,8 +78240,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78158,7 +78251,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -78189,7 +78282,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78199,7 +78292,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [disk][crate::model::region_disks::GetRequest::disk].
@@ -78222,8 +78315,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78233,7 +78326,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -78264,7 +78357,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78274,7 +78367,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::region_disks::GetIamPolicyRequest::options_requested_policy_version].
@@ -78318,8 +78411,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78329,7 +78422,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -78360,7 +78453,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78370,7 +78463,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -78383,7 +78476,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -78480,8 +78573,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78491,8 +78584,8 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -78526,7 +78619,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78536,13 +78629,14 @@ pub mod region_disks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DiskList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::DiskList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -78550,14 +78644,15 @@ pub mod region_disks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DiskList, gax::error::Error> {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::DiskList, crate::Error>
+        {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -78665,8 +78760,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78676,7 +78771,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::RemoveResourcePolicies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -78709,7 +78804,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78719,7 +78814,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .remove_resource_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_resource_policies`.
@@ -78732,7 +78827,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -78817,8 +78912,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveResourcePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveResourcePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78828,7 +78923,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::Resize;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -78859,7 +78954,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -78869,7 +78964,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .resize(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize`.
@@ -78882,7 +78977,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -78967,8 +79062,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Resize {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Resize {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -78978,7 +79073,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79009,7 +79104,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79019,7 +79114,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_disks::SetIamPolicyRequest::project].
@@ -79060,8 +79155,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79071,7 +79166,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79102,7 +79197,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79112,7 +79207,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -79125,7 +79220,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -79210,8 +79305,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79221,7 +79316,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::StartAsyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79254,7 +79349,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79264,7 +79359,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .start_async_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_async_replication`.
@@ -79277,7 +79372,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -79362,8 +79457,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartAsyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartAsyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79373,7 +79468,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::StopAsyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79406,7 +79501,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79416,7 +79511,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .stop_async_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_async_replication`.
@@ -79429,7 +79524,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -79496,8 +79591,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopAsyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopAsyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79507,7 +79602,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::StopGroupAsyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79542,7 +79637,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79552,7 +79647,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .stop_group_async_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_group_async_replication`.
@@ -79565,7 +79660,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -79644,8 +79739,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopGroupAsyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopGroupAsyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79655,7 +79750,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79688,7 +79783,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79698,7 +79793,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_disks::TestIamPermissionsRequest::project].
@@ -79739,8 +79834,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79750,7 +79845,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79781,7 +79876,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79791,7 +79886,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -79804,7 +79899,7 @@ pub mod region_disks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -79925,8 +80020,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -79936,7 +80031,7 @@ pub mod region_disks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_disks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -79967,7 +80062,7 @@ pub mod region_disks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -79977,7 +80072,7 @@ pub mod region_disks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -80000,8 +80095,8 @@ pub mod region_disks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80015,7 +80110,7 @@ pub mod region_health_check_services {
     /// A builder for [RegionHealthCheckServices][crate::client::RegionHealthCheckServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_health_check_services::ClientBuilder;
     /// # use client::RegionHealthCheckServices;
@@ -80025,19 +80120,18 @@ pub mod region_health_check_services {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionHealthCheckServices;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionHealthCheckServices;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -80048,7 +80142,7 @@ pub mod region_health_check_services {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionHealthCheckServices>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -80061,7 +80155,7 @@ pub mod region_health_check_services {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -80071,7 +80165,7 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -80102,7 +80196,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80112,7 +80206,7 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -80125,7 +80219,7 @@ pub mod region_health_check_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -80192,8 +80286,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80203,7 +80297,7 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -80234,7 +80328,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80244,7 +80338,7 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [health_check_service][crate::model::region_health_check_services::GetRequest::health_check_service].
@@ -80267,8 +80361,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80278,7 +80372,7 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -80309,7 +80403,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80319,7 +80413,7 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -80332,7 +80426,7 @@ pub mod region_health_check_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -80411,8 +80505,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80422,8 +80516,8 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -80457,7 +80551,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80467,14 +80561,16 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::HealthCheckServicesList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::HealthCheckServicesList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -80482,15 +80578,17 @@ pub mod region_health_check_services {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::HealthCheckServicesList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::HealthCheckServicesList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -80598,8 +80696,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80609,7 +80707,7 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -80640,7 +80738,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80650,7 +80748,7 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -80663,7 +80761,7 @@ pub mod region_health_check_services {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -80748,8 +80846,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80759,7 +80857,7 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -80794,7 +80892,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80804,7 +80902,7 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_health_check_services::TestIamPermissionsRequest::project].
@@ -80845,8 +80943,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80856,7 +80954,7 @@ pub mod region_health_check_services {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_check_services::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -80887,7 +80985,7 @@ pub mod region_health_check_services {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -80897,7 +80995,7 @@ pub mod region_health_check_services {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -80920,8 +81018,8 @@ pub mod region_health_check_services {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -80935,7 +81033,7 @@ pub mod region_health_checks {
     /// A builder for [RegionHealthChecks][crate::client::RegionHealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_health_checks::ClientBuilder;
     /// # use client::RegionHealthChecks;
@@ -80945,19 +81043,18 @@ pub mod region_health_checks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionHealthChecks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionHealthChecks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -80968,7 +81065,7 @@ pub mod region_health_checks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionHealthChecks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -80981,7 +81078,7 @@ pub mod region_health_checks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -80991,7 +81088,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81022,7 +81119,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81032,7 +81129,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -81045,7 +81142,7 @@ pub mod region_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -81112,8 +81209,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81123,7 +81220,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81154,7 +81251,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81164,7 +81261,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [health_check][crate::model::region_health_checks::GetRequest::health_check].
@@ -81187,8 +81284,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81198,7 +81295,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81229,7 +81326,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81239,7 +81336,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -81252,7 +81349,7 @@ pub mod region_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -81331,8 +81428,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81342,8 +81439,8 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -81377,7 +81474,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81387,13 +81484,13 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::HealthCheckList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::HealthCheckList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -81402,15 +81499,15 @@ pub mod region_health_checks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::HealthCheckList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::HealthCheckList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -81518,8 +81615,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81529,7 +81626,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81560,7 +81657,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81570,7 +81667,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -81583,7 +81680,7 @@ pub mod region_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -81668,8 +81765,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81679,7 +81776,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81714,7 +81811,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81724,7 +81821,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_health_checks::TestIamPermissionsRequest::project].
@@ -81765,8 +81862,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81776,7 +81873,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81807,7 +81904,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81817,7 +81914,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -81830,7 +81927,7 @@ pub mod region_health_checks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -81915,8 +82012,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -81926,7 +82023,7 @@ pub mod region_health_checks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_health_checks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -81957,7 +82054,7 @@ pub mod region_health_checks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -81967,7 +82064,7 @@ pub mod region_health_checks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -81990,8 +82087,8 @@ pub mod region_health_checks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82005,7 +82102,7 @@ pub mod region_instance_group_managers {
     /// A builder for [RegionInstanceGroupManagers][crate::client::RegionInstanceGroupManagers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_instance_group_managers::ClientBuilder;
     /// # use client::RegionInstanceGroupManagers;
@@ -82015,19 +82112,18 @@ pub mod region_instance_group_managers {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionInstanceGroupManagers;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionInstanceGroupManagers;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -82038,7 +82134,7 @@ pub mod region_instance_group_managers {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionInstanceGroupManagers>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -82051,7 +82147,7 @@ pub mod region_instance_group_managers {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -82061,7 +82157,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::AbandonInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82096,7 +82192,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82106,7 +82202,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .abandon_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `abandon_instances`.
@@ -82119,7 +82215,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -82204,8 +82300,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AbandonInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AbandonInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82215,7 +82311,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::ApplyUpdatesToInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82252,7 +82348,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82262,7 +82358,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .apply_updates_to_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `apply_updates_to_instances`.
@@ -82275,7 +82371,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -82342,8 +82438,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApplyUpdatesToInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApplyUpdatesToInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82353,7 +82449,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::CreateInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82388,7 +82484,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82398,7 +82494,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .create_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instances`.
@@ -82411,7 +82507,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -82496,8 +82592,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82507,7 +82603,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82540,7 +82636,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82550,7 +82646,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -82563,7 +82659,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -82630,8 +82726,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82641,7 +82737,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::DeleteInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82676,7 +82772,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82686,7 +82782,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .delete_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instances`.
@@ -82699,7 +82795,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -82784,8 +82880,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82795,7 +82891,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::DeletePerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82832,7 +82928,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82842,7 +82938,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .delete_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_per_instance_configs`.
@@ -82855,7 +82951,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -82922,8 +83018,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -82933,7 +83029,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -82964,7 +83060,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -82974,7 +83070,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_group_manager][crate::model::region_instance_group_managers::GetRequest::instance_group_manager].
@@ -82997,8 +83093,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -83008,7 +83104,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -83041,7 +83137,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -83051,7 +83147,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -83064,7 +83160,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -83143,8 +83239,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -83154,8 +83250,8 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -83189,7 +83285,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -83199,15 +83295,15 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::RegionInstanceGroupManagerList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -83216,17 +83312,17 @@ pub mod region_instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::RegionInstanceGroupManagerList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -83334,8 +83430,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -83345,8 +83441,8 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::ListErrors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -83384,7 +83480,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -83396,15 +83492,15 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .list_errors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::RegionInstanceGroupManagersListErrorsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -83413,17 +83509,17 @@ pub mod region_instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::RegionInstanceGroupManagersListErrorsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -83537,8 +83633,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListErrors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListErrors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -83548,8 +83644,8 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::ListManagedInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -83587,7 +83683,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -83599,15 +83695,15 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .list_managed_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::RegionInstanceGroupManagersListInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -83616,17 +83712,17 @@ pub mod region_instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::RegionInstanceGroupManagersListInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -83740,8 +83836,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListManagedInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListManagedInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -83751,8 +83847,8 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::ListPerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -83790,7 +83886,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -83802,15 +83898,15 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .list_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::RegionInstanceGroupManagersListInstanceConfigsResp,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -83819,17 +83915,17 @@ pub mod region_instance_group_managers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::RegionInstanceGroupManagersListInstanceConfigsResp,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -83943,8 +84039,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -83954,7 +84050,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -83985,7 +84081,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -83995,7 +84091,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -84008,7 +84104,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -84093,8 +84189,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -84104,7 +84200,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::PatchPerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -84141,7 +84237,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -84151,7 +84247,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .patch_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_per_instance_configs`.
@@ -84164,7 +84260,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -84249,8 +84345,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchPerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchPerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -84260,7 +84356,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::RecreateInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -84295,7 +84391,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -84305,7 +84401,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .recreate_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `recreate_instances`.
@@ -84318,7 +84414,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -84403,8 +84499,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RecreateInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RecreateInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -84414,7 +84510,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::Resize;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -84447,7 +84543,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -84457,7 +84553,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .resize(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize`.
@@ -84470,7 +84566,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -84543,8 +84639,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Resize {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Resize {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -84554,7 +84650,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::ResumeInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -84589,7 +84685,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -84599,7 +84695,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .resume_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resume_instances`.
@@ -84612,7 +84708,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -84697,8 +84793,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -84708,7 +84804,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::SetInstanceTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -84743,7 +84839,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -84753,7 +84849,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .set_instance_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_instance_template`.
@@ -84766,7 +84862,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -84851,8 +84947,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetInstanceTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetInstanceTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -84862,7 +84958,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::SetTargetPools;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -84897,7 +84993,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -84907,7 +85003,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .set_target_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_target_pools`.
@@ -84920,7 +85016,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -85005,8 +85101,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetTargetPools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetTargetPools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85016,7 +85112,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::StartInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -85051,7 +85147,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85061,7 +85157,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .start_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_instances`.
@@ -85074,7 +85170,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -85159,8 +85255,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85170,7 +85266,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::StopInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -85205,7 +85301,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85215,7 +85311,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .stop_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_instances`.
@@ -85228,7 +85324,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -85313,8 +85409,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85324,7 +85420,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::SuspendInstances;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -85359,7 +85455,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85369,7 +85465,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .suspend_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `suspend_instances`.
@@ -85382,7 +85478,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -85467,8 +85563,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuspendInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuspendInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85478,7 +85574,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::UpdatePerInstanceConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -85515,7 +85611,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85525,7 +85621,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .update_per_instance_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_per_instance_configs`.
@@ -85538,7 +85634,7 @@ pub mod region_instance_group_managers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -85623,8 +85719,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePerInstanceConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePerInstanceConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85634,7 +85730,7 @@ pub mod region_instance_group_managers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_group_managers::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -85665,7 +85761,7 @@ pub mod region_instance_group_managers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85675,7 +85771,7 @@ pub mod region_instance_group_managers {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -85698,8 +85794,8 @@ pub mod region_instance_group_managers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85713,7 +85809,7 @@ pub mod region_instance_groups {
     /// A builder for [RegionInstanceGroups][crate::client::RegionInstanceGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_instance_groups::ClientBuilder;
     /// # use client::RegionInstanceGroups;
@@ -85723,19 +85819,18 @@ pub mod region_instance_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionInstanceGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionInstanceGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -85746,7 +85841,7 @@ pub mod region_instance_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionInstanceGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -85759,7 +85854,7 @@ pub mod region_instance_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -85769,7 +85864,7 @@ pub mod region_instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -85800,7 +85895,7 @@ pub mod region_instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85810,7 +85905,7 @@ pub mod region_instance_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_group][crate::model::region_instance_groups::GetRequest::instance_group].
@@ -85833,8 +85928,8 @@ pub mod region_instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -85844,8 +85939,8 @@ pub mod region_instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -85879,7 +85974,7 @@ pub mod region_instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -85889,14 +85984,16 @@ pub mod region_instance_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RegionInstanceGroupList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::RegionInstanceGroupList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -85904,15 +86001,17 @@ pub mod region_instance_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RegionInstanceGroupList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::RegionInstanceGroupList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -86020,8 +86119,8 @@ pub mod region_instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86031,8 +86130,8 @@ pub mod region_instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_groups::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -86068,7 +86167,7 @@ pub mod region_instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86078,15 +86177,15 @@ pub mod region_instance_groups {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::RegionInstanceGroupsListInstances,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -86095,17 +86194,17 @@ pub mod region_instance_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::RegionInstanceGroupsListInstances,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -86237,8 +86336,8 @@ pub mod region_instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86248,7 +86347,7 @@ pub mod region_instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_groups::SetNamedPorts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -86281,7 +86380,7 @@ pub mod region_instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86291,7 +86390,7 @@ pub mod region_instance_groups {
             (*self.0.stub)
                 .set_named_ports(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_named_ports`.
@@ -86304,7 +86403,7 @@ pub mod region_instance_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -86389,8 +86488,8 @@ pub mod region_instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetNamedPorts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetNamedPorts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86400,7 +86499,7 @@ pub mod region_instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_groups::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -86435,7 +86534,7 @@ pub mod region_instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86445,7 +86544,7 @@ pub mod region_instance_groups {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_instance_groups::TestIamPermissionsRequest::project].
@@ -86486,8 +86585,8 @@ pub mod region_instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86497,7 +86596,7 @@ pub mod region_instance_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -86528,7 +86627,7 @@ pub mod region_instance_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86538,7 +86637,7 @@ pub mod region_instance_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -86561,8 +86660,8 @@ pub mod region_instance_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86576,7 +86675,7 @@ pub mod region_instance_templates {
     /// A builder for [RegionInstanceTemplates][crate::client::RegionInstanceTemplates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_instance_templates::ClientBuilder;
     /// # use client::RegionInstanceTemplates;
@@ -86586,19 +86685,18 @@ pub mod region_instance_templates {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionInstanceTemplates;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionInstanceTemplates;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -86609,7 +86707,7 @@ pub mod region_instance_templates {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionInstanceTemplates>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -86622,7 +86720,7 @@ pub mod region_instance_templates {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -86632,7 +86730,7 @@ pub mod region_instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_templates::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -86663,7 +86761,7 @@ pub mod region_instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86673,7 +86771,7 @@ pub mod region_instance_templates {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -86686,7 +86784,7 @@ pub mod region_instance_templates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -86753,8 +86851,8 @@ pub mod region_instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86764,7 +86862,7 @@ pub mod region_instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_templates::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -86795,7 +86893,7 @@ pub mod region_instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86805,7 +86903,7 @@ pub mod region_instance_templates {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instance_template][crate::model::region_instance_templates::GetRequest::instance_template].
@@ -86828,8 +86926,8 @@ pub mod region_instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86839,7 +86937,7 @@ pub mod region_instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_templates::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -86870,7 +86968,7 @@ pub mod region_instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -86880,7 +86978,7 @@ pub mod region_instance_templates {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -86893,7 +86991,7 @@ pub mod region_instance_templates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -86972,8 +87070,8 @@ pub mod region_instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -86983,8 +87081,8 @@ pub mod region_instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_templates::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -87018,7 +87116,7 @@ pub mod region_instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87028,13 +87126,13 @@ pub mod region_instance_templates {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstanceTemplateList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstanceTemplateList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -87043,15 +87141,17 @@ pub mod region_instance_templates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstanceTemplateList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstanceTemplateList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -87159,8 +87259,8 @@ pub mod region_instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87170,7 +87270,7 @@ pub mod region_instance_templates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instance_templates::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87201,7 +87301,7 @@ pub mod region_instance_templates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87211,7 +87311,7 @@ pub mod region_instance_templates {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -87234,8 +87334,8 @@ pub mod region_instance_templates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87249,7 +87349,7 @@ pub mod region_instances {
     /// A builder for [RegionInstances][crate::client::RegionInstances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_instances::ClientBuilder;
     /// # use client::RegionInstances;
@@ -87259,19 +87359,18 @@ pub mod region_instances {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionInstances;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionInstances;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -87282,7 +87381,7 @@ pub mod region_instances {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionInstances>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -87295,7 +87394,7 @@ pub mod region_instances {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -87305,7 +87404,7 @@ pub mod region_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instances::BulkInsert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87336,7 +87435,7 @@ pub mod region_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87346,7 +87445,7 @@ pub mod region_instances {
             (*self.0.stub)
                 .bulk_insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_insert`.
@@ -87359,7 +87458,7 @@ pub mod region_instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -87438,8 +87537,8 @@ pub mod region_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkInsert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkInsert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87449,7 +87548,7 @@ pub mod region_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instances::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87480,7 +87579,7 @@ pub mod region_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87490,7 +87589,7 @@ pub mod region_instances {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -87513,8 +87612,8 @@ pub mod region_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87528,7 +87627,7 @@ pub mod region_instant_snapshots {
     /// A builder for [RegionInstantSnapshots][crate::client::RegionInstantSnapshots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_instant_snapshots::ClientBuilder;
     /// # use client::RegionInstantSnapshots;
@@ -87538,19 +87637,18 @@ pub mod region_instant_snapshots {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionInstantSnapshots;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionInstantSnapshots;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -87561,7 +87659,7 @@ pub mod region_instant_snapshots {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionInstantSnapshots>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -87574,7 +87672,7 @@ pub mod region_instant_snapshots {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -87584,7 +87682,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87615,7 +87713,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87625,7 +87723,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -87638,7 +87736,7 @@ pub mod region_instant_snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -87705,8 +87803,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87716,7 +87814,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87747,7 +87845,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87757,7 +87855,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [instant_snapshot][crate::model::region_instant_snapshots::GetRequest::instant_snapshot].
@@ -87780,8 +87878,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87791,7 +87889,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87826,7 +87924,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87836,7 +87934,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::region_instant_snapshots::GetIamPolicyRequest::options_requested_policy_version].
@@ -87880,8 +87978,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -87891,7 +87989,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -87922,7 +88020,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -87932,7 +88030,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -87945,7 +88043,7 @@ pub mod region_instant_snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -88024,8 +88122,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88035,8 +88133,8 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -88070,7 +88168,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88080,13 +88178,13 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::InstantSnapshotList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::InstantSnapshotList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -88095,15 +88193,17 @@ pub mod region_instant_snapshots {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::InstantSnapshotList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::InstantSnapshotList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -88211,8 +88311,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88222,7 +88322,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -88257,7 +88357,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88267,7 +88367,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_instant_snapshots::SetIamPolicyRequest::project].
@@ -88308,8 +88408,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88319,7 +88419,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -88350,7 +88450,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88360,7 +88460,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -88373,7 +88473,7 @@ pub mod region_instant_snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -88458,8 +88558,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88469,7 +88569,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -88504,7 +88604,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88514,7 +88614,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_instant_snapshots::TestIamPermissionsRequest::project].
@@ -88555,8 +88655,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88566,7 +88666,7 @@ pub mod region_instant_snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_instant_snapshots::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -88597,7 +88697,7 @@ pub mod region_instant_snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88607,7 +88707,7 @@ pub mod region_instant_snapshots {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -88630,8 +88730,8 @@ pub mod region_instant_snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88645,7 +88745,7 @@ pub mod region_network_endpoint_groups {
     /// A builder for [RegionNetworkEndpointGroups][crate::client::RegionNetworkEndpointGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_network_endpoint_groups::ClientBuilder;
     /// # use client::RegionNetworkEndpointGroups;
@@ -88655,19 +88755,18 @@ pub mod region_network_endpoint_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionNetworkEndpointGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionNetworkEndpointGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -88678,7 +88777,7 @@ pub mod region_network_endpoint_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionNetworkEndpointGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -88691,7 +88790,7 @@ pub mod region_network_endpoint_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -88701,7 +88800,7 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::AttachNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -88736,7 +88835,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88746,7 +88845,7 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .attach_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `attach_network_endpoints`.
@@ -88759,7 +88858,7 @@ pub mod region_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -88844,8 +88943,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AttachNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AttachNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88855,7 +88954,7 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -88888,7 +88987,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -88898,7 +88997,7 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -88911,7 +89010,7 @@ pub mod region_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -88978,8 +89077,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -88989,7 +89088,7 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::DetachNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -89024,7 +89123,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89034,7 +89133,7 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .detach_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `detach_network_endpoints`.
@@ -89047,7 +89146,7 @@ pub mod region_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -89132,8 +89231,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -89143,7 +89242,7 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -89174,7 +89273,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89184,7 +89283,7 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network_endpoint_group][crate::model::region_network_endpoint_groups::GetRequest::network_endpoint_group].
@@ -89207,8 +89306,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -89218,7 +89317,7 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -89251,7 +89350,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89261,7 +89360,7 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -89274,7 +89373,7 @@ pub mod region_network_endpoint_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -89353,8 +89452,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -89364,8 +89463,8 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -89399,7 +89498,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89409,14 +89508,16 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NetworkEndpointGroupList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NetworkEndpointGroupList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -89424,15 +89525,17 @@ pub mod region_network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NetworkEndpointGroupList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NetworkEndpointGroupList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -89540,8 +89643,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -89551,8 +89654,8 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::ListNetworkEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -89590,7 +89693,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89600,15 +89703,15 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .list_network_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::NetworkEndpointGroupsListNetworkEndpoints,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -89617,17 +89720,17 @@ pub mod region_network_endpoint_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::NetworkEndpointGroupsListNetworkEndpoints,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -89741,8 +89844,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNetworkEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNetworkEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -89752,7 +89855,7 @@ pub mod region_network_endpoint_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_endpoint_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -89783,7 +89886,7 @@ pub mod region_network_endpoint_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89793,7 +89896,7 @@ pub mod region_network_endpoint_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -89816,8 +89919,8 @@ pub mod region_network_endpoint_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -89831,7 +89934,7 @@ pub mod region_network_firewall_policies {
     /// A builder for [RegionNetworkFirewallPolicies][crate::client::RegionNetworkFirewallPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_network_firewall_policies::ClientBuilder;
     /// # use client::RegionNetworkFirewallPolicies;
@@ -89841,19 +89944,18 @@ pub mod region_network_firewall_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionNetworkFirewallPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionNetworkFirewallPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -89864,7 +89966,7 @@ pub mod region_network_firewall_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionNetworkFirewallPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -89877,7 +89979,7 @@ pub mod region_network_firewall_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -89887,7 +89989,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::AddAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -89922,7 +90024,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -89932,7 +90034,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .add_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_association`.
@@ -89945,7 +90047,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -90051,8 +90153,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90062,7 +90164,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::AddRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90097,7 +90199,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90107,7 +90209,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .add_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_rule`.
@@ -90120,7 +90222,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -90241,8 +90343,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90252,7 +90354,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::CloneRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90287,7 +90389,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90297,7 +90399,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .clone_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `clone_rules`.
@@ -90310,7 +90412,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -90395,8 +90497,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CloneRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CloneRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90406,7 +90508,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90441,7 +90543,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90451,7 +90553,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -90464,7 +90566,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -90531,8 +90633,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90542,7 +90644,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90573,7 +90675,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90583,7 +90685,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::region_network_firewall_policies::GetRequest::firewall_policy].
@@ -90606,8 +90708,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90617,7 +90719,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::GetAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90652,7 +90754,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90662,7 +90764,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .get_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::region_network_firewall_policies::GetAssociationRequest::firewall_policy].
@@ -90703,8 +90805,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90714,7 +90816,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::GetEffectiveFirewalls;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90751,7 +90853,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90764,7 +90866,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .get_effective_firewalls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [network][crate::model::region_network_firewall_policies::GetEffectiveFirewallsRequest::network].
@@ -90787,8 +90889,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEffectiveFirewalls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEffectiveFirewalls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90798,7 +90900,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90833,7 +90935,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90843,7 +90945,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::region_network_firewall_policies::GetIamPolicyRequest::options_requested_policy_version].
@@ -90887,8 +90989,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90898,7 +91000,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -90933,7 +91035,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -90943,7 +91045,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [firewall_policy][crate::model::region_network_firewall_policies::GetRuleRequest::firewall_policy].
@@ -90984,8 +91086,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -90995,7 +91097,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -91030,7 +91132,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -91040,7 +91142,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -91053,7 +91155,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -91132,8 +91234,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -91143,8 +91245,8 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -91180,7 +91282,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -91190,13 +91292,13 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::FirewallPolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::FirewallPolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -91205,15 +91307,17 @@ pub mod region_network_firewall_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::FirewallPolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::FirewallPolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -91321,8 +91425,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -91332,7 +91436,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -91365,7 +91469,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -91375,7 +91479,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -91388,7 +91492,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -91473,8 +91577,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -91484,7 +91588,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::PatchRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -91519,7 +91623,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -91529,7 +91633,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .patch_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_rule`.
@@ -91542,7 +91646,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -91645,8 +91749,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -91656,7 +91760,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::RemoveAssociation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -91691,7 +91795,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -91701,7 +91805,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .remove_association(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_association`.
@@ -91714,7 +91818,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -91799,8 +91903,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveAssociation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveAssociation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -91810,7 +91914,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::RemoveRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -91845,7 +91949,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -91855,7 +91959,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .remove_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_rule`.
@@ -91868,7 +91972,7 @@ pub mod region_network_firewall_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -91953,8 +92057,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -91964,7 +92068,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -91999,7 +92103,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92009,7 +92113,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_network_firewall_policies::SetIamPolicyRequest::project].
@@ -92050,8 +92154,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92061,7 +92165,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92096,7 +92200,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92106,7 +92210,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_network_firewall_policies::TestIamPermissionsRequest::project].
@@ -92147,8 +92251,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92158,7 +92262,7 @@ pub mod region_network_firewall_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_network_firewall_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92189,7 +92293,7 @@ pub mod region_network_firewall_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92199,7 +92303,7 @@ pub mod region_network_firewall_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -92222,8 +92326,8 @@ pub mod region_network_firewall_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92237,7 +92341,7 @@ pub mod region_notification_endpoints {
     /// A builder for [RegionNotificationEndpoints][crate::client::RegionNotificationEndpoints].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_notification_endpoints::ClientBuilder;
     /// # use client::RegionNotificationEndpoints;
@@ -92247,19 +92351,18 @@ pub mod region_notification_endpoints {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionNotificationEndpoints;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionNotificationEndpoints;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -92270,7 +92373,7 @@ pub mod region_notification_endpoints {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionNotificationEndpoints>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -92283,7 +92386,7 @@ pub mod region_notification_endpoints {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -92293,7 +92396,7 @@ pub mod region_notification_endpoints {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_notification_endpoints::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92324,7 +92427,7 @@ pub mod region_notification_endpoints {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92334,7 +92437,7 @@ pub mod region_notification_endpoints {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -92347,7 +92450,7 @@ pub mod region_notification_endpoints {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -92414,8 +92517,8 @@ pub mod region_notification_endpoints {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92425,7 +92528,7 @@ pub mod region_notification_endpoints {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_notification_endpoints::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92456,7 +92559,7 @@ pub mod region_notification_endpoints {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92466,7 +92569,7 @@ pub mod region_notification_endpoints {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [notification_endpoint][crate::model::region_notification_endpoints::GetRequest::notification_endpoint].
@@ -92489,8 +92592,8 @@ pub mod region_notification_endpoints {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92500,7 +92603,7 @@ pub mod region_notification_endpoints {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_notification_endpoints::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92531,7 +92634,7 @@ pub mod region_notification_endpoints {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92541,7 +92644,7 @@ pub mod region_notification_endpoints {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -92554,7 +92657,7 @@ pub mod region_notification_endpoints {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -92633,8 +92736,8 @@ pub mod region_notification_endpoints {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92644,8 +92747,8 @@ pub mod region_notification_endpoints {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_notification_endpoints::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -92679,7 +92782,7 @@ pub mod region_notification_endpoints {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92689,14 +92792,16 @@ pub mod region_notification_endpoints {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::NotificationEndpointList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::NotificationEndpointList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -92704,15 +92809,17 @@ pub mod region_notification_endpoints {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::NotificationEndpointList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::NotificationEndpointList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -92820,8 +92927,8 @@ pub mod region_notification_endpoints {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92831,7 +92938,7 @@ pub mod region_notification_endpoints {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_notification_endpoints::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92866,7 +92973,7 @@ pub mod region_notification_endpoints {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92876,7 +92983,7 @@ pub mod region_notification_endpoints {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_notification_endpoints::TestIamPermissionsRequest::project].
@@ -92917,8 +93024,8 @@ pub mod region_notification_endpoints {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -92928,7 +93035,7 @@ pub mod region_notification_endpoints {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_notification_endpoints::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -92959,7 +93066,7 @@ pub mod region_notification_endpoints {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -92969,7 +93076,7 @@ pub mod region_notification_endpoints {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -92992,8 +93099,8 @@ pub mod region_notification_endpoints {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93007,7 +93114,7 @@ pub mod region_operations {
     /// A builder for [RegionOperations][crate::client::RegionOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_operations::ClientBuilder;
     /// # use client::RegionOperations;
@@ -93017,19 +93124,18 @@ pub mod region_operations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionOperations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionOperations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -93040,7 +93146,7 @@ pub mod region_operations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionOperations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -93053,7 +93159,7 @@ pub mod region_operations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -93063,7 +93169,7 @@ pub mod region_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_operations::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93094,7 +93200,7 @@ pub mod region_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93104,7 +93210,7 @@ pub mod region_operations {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::DeleteRequest::operation].
@@ -93127,8 +93233,8 @@ pub mod region_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93138,7 +93244,7 @@ pub mod region_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_operations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93169,7 +93275,7 @@ pub mod region_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93179,7 +93285,7 @@ pub mod region_operations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -93202,8 +93308,8 @@ pub mod region_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93213,8 +93319,8 @@ pub mod region_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_operations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -93248,7 +93354,7 @@ pub mod region_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93258,13 +93364,13 @@ pub mod region_operations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::OperationList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -93273,15 +93379,15 @@ pub mod region_operations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::OperationList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -93389,8 +93495,8 @@ pub mod region_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93400,7 +93506,7 @@ pub mod region_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_operations::Wait;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93431,7 +93537,7 @@ pub mod region_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93441,7 +93547,7 @@ pub mod region_operations {
             (*self.0.stub)
                 .wait(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::WaitRequest::operation].
@@ -93464,8 +93570,8 @@ pub mod region_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Wait {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Wait {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93479,7 +93585,7 @@ pub mod region_security_policies {
     /// A builder for [RegionSecurityPolicies][crate::client::RegionSecurityPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_security_policies::ClientBuilder;
     /// # use client::RegionSecurityPolicies;
@@ -93489,19 +93595,18 @@ pub mod region_security_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionSecurityPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionSecurityPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -93512,7 +93617,7 @@ pub mod region_security_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionSecurityPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -93525,7 +93630,7 @@ pub mod region_security_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -93535,7 +93640,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::AddRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93566,7 +93671,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93576,7 +93681,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .add_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_rule`.
@@ -93589,7 +93694,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -93674,8 +93779,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93685,7 +93790,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93716,7 +93821,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93726,7 +93831,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -93739,7 +93844,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -93806,8 +93911,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93817,7 +93922,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93848,7 +93953,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93858,7 +93963,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_security_policies::GetRequest::project].
@@ -93881,8 +93986,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93892,7 +93997,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -93923,7 +94028,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -93933,7 +94038,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [priority][crate::model::region_security_policies::GetRuleRequest::priority].
@@ -93974,8 +94079,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -93985,7 +94090,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -94016,7 +94121,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -94026,7 +94131,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -94039,7 +94144,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -94136,8 +94241,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -94147,8 +94252,8 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -94182,7 +94287,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -94192,13 +94297,13 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SecurityPolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SecurityPolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -94207,15 +94312,17 @@ pub mod region_security_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SecurityPolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SecurityPolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -94323,8 +94430,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -94334,7 +94441,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -94365,7 +94472,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -94375,7 +94482,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -94388,7 +94495,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -94491,8 +94598,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -94502,7 +94609,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::PatchRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -94533,7 +94640,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -94543,7 +94650,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .patch_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_rule`.
@@ -94556,7 +94663,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -94677,8 +94784,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -94688,7 +94795,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::RemoveRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -94721,7 +94828,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -94731,7 +94838,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .remove_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_rule`.
@@ -94744,7 +94851,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -94811,8 +94918,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -94822,7 +94929,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -94853,7 +94960,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -94863,7 +94970,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -94876,7 +94983,7 @@ pub mod region_security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -94961,8 +95068,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -94972,7 +95079,7 @@ pub mod region_security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_security_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95003,7 +95110,7 @@ pub mod region_security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95013,7 +95120,7 @@ pub mod region_security_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -95036,8 +95143,8 @@ pub mod region_security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95051,7 +95158,7 @@ pub mod region_ssl_certificates {
     /// A builder for [RegionSslCertificates][crate::client::RegionSslCertificates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_ssl_certificates::ClientBuilder;
     /// # use client::RegionSslCertificates;
@@ -95061,19 +95168,18 @@ pub mod region_ssl_certificates {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionSslCertificates;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionSslCertificates;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -95084,7 +95190,7 @@ pub mod region_ssl_certificates {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionSslCertificates>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -95097,7 +95203,7 @@ pub mod region_ssl_certificates {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -95107,7 +95213,7 @@ pub mod region_ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_certificates::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95138,7 +95244,7 @@ pub mod region_ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95148,7 +95254,7 @@ pub mod region_ssl_certificates {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -95161,7 +95267,7 @@ pub mod region_ssl_certificates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -95228,8 +95334,8 @@ pub mod region_ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95239,7 +95345,7 @@ pub mod region_ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_certificates::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95270,7 +95376,7 @@ pub mod region_ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95280,7 +95386,7 @@ pub mod region_ssl_certificates {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_ssl_certificates::GetRequest::project].
@@ -95303,8 +95409,8 @@ pub mod region_ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95314,7 +95420,7 @@ pub mod region_ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_certificates::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95345,7 +95451,7 @@ pub mod region_ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95355,7 +95461,7 @@ pub mod region_ssl_certificates {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -95368,7 +95474,7 @@ pub mod region_ssl_certificates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -95447,8 +95553,8 @@ pub mod region_ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95458,8 +95564,8 @@ pub mod region_ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_certificates::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -95493,7 +95599,7 @@ pub mod region_ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95503,13 +95609,13 @@ pub mod region_ssl_certificates {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SslCertificateList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SslCertificateList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -95518,15 +95624,17 @@ pub mod region_ssl_certificates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SslCertificateList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SslCertificateList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -95634,8 +95742,8 @@ pub mod region_ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95645,7 +95753,7 @@ pub mod region_ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_certificates::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95676,7 +95784,7 @@ pub mod region_ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95686,7 +95794,7 @@ pub mod region_ssl_certificates {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -95709,8 +95817,8 @@ pub mod region_ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95724,7 +95832,7 @@ pub mod region_ssl_policies {
     /// A builder for [RegionSslPolicies][crate::client::RegionSslPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_ssl_policies::ClientBuilder;
     /// # use client::RegionSslPolicies;
@@ -95734,19 +95842,18 @@ pub mod region_ssl_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionSslPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionSslPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -95757,7 +95864,7 @@ pub mod region_ssl_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionSslPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -95770,7 +95877,7 @@ pub mod region_ssl_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -95780,7 +95887,7 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95811,7 +95918,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95821,7 +95928,7 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -95834,7 +95941,7 @@ pub mod region_ssl_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -95901,8 +96008,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95912,7 +96019,7 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -95943,7 +96050,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -95953,7 +96060,7 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_ssl_policies::GetRequest::project].
@@ -95976,8 +96083,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -95987,7 +96094,7 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -96018,7 +96125,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96028,7 +96135,7 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -96041,7 +96148,7 @@ pub mod region_ssl_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -96120,8 +96227,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96131,8 +96238,8 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -96166,7 +96273,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96176,13 +96283,13 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SslPoliciesList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SslPoliciesList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -96191,15 +96298,15 @@ pub mod region_ssl_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SslPoliciesList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::SslPoliciesList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -96307,8 +96414,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96318,7 +96425,7 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::ListAvailableFeatures;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -96353,7 +96460,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96363,7 +96470,7 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .list_available_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [filter][crate::model::region_ssl_policies::ListAvailableFeaturesRequest::filter].
@@ -96470,8 +96577,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAvailableFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAvailableFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96481,7 +96588,7 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -96512,7 +96619,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96522,7 +96629,7 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -96535,7 +96642,7 @@ pub mod region_ssl_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -96620,8 +96727,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96631,7 +96738,7 @@ pub mod region_ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_ssl_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -96662,7 +96769,7 @@ pub mod region_ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96672,7 +96779,7 @@ pub mod region_ssl_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -96695,8 +96802,8 @@ pub mod region_ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96710,7 +96817,7 @@ pub mod region_target_http_proxies {
     /// A builder for [RegionTargetHttpProxies][crate::client::RegionTargetHttpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_target_http_proxies::ClientBuilder;
     /// # use client::RegionTargetHttpProxies;
@@ -96720,19 +96827,18 @@ pub mod region_target_http_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionTargetHttpProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionTargetHttpProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -96743,7 +96849,7 @@ pub mod region_target_http_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionTargetHttpProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -96756,7 +96862,7 @@ pub mod region_target_http_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -96766,7 +96872,7 @@ pub mod region_target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_http_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -96797,7 +96903,7 @@ pub mod region_target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96807,7 +96913,7 @@ pub mod region_target_http_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -96820,7 +96926,7 @@ pub mod region_target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -96887,8 +96993,8 @@ pub mod region_target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96898,7 +97004,7 @@ pub mod region_target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_http_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -96929,7 +97035,7 @@ pub mod region_target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -96939,7 +97045,7 @@ pub mod region_target_http_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_target_http_proxies::GetRequest::project].
@@ -96962,8 +97068,8 @@ pub mod region_target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -96973,7 +97079,7 @@ pub mod region_target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_http_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -97004,7 +97110,7 @@ pub mod region_target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97014,7 +97120,7 @@ pub mod region_target_http_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -97027,7 +97133,7 @@ pub mod region_target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -97106,8 +97212,8 @@ pub mod region_target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97117,8 +97223,8 @@ pub mod region_target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_http_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -97152,7 +97258,7 @@ pub mod region_target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97162,13 +97268,13 @@ pub mod region_target_http_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetHttpProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetHttpProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -97177,15 +97283,17 @@ pub mod region_target_http_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetHttpProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetHttpProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -97293,8 +97401,8 @@ pub mod region_target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97304,7 +97412,7 @@ pub mod region_target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_http_proxies::SetUrlMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -97337,7 +97445,7 @@ pub mod region_target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97347,7 +97455,7 @@ pub mod region_target_http_proxies {
             (*self.0.stub)
                 .set_url_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_url_map`.
@@ -97360,7 +97468,7 @@ pub mod region_target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -97445,8 +97553,8 @@ pub mod region_target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetUrlMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetUrlMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97456,7 +97564,7 @@ pub mod region_target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_http_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -97487,7 +97595,7 @@ pub mod region_target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97497,7 +97605,7 @@ pub mod region_target_http_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -97520,8 +97628,8 @@ pub mod region_target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97535,7 +97643,7 @@ pub mod region_target_https_proxies {
     /// A builder for [RegionTargetHttpsProxies][crate::client::RegionTargetHttpsProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_target_https_proxies::ClientBuilder;
     /// # use client::RegionTargetHttpsProxies;
@@ -97545,19 +97653,18 @@ pub mod region_target_https_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionTargetHttpsProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionTargetHttpsProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -97568,7 +97675,7 @@ pub mod region_target_https_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionTargetHttpsProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -97581,7 +97688,7 @@ pub mod region_target_https_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -97591,7 +97698,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -97622,7 +97729,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97632,7 +97739,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -97645,7 +97752,7 @@ pub mod region_target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -97712,8 +97819,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97723,7 +97830,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -97754,7 +97861,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97764,7 +97871,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_target_https_proxies::GetRequest::project].
@@ -97787,8 +97894,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97798,7 +97905,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -97829,7 +97936,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97839,7 +97946,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -97852,7 +97959,7 @@ pub mod region_target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -97931,8 +98038,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -97942,8 +98049,8 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -97977,7 +98084,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -97987,13 +98094,13 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetHttpsProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetHttpsProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -98002,15 +98109,17 @@ pub mod region_target_https_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetHttpsProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetHttpsProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -98118,8 +98227,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98129,7 +98238,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98160,7 +98269,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98170,7 +98279,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -98183,7 +98292,7 @@ pub mod region_target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -98268,8 +98377,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98279,7 +98388,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::SetSslCertificates;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98314,7 +98423,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98324,7 +98433,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .set_ssl_certificates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_ssl_certificates`.
@@ -98337,7 +98446,7 @@ pub mod region_target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -98422,8 +98531,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSslCertificates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSslCertificates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98433,7 +98542,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::SetUrlMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98468,7 +98577,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98478,7 +98587,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .set_url_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_url_map`.
@@ -98491,7 +98600,7 @@ pub mod region_target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -98576,8 +98685,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetUrlMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetUrlMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98587,7 +98696,7 @@ pub mod region_target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_https_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98618,7 +98727,7 @@ pub mod region_target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98628,7 +98737,7 @@ pub mod region_target_https_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -98651,8 +98760,8 @@ pub mod region_target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98666,7 +98775,7 @@ pub mod region_target_tcp_proxies {
     /// A builder for [RegionTargetTcpProxies][crate::client::RegionTargetTcpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_target_tcp_proxies::ClientBuilder;
     /// # use client::RegionTargetTcpProxies;
@@ -98676,19 +98785,18 @@ pub mod region_target_tcp_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionTargetTcpProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionTargetTcpProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -98699,7 +98807,7 @@ pub mod region_target_tcp_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionTargetTcpProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -98712,7 +98820,7 @@ pub mod region_target_tcp_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -98722,7 +98830,7 @@ pub mod region_target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_tcp_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98753,7 +98861,7 @@ pub mod region_target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98763,7 +98871,7 @@ pub mod region_target_tcp_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -98776,7 +98884,7 @@ pub mod region_target_tcp_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -98843,8 +98951,8 @@ pub mod region_target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98854,7 +98962,7 @@ pub mod region_target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_tcp_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98885,7 +98993,7 @@ pub mod region_target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98895,7 +99003,7 @@ pub mod region_target_tcp_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_target_tcp_proxies::GetRequest::project].
@@ -98918,8 +99026,8 @@ pub mod region_target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -98929,7 +99037,7 @@ pub mod region_target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_tcp_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -98960,7 +99068,7 @@ pub mod region_target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -98970,7 +99078,7 @@ pub mod region_target_tcp_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -98983,7 +99091,7 @@ pub mod region_target_tcp_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -99062,8 +99170,8 @@ pub mod region_target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99073,8 +99181,8 @@ pub mod region_target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_tcp_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -99108,7 +99216,7 @@ pub mod region_target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99118,13 +99226,13 @@ pub mod region_target_tcp_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetTcpProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetTcpProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -99133,15 +99241,17 @@ pub mod region_target_tcp_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetTcpProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetTcpProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -99249,8 +99359,8 @@ pub mod region_target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99260,7 +99370,7 @@ pub mod region_target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_target_tcp_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -99291,7 +99401,7 @@ pub mod region_target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99301,7 +99411,7 @@ pub mod region_target_tcp_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -99324,8 +99434,8 @@ pub mod region_target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99339,7 +99449,7 @@ pub mod region_url_maps {
     /// A builder for [RegionUrlMaps][crate::client::RegionUrlMaps].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_url_maps::ClientBuilder;
     /// # use client::RegionUrlMaps;
@@ -99349,19 +99459,18 @@ pub mod region_url_maps {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionUrlMaps;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionUrlMaps;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -99372,7 +99481,7 @@ pub mod region_url_maps {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionUrlMaps>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -99385,7 +99494,7 @@ pub mod region_url_maps {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -99395,7 +99504,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -99426,7 +99535,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99436,7 +99545,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -99449,7 +99558,7 @@ pub mod region_url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -99516,8 +99625,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99527,7 +99636,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -99558,7 +99667,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99568,7 +99677,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_url_maps::GetRequest::project].
@@ -99591,8 +99700,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99602,7 +99711,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -99633,7 +99742,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99643,7 +99752,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -99656,7 +99765,7 @@ pub mod region_url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -99735,8 +99844,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99746,8 +99855,8 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -99781,7 +99890,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99791,13 +99900,14 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::UrlMapList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::UrlMapList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -99805,15 +99915,15 @@ pub mod region_url_maps {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::UrlMapList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::UrlMapList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -99921,8 +100031,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -99932,7 +100042,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -99963,7 +100073,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -99973,7 +100083,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -99986,7 +100096,7 @@ pub mod region_url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -100071,8 +100181,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100082,7 +100192,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100113,7 +100223,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -100123,7 +100233,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -100136,7 +100246,7 @@ pub mod region_url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -100221,8 +100331,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100232,7 +100342,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::Validate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100263,7 +100373,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -100273,7 +100383,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .validate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::region_url_maps::ValidateRequest::project].
@@ -100314,8 +100424,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Validate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Validate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100325,7 +100435,7 @@ pub mod region_url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_url_maps::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100356,7 +100466,7 @@ pub mod region_url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -100366,7 +100476,7 @@ pub mod region_url_maps {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -100389,8 +100499,8 @@ pub mod region_url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100404,7 +100514,7 @@ pub mod region_zones {
     /// A builder for [RegionZones][crate::client::RegionZones].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::region_zones::ClientBuilder;
     /// # use client::RegionZones;
@@ -100414,19 +100524,18 @@ pub mod region_zones {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RegionZones;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RegionZones;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -100437,7 +100546,7 @@ pub mod region_zones {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RegionZones>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -100450,7 +100559,7 @@ pub mod region_zones {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -100460,8 +100569,8 @@ pub mod region_zones {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::region_zones::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -100495,7 +100604,7 @@ pub mod region_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -100505,13 +100614,14 @@ pub mod region_zones {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ZoneList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ZoneList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -100519,14 +100629,15 @@ pub mod region_zones {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ZoneList, gax::error::Error> {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ZoneList, crate::Error>
+        {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -100634,8 +100745,8 @@ pub mod region_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100649,7 +100760,7 @@ pub mod regions {
     /// A builder for [Regions][crate::client::Regions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::regions::ClientBuilder;
     /// # use client::Regions;
@@ -100659,19 +100770,18 @@ pub mod regions {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Regions;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Regions;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -100682,7 +100792,7 @@ pub mod regions {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Regions>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -100693,7 +100803,7 @@ pub mod regions {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -100703,7 +100813,7 @@ pub mod regions {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::regions::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100729,7 +100839,7 @@ pub mod regions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -100739,7 +100849,7 @@ pub mod regions {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::regions::GetRequest::project].
@@ -100756,8 +100866,8 @@ pub mod regions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100767,8 +100877,8 @@ pub mod regions {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::regions::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -100797,7 +100907,7 @@ pub mod regions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -100807,13 +100917,14 @@ pub mod regions {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RegionList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RegionList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -100821,15 +100932,15 @@ pub mod regions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RegionList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::RegionList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -100931,8 +101042,8 @@ pub mod regions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -100946,7 +101057,7 @@ pub mod reservation_blocks {
     /// A builder for [ReservationBlocks][crate::client::ReservationBlocks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::reservation_blocks::ClientBuilder;
     /// # use client::ReservationBlocks;
@@ -100956,19 +101067,18 @@ pub mod reservation_blocks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReservationBlocks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReservationBlocks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -100979,7 +101089,7 @@ pub mod reservation_blocks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReservationBlocks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -100992,7 +101102,7 @@ pub mod reservation_blocks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -101002,7 +101112,7 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101033,7 +101143,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101043,7 +101153,7 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::reservation_blocks::GetRequest::project].
@@ -101090,8 +101200,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101101,7 +101211,7 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101132,7 +101242,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101142,7 +101252,7 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::reservation_blocks::GetIamPolicyRequest::options_requested_policy_version].
@@ -101192,8 +101302,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101203,8 +101313,8 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -101238,7 +101348,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101248,14 +101358,16 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ReservationBlocksListResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ReservationBlocksListResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -101263,17 +101375,17 @@ pub mod reservation_blocks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ReservationBlocksListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -101387,8 +101499,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101398,7 +101510,7 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::PerformMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101433,7 +101545,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101443,7 +101555,7 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .perform_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `perform_maintenance`.
@@ -101456,7 +101568,7 @@ pub mod reservation_blocks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -101547,8 +101659,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PerformMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PerformMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101558,7 +101670,7 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101589,7 +101701,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101599,7 +101711,7 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent_resource][crate::model::reservation_blocks::SetIamPolicyRequest::parent_resource].
@@ -101646,8 +101758,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101657,7 +101769,7 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101692,7 +101804,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101702,7 +101814,7 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent_resource][crate::model::reservation_blocks::TestIamPermissionsRequest::parent_resource].
@@ -101749,8 +101861,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101760,7 +101872,7 @@ pub mod reservation_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_blocks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101791,7 +101903,7 @@ pub mod reservation_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101801,7 +101913,7 @@ pub mod reservation_blocks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -101824,8 +101936,8 @@ pub mod reservation_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101839,7 +101951,7 @@ pub mod reservation_slots {
     /// A builder for [ReservationSlots][crate::client::ReservationSlots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::reservation_slots::ClientBuilder;
     /// # use client::ReservationSlots;
@@ -101849,19 +101961,18 @@ pub mod reservation_slots {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReservationSlots;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReservationSlots;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -101872,7 +101983,7 @@ pub mod reservation_slots {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReservationSlots>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -101885,7 +101996,7 @@ pub mod reservation_slots {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -101895,7 +102006,7 @@ pub mod reservation_slots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_slots::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -101926,7 +102037,7 @@ pub mod reservation_slots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -101936,7 +102047,7 @@ pub mod reservation_slots {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent_name][crate::model::reservation_slots::GetRequest::parent_name].
@@ -101965,8 +102076,8 @@ pub mod reservation_slots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -101976,8 +102087,8 @@ pub mod reservation_slots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_slots::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -102011,7 +102122,7 @@ pub mod reservation_slots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102021,14 +102132,16 @@ pub mod reservation_slots {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ReservationSlotsListResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ReservationSlotsListResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -102036,17 +102149,17 @@ pub mod reservation_slots {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ReservationSlotsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -102160,8 +102273,8 @@ pub mod reservation_slots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -102171,7 +102284,7 @@ pub mod reservation_slots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_slots::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -102202,7 +102315,7 @@ pub mod reservation_slots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102212,7 +102325,7 @@ pub mod reservation_slots {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -102225,7 +102338,7 @@ pub mod reservation_slots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -102316,8 +102429,8 @@ pub mod reservation_slots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -102327,7 +102440,7 @@ pub mod reservation_slots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_slots::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -102358,7 +102471,7 @@ pub mod reservation_slots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102368,7 +102481,7 @@ pub mod reservation_slots {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -102391,8 +102504,8 @@ pub mod reservation_slots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -102406,7 +102519,7 @@ pub mod reservation_sub_blocks {
     /// A builder for [ReservationSubBlocks][crate::client::ReservationSubBlocks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::reservation_sub_blocks::ClientBuilder;
     /// # use client::ReservationSubBlocks;
@@ -102416,19 +102529,18 @@ pub mod reservation_sub_blocks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ReservationSubBlocks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ReservationSubBlocks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -102439,7 +102551,7 @@ pub mod reservation_sub_blocks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ReservationSubBlocks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -102452,7 +102564,7 @@ pub mod reservation_sub_blocks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -102462,7 +102574,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -102493,7 +102605,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102503,7 +102615,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent_name][crate::model::reservation_sub_blocks::GetRequest::parent_name].
@@ -102550,8 +102662,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -102561,7 +102673,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -102594,7 +102706,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102604,7 +102716,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::reservation_sub_blocks::GetIamPolicyRequest::options_requested_policy_version].
@@ -102654,8 +102766,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -102665,8 +102777,8 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -102700,7 +102812,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102710,15 +102822,15 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ReservationSubBlocksListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -102727,17 +102839,17 @@ pub mod reservation_sub_blocks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ReservationSubBlocksListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -102851,8 +102963,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -102862,7 +102974,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::PerformMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -102897,7 +103009,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -102907,7 +103019,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .perform_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `perform_maintenance`.
@@ -102920,7 +103032,7 @@ pub mod reservation_sub_blocks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -102993,8 +103105,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PerformMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PerformMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103004,7 +103116,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::ReportFaulty;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103037,7 +103149,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103047,7 +103159,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .report_faulty(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `report_faulty`.
@@ -103060,7 +103172,7 @@ pub mod reservation_sub_blocks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -103151,8 +103263,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReportFaulty {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReportFaulty {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103162,7 +103274,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103195,7 +103307,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103205,7 +103317,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent_resource][crate::model::reservation_sub_blocks::SetIamPolicyRequest::parent_resource].
@@ -103252,8 +103364,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103263,7 +103375,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103298,7 +103410,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103308,7 +103420,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent_resource][crate::model::reservation_sub_blocks::TestIamPermissionsRequest::parent_resource].
@@ -103355,8 +103467,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103366,7 +103478,7 @@ pub mod reservation_sub_blocks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservation_sub_blocks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103397,7 +103509,7 @@ pub mod reservation_sub_blocks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103407,7 +103519,7 @@ pub mod reservation_sub_blocks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -103430,8 +103542,8 @@ pub mod reservation_sub_blocks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103445,7 +103557,7 @@ pub mod reservations {
     /// A builder for [Reservations][crate::client::Reservations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::reservations::ClientBuilder;
     /// # use client::Reservations;
@@ -103455,19 +103567,18 @@ pub mod reservations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Reservations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Reservations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -103478,7 +103589,7 @@ pub mod reservations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Reservations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -103491,7 +103602,7 @@ pub mod reservations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -103501,8 +103612,8 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -103536,7 +103647,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103546,14 +103657,16 @@ pub mod reservations {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ReservationAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ReservationAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -103561,15 +103674,17 @@ pub mod reservations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ReservationAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ReservationAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -103707,8 +103822,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103718,7 +103833,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103749,7 +103864,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103759,7 +103874,7 @@ pub mod reservations {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -103772,7 +103887,7 @@ pub mod reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -103839,8 +103954,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103850,7 +103965,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103881,7 +103996,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103891,7 +104006,7 @@ pub mod reservations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::reservations::GetRequest::project].
@@ -103914,8 +104029,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -103925,7 +104040,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -103956,7 +104071,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -103966,7 +104081,7 @@ pub mod reservations {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::reservations::GetIamPolicyRequest::options_requested_policy_version].
@@ -104010,8 +104125,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104021,7 +104136,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104052,7 +104167,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104062,7 +104177,7 @@ pub mod reservations {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -104075,7 +104190,7 @@ pub mod reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -104154,8 +104269,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104165,8 +104280,8 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -104200,7 +104315,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104210,13 +104325,13 @@ pub mod reservations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ReservationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ReservationList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -104225,15 +104340,15 @@ pub mod reservations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ReservationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ReservationList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -104341,8 +104456,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104352,7 +104467,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::PerformMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104385,7 +104500,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104395,7 +104510,7 @@ pub mod reservations {
             (*self.0.stub)
                 .perform_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `perform_maintenance`.
@@ -104408,7 +104523,7 @@ pub mod reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -104493,8 +104608,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PerformMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PerformMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104504,7 +104619,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::Resize;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104535,7 +104650,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104545,7 +104660,7 @@ pub mod reservations {
             (*self.0.stub)
                 .resize(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize`.
@@ -104558,7 +104673,7 @@ pub mod reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -104643,8 +104758,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Resize {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Resize {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104654,7 +104769,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104685,7 +104800,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104695,7 +104810,7 @@ pub mod reservations {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::reservations::SetIamPolicyRequest::project].
@@ -104736,8 +104851,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104747,7 +104862,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104780,7 +104895,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104790,7 +104905,7 @@ pub mod reservations {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::reservations::TestIamPermissionsRequest::project].
@@ -104831,8 +104946,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -104842,7 +104957,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104873,7 +104988,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -104883,7 +104998,7 @@ pub mod reservations {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -104896,7 +105011,7 @@ pub mod reservations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -105017,8 +105132,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105028,7 +105143,7 @@ pub mod reservations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::reservations::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105059,7 +105174,7 @@ pub mod reservations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105069,7 +105184,7 @@ pub mod reservations {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -105092,8 +105207,8 @@ pub mod reservations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105107,7 +105222,7 @@ pub mod resource_policies {
     /// A builder for [ResourcePolicies][crate::client::ResourcePolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::resource_policies::ClientBuilder;
     /// # use client::ResourcePolicies;
@@ -105117,19 +105232,18 @@ pub mod resource_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ResourcePolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ResourcePolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -105140,7 +105254,7 @@ pub mod resource_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ResourcePolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -105153,7 +105267,7 @@ pub mod resource_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -105163,8 +105277,8 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -105200,7 +105314,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105210,14 +105324,16 @@ pub mod resource_policies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ResourcePolicyAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ResourcePolicyAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -105225,17 +105341,17 @@ pub mod resource_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ResourcePolicyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -105373,8 +105489,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105384,7 +105500,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105415,7 +105531,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105425,7 +105541,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -105438,7 +105554,7 @@ pub mod resource_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -105505,8 +105621,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105516,7 +105632,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105547,7 +105663,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105557,7 +105673,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::resource_policies::GetRequest::project].
@@ -105580,8 +105696,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105591,7 +105707,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105622,7 +105738,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105632,7 +105748,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::resource_policies::GetIamPolicyRequest::options_requested_policy_version].
@@ -105676,8 +105792,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105687,7 +105803,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105718,7 +105834,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105728,7 +105844,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -105741,7 +105857,7 @@ pub mod resource_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -105820,8 +105936,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -105831,8 +105947,8 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -105866,7 +105982,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -105876,13 +105992,13 @@ pub mod resource_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ResourcePolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ResourcePolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -105891,15 +106007,17 @@ pub mod resource_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ResourcePolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ResourcePolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -106007,8 +106125,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106018,7 +106136,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -106049,7 +106167,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106059,7 +106177,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -106072,7 +106190,7 @@ pub mod resource_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -106175,8 +106293,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106186,7 +106304,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -106217,7 +106335,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106227,7 +106345,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::resource_policies::SetIamPolicyRequest::project].
@@ -106268,8 +106386,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106279,7 +106397,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -106312,7 +106430,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106322,7 +106440,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::resource_policies::TestIamPermissionsRequest::project].
@@ -106363,8 +106481,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106374,7 +106492,7 @@ pub mod resource_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::resource_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -106405,7 +106523,7 @@ pub mod resource_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106415,7 +106533,7 @@ pub mod resource_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -106438,8 +106556,8 @@ pub mod resource_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106453,7 +106571,7 @@ pub mod routers {
     /// A builder for [Routers][crate::client::Routers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::routers::ClientBuilder;
     /// # use client::Routers;
@@ -106463,19 +106581,18 @@ pub mod routers {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Routers;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Routers;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -106486,7 +106603,7 @@ pub mod routers {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Routers>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -106497,7 +106614,7 @@ pub mod routers {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -106507,8 +106624,8 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -106540,7 +106657,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106550,13 +106667,13 @@ pub mod routers {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RouterAggregatedList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RouterAggregatedList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -106565,15 +106682,17 @@ pub mod routers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RouterAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::RouterAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -106711,8 +106830,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106722,7 +106841,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -106748,7 +106867,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106758,7 +106877,7 @@ pub mod routers {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -106771,7 +106890,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -106838,8 +106957,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106849,7 +106968,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::DeleteRoutePolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -106878,7 +106997,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -106888,7 +107007,7 @@ pub mod routers {
             (*self.0.stub)
                 .delete_route_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_route_policy`.
@@ -106901,7 +107020,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -106986,8 +107105,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRoutePolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRoutePolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -106997,7 +107116,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107023,7 +107142,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107033,7 +107152,7 @@ pub mod routers {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::routers::GetRequest::project].
@@ -107056,8 +107175,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107067,7 +107186,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::GetNatIpInfo;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107096,7 +107215,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107106,7 +107225,7 @@ pub mod routers {
             (*self.0.stub)
                 .get_nat_ip_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [nat_name][crate::model::routers::GetNatIpInfoRequest::nat_name].
@@ -107147,8 +107266,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNatIpInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNatIpInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107158,8 +107277,8 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::GetNatMappingInfo;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -107191,7 +107310,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107201,14 +107320,16 @@ pub mod routers {
             (*self.0.stub)
                 .get_nat_mapping_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::VmEndpointNatMappingsList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::VmEndpointNatMappingsList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -107216,15 +107337,17 @@ pub mod routers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::VmEndpointNatMappingsList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::VmEndpointNatMappingsList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -107356,8 +107479,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNatMappingInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNatMappingInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107367,7 +107490,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::GetRoutePolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107396,7 +107519,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107406,7 +107529,7 @@ pub mod routers {
             (*self.0.stub)
                 .get_route_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [policy][crate::model::routers::GetRoutePolicyRequest::policy].
@@ -107447,8 +107570,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRoutePolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRoutePolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107458,7 +107581,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::GetRouterStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107487,7 +107610,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107497,7 +107620,7 @@ pub mod routers {
             (*self.0.stub)
                 .get_router_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::routers::GetRouterStatusRequest::project].
@@ -107520,8 +107643,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRouterStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRouterStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107531,7 +107654,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107557,7 +107680,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107567,7 +107690,7 @@ pub mod routers {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -107580,7 +107703,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -107659,8 +107782,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107670,8 +107793,8 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -107700,7 +107823,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107710,13 +107833,14 @@ pub mod routers {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RouterList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RouterList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -107724,15 +107848,15 @@ pub mod routers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RouterList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::RouterList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -107840,8 +107964,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -107851,8 +107975,8 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::ListBgpRoutes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -107884,7 +108008,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -107894,13 +108018,13 @@ pub mod routers {
             (*self.0.stub)
                 .list_bgp_routes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RoutersListBgpRoutes, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RoutersListBgpRoutes, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -107909,15 +108033,17 @@ pub mod routers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RoutersListBgpRoutes, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::RoutersListBgpRoutes,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -108121,8 +108247,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBgpRoutes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBgpRoutes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -108132,8 +108258,8 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::ListRoutePolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108165,7 +108291,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -108175,14 +108301,16 @@ pub mod routers {
             (*self.0.stub)
                 .list_route_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RoutersListRoutePolicies, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::RoutersListRoutePolicies,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -108190,15 +108318,17 @@ pub mod routers {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RoutersListRoutePolicies, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::RoutersListRoutePolicies,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -108312,8 +108442,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRoutePolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRoutePolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -108323,7 +108453,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -108349,7 +108479,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -108359,7 +108489,7 @@ pub mod routers {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -108372,7 +108502,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -108457,8 +108587,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -108468,7 +108598,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::PatchRoutePolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -108497,7 +108627,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -108507,7 +108637,7 @@ pub mod routers {
             (*self.0.stub)
                 .patch_route_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_route_policy`.
@@ -108520,7 +108650,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -108605,8 +108735,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRoutePolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRoutePolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -108616,7 +108746,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::Preview;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -108645,7 +108775,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -108655,7 +108785,7 @@ pub mod routers {
             (*self.0.stub)
                 .preview(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::routers::PreviewRequest::project].
@@ -108696,8 +108826,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Preview {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Preview {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -108707,7 +108837,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -108733,7 +108863,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -108743,7 +108873,7 @@ pub mod routers {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -108756,7 +108886,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -108841,8 +108971,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -108852,7 +108982,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::UpdateRoutePolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -108881,7 +109011,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -108891,7 +109021,7 @@ pub mod routers {
             (*self.0.stub)
                 .update_route_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_route_policy`.
@@ -108904,7 +109034,7 @@ pub mod routers {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -108989,8 +109119,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRoutePolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRoutePolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109000,7 +109130,7 @@ pub mod routers {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routers::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109029,7 +109159,7 @@ pub mod routers {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109039,7 +109169,7 @@ pub mod routers {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -109062,8 +109192,8 @@ pub mod routers {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109077,7 +109207,7 @@ pub mod routes {
     /// A builder for [Routes][crate::client::Routes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::routes::ClientBuilder;
     /// # use client::Routes;
@@ -109087,19 +109217,18 @@ pub mod routes {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Routes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Routes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -109110,7 +109239,7 @@ pub mod routes {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Routes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -109121,7 +109250,7 @@ pub mod routes {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -109131,7 +109260,7 @@ pub mod routes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routes::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109157,7 +109286,7 @@ pub mod routes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109167,7 +109296,7 @@ pub mod routes {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -109180,7 +109309,7 @@ pub mod routes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -109238,8 +109367,8 @@ pub mod routes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109249,7 +109378,7 @@ pub mod routes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routes::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109275,7 +109404,7 @@ pub mod routes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109285,7 +109414,7 @@ pub mod routes {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::routes::GetRequest::project].
@@ -109302,8 +109431,8 @@ pub mod routes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109313,7 +109442,7 @@ pub mod routes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routes::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109339,7 +109468,7 @@ pub mod routes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109349,7 +109478,7 @@ pub mod routes {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -109362,7 +109491,7 @@ pub mod routes {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -109432,8 +109561,8 @@ pub mod routes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109443,8 +109572,8 @@ pub mod routes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routes::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -109473,7 +109602,7 @@ pub mod routes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109483,13 +109612,14 @@ pub mod routes {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::RouteList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::RouteList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -109497,15 +109627,15 @@ pub mod routes {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::RouteList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::RouteList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -109607,8 +109737,8 @@ pub mod routes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109618,7 +109748,7 @@ pub mod routes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routes::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109647,7 +109777,7 @@ pub mod routes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109657,7 +109787,7 @@ pub mod routes {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::routes::TestIamPermissionsRequest::project].
@@ -109692,8 +109822,8 @@ pub mod routes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109703,7 +109833,7 @@ pub mod routes {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::routes::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109732,7 +109862,7 @@ pub mod routes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109742,7 +109872,7 @@ pub mod routes {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -109759,8 +109889,8 @@ pub mod routes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109774,7 +109904,7 @@ pub mod security_policies {
     /// A builder for [SecurityPolicies][crate::client::SecurityPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::security_policies::ClientBuilder;
     /// # use client::SecurityPolicies;
@@ -109784,19 +109914,18 @@ pub mod security_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SecurityPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SecurityPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -109807,7 +109936,7 @@ pub mod security_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SecurityPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -109820,7 +109949,7 @@ pub mod security_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -109830,7 +109959,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::AddRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109861,7 +109990,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -109871,7 +110000,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .add_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_rule`.
@@ -109884,7 +110013,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -109960,8 +110089,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -109971,8 +110100,8 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -110008,7 +110137,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110018,15 +110147,15 @@ pub mod security_policies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::SecurityPoliciesAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -110035,17 +110164,17 @@ pub mod security_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SecurityPoliciesAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -110183,8 +110312,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110194,7 +110323,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -110225,7 +110354,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110235,7 +110364,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -110248,7 +110377,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -110306,8 +110435,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110317,7 +110446,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -110348,7 +110477,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110358,7 +110487,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::security_policies::GetRequest::project].
@@ -110375,8 +110504,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110386,7 +110515,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::GetRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -110417,7 +110546,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110427,7 +110556,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .get_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [priority][crate::model::security_policies::GetRuleRequest::priority].
@@ -110462,8 +110591,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110473,7 +110602,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -110504,7 +110633,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110514,7 +110643,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -110527,7 +110656,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -110615,8 +110744,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110626,8 +110755,8 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -110661,7 +110790,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110671,13 +110800,13 @@ pub mod security_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SecurityPolicyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SecurityPolicyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -110686,15 +110815,17 @@ pub mod security_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SecurityPolicyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SecurityPolicyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -110796,8 +110927,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110807,7 +110938,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::ListPreconfiguredExpressionSets;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -110842,7 +110973,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110854,7 +110985,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .list_preconfigured_expression_sets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [filter][crate::model::security_policies::ListPreconfiguredExpressionSetsRequest::filter].
@@ -110955,8 +111086,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPreconfiguredExpressionSets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPreconfiguredExpressionSets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -110966,7 +111097,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -110997,7 +111128,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111007,7 +111138,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -111020,7 +111151,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -111114,8 +111245,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -111125,7 +111256,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::PatchRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -111156,7 +111287,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111166,7 +111297,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .patch_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch_rule`.
@@ -111179,7 +111310,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -111291,8 +111422,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PatchRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PatchRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -111302,7 +111433,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::RemoveRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -111333,7 +111464,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111343,7 +111474,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .remove_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_rule`.
@@ -111356,7 +111487,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -111414,8 +111545,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -111425,7 +111556,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -111456,7 +111587,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111466,7 +111597,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -111479,7 +111610,7 @@ pub mod security_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -111537,8 +111668,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -111548,7 +111679,7 @@ pub mod security_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::security_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -111579,7 +111710,7 @@ pub mod security_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111589,7 +111720,7 @@ pub mod security_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -111606,8 +111737,8 @@ pub mod security_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -111621,7 +111752,7 @@ pub mod service_attachments {
     /// A builder for [ServiceAttachments][crate::client::ServiceAttachments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::service_attachments::ClientBuilder;
     /// # use client::ServiceAttachments;
@@ -111631,19 +111762,18 @@ pub mod service_attachments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ServiceAttachments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ServiceAttachments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -111654,7 +111784,7 @@ pub mod service_attachments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ServiceAttachments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -111667,7 +111797,7 @@ pub mod service_attachments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -111677,8 +111807,8 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111714,7 +111844,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111724,15 +111854,15 @@ pub mod service_attachments {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ServiceAttachmentAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -111741,17 +111871,17 @@ pub mod service_attachments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ServiceAttachmentAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -111889,8 +112019,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -111900,7 +112030,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -111931,7 +112061,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -111941,7 +112071,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -111954,7 +112084,7 @@ pub mod service_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -112021,8 +112151,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112032,7 +112162,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112063,7 +112193,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112073,7 +112203,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::service_attachments::GetRequest::project].
@@ -112114,8 +112244,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112125,7 +112255,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112156,7 +112286,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112166,7 +112296,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::service_attachments::GetIamPolicyRequest::options_requested_policy_version].
@@ -112210,8 +112340,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112221,7 +112351,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112252,7 +112382,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112262,7 +112392,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -112275,7 +112405,7 @@ pub mod service_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -112354,8 +112484,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112365,8 +112495,8 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -112400,7 +112530,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112410,13 +112540,13 @@ pub mod service_attachments {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ServiceAttachmentList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ServiceAttachmentList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -112425,15 +112555,17 @@ pub mod service_attachments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ServiceAttachmentList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ServiceAttachmentList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -112541,8 +112673,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112552,7 +112684,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112583,7 +112715,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112593,7 +112725,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -112606,7 +112738,7 @@ pub mod service_attachments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -112691,8 +112823,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112702,7 +112834,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112733,7 +112865,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112743,7 +112875,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::service_attachments::SetIamPolicyRequest::project].
@@ -112784,8 +112916,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112795,7 +112927,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112830,7 +112962,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112840,7 +112972,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::service_attachments::TestIamPermissionsRequest::project].
@@ -112881,8 +113013,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112892,7 +113024,7 @@ pub mod service_attachments {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::service_attachments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -112923,7 +113055,7 @@ pub mod service_attachments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112933,7 +113065,7 @@ pub mod service_attachments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -112956,8 +113088,8 @@ pub mod service_attachments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -112971,7 +113103,7 @@ pub mod snapshot_settings {
     /// A builder for [SnapshotSettings][crate::client::SnapshotSettings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::snapshot_settings::ClientBuilder;
     /// # use client::SnapshotSettings;
@@ -112981,19 +113113,18 @@ pub mod snapshot_settings {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SnapshotSettings;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SnapshotSettings;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -113004,7 +113135,7 @@ pub mod snapshot_settings {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SnapshotSettings>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -113017,7 +113148,7 @@ pub mod snapshot_settings {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -113027,7 +113158,7 @@ pub mod snapshot_settings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshot_settings::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113058,7 +113189,7 @@ pub mod snapshot_settings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113068,7 +113199,7 @@ pub mod snapshot_settings {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::snapshot_settings::GetRequest::project].
@@ -113079,8 +113210,8 @@ pub mod snapshot_settings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113090,7 +113221,7 @@ pub mod snapshot_settings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshot_settings::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113121,7 +113252,7 @@ pub mod snapshot_settings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113131,7 +113262,7 @@ pub mod snapshot_settings {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -113144,7 +113275,7 @@ pub mod snapshot_settings {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -113232,8 +113363,8 @@ pub mod snapshot_settings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113243,7 +113374,7 @@ pub mod snapshot_settings {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshot_settings::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113274,7 +113405,7 @@ pub mod snapshot_settings {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113284,7 +113415,7 @@ pub mod snapshot_settings {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -113301,8 +113432,8 @@ pub mod snapshot_settings {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113316,7 +113447,7 @@ pub mod snapshots {
     /// A builder for [Snapshots][crate::client::Snapshots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::snapshots::ClientBuilder;
     /// # use client::Snapshots;
@@ -113326,19 +113457,18 @@ pub mod snapshots {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Snapshots;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Snapshots;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -113349,7 +113479,7 @@ pub mod snapshots {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Snapshots>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -113362,7 +113492,7 @@ pub mod snapshots {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -113372,7 +113502,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113403,7 +113533,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113413,7 +113543,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -113426,7 +113556,7 @@ pub mod snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -113484,8 +113614,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113495,7 +113625,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113523,7 +113653,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113533,7 +113663,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::snapshots::GetRequest::project].
@@ -113550,8 +113680,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113561,7 +113691,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113592,7 +113722,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113602,7 +113732,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::snapshots::GetIamPolicyRequest::options_requested_policy_version].
@@ -113640,8 +113770,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113651,7 +113781,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113682,7 +113812,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113692,7 +113822,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -113705,7 +113835,7 @@ pub mod snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -113775,8 +113905,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113786,8 +113916,8 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -113818,7 +113948,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -113828,13 +113958,14 @@ pub mod snapshots {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SnapshotList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SnapshotList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -113842,15 +113973,15 @@ pub mod snapshots {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SnapshotList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::SnapshotList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -113952,8 +114083,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -113963,7 +114094,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -113994,7 +114125,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114004,7 +114135,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::snapshots::SetIamPolicyRequest::project].
@@ -114039,8 +114170,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114050,7 +114181,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -114081,7 +114212,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114091,7 +114222,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -114104,7 +114235,7 @@ pub mod snapshots {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -114162,8 +114293,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114173,7 +114304,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -114206,7 +114337,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114216,7 +114347,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::snapshots::TestIamPermissionsRequest::project].
@@ -114251,8 +114382,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114262,7 +114393,7 @@ pub mod snapshots {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::snapshots::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -114293,7 +114424,7 @@ pub mod snapshots {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114303,7 +114434,7 @@ pub mod snapshots {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -114320,8 +114451,8 @@ pub mod snapshots {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114335,7 +114466,7 @@ pub mod ssl_certificates {
     /// A builder for [SslCertificates][crate::client::SslCertificates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::ssl_certificates::ClientBuilder;
     /// # use client::SslCertificates;
@@ -114345,19 +114476,18 @@ pub mod ssl_certificates {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SslCertificates;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SslCertificates;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -114368,7 +114498,7 @@ pub mod ssl_certificates {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SslCertificates>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -114381,7 +114511,7 @@ pub mod ssl_certificates {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -114391,8 +114521,8 @@ pub mod ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_certificates::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -114428,7 +114558,7 @@ pub mod ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114438,14 +114568,16 @@ pub mod ssl_certificates {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SslCertificateAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SslCertificateAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -114453,17 +114585,17 @@ pub mod ssl_certificates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SslCertificateAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -114601,8 +114733,8 @@ pub mod ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114612,7 +114744,7 @@ pub mod ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_certificates::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -114643,7 +114775,7 @@ pub mod ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114653,7 +114785,7 @@ pub mod ssl_certificates {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -114666,7 +114798,7 @@ pub mod ssl_certificates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -114724,8 +114856,8 @@ pub mod ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114735,7 +114867,7 @@ pub mod ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_certificates::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -114766,7 +114898,7 @@ pub mod ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114776,7 +114908,7 @@ pub mod ssl_certificates {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::ssl_certificates::GetRequest::project].
@@ -114793,8 +114925,8 @@ pub mod ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114804,7 +114936,7 @@ pub mod ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_certificates::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -114835,7 +114967,7 @@ pub mod ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114845,7 +114977,7 @@ pub mod ssl_certificates {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -114858,7 +114990,7 @@ pub mod ssl_certificates {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -114928,8 +115060,8 @@ pub mod ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -114939,8 +115071,8 @@ pub mod ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_certificates::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -114974,7 +115106,7 @@ pub mod ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114984,13 +115116,13 @@ pub mod ssl_certificates {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SslCertificateList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SslCertificateList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -114999,15 +115131,17 @@ pub mod ssl_certificates {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SslCertificateList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SslCertificateList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -115109,8 +115243,8 @@ pub mod ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115120,7 +115254,7 @@ pub mod ssl_certificates {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_certificates::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -115151,7 +115285,7 @@ pub mod ssl_certificates {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115161,7 +115295,7 @@ pub mod ssl_certificates {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -115178,8 +115312,8 @@ pub mod ssl_certificates {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115193,7 +115327,7 @@ pub mod ssl_policies {
     /// A builder for [SslPolicies][crate::client::SslPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::ssl_policies::ClientBuilder;
     /// # use client::SslPolicies;
@@ -115203,19 +115337,18 @@ pub mod ssl_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SslPolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SslPolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -115226,7 +115359,7 @@ pub mod ssl_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SslPolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -115239,7 +115372,7 @@ pub mod ssl_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -115249,8 +115382,8 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -115284,7 +115417,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115294,14 +115427,16 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SslPoliciesAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SslPoliciesAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -115309,15 +115444,17 @@ pub mod ssl_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SslPoliciesAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SslPoliciesAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -115455,8 +115592,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115466,7 +115603,7 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -115497,7 +115634,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115507,7 +115644,7 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -115520,7 +115657,7 @@ pub mod ssl_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -115578,8 +115715,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115589,7 +115726,7 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -115620,7 +115757,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115630,7 +115767,7 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::ssl_policies::GetRequest::project].
@@ -115647,8 +115784,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115658,7 +115795,7 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -115689,7 +115826,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115699,7 +115836,7 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -115712,7 +115849,7 @@ pub mod ssl_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -115782,8 +115919,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115793,8 +115930,8 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -115828,7 +115965,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115838,13 +115975,13 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SslPoliciesList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SslPoliciesList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -115853,15 +115990,15 @@ pub mod ssl_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SslPoliciesList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::SslPoliciesList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -115963,8 +116100,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -115974,7 +116111,7 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::ListAvailableFeatures;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -116007,7 +116144,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116017,7 +116154,7 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .list_available_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [filter][crate::model::ssl_policies::ListAvailableFeaturesRequest::filter].
@@ -116118,8 +116255,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAvailableFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAvailableFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -116129,7 +116266,7 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -116160,7 +116297,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116170,7 +116307,7 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -116183,7 +116320,7 @@ pub mod ssl_policies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -116259,8 +116396,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -116270,7 +116407,7 @@ pub mod ssl_policies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::ssl_policies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -116301,7 +116438,7 @@ pub mod ssl_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116311,7 +116448,7 @@ pub mod ssl_policies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -116328,8 +116465,8 @@ pub mod ssl_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -116343,7 +116480,7 @@ pub mod storage_pool_types {
     /// A builder for [StoragePoolTypes][crate::client::StoragePoolTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::storage_pool_types::ClientBuilder;
     /// # use client::StoragePoolTypes;
@@ -116353,19 +116490,18 @@ pub mod storage_pool_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::StoragePoolTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = StoragePoolTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -116376,7 +116512,7 @@ pub mod storage_pool_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::StoragePoolTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -116389,7 +116525,7 @@ pub mod storage_pool_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -116399,8 +116535,8 @@ pub mod storage_pool_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pool_types::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -116436,7 +116572,7 @@ pub mod storage_pool_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116446,14 +116582,16 @@ pub mod storage_pool_types {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::StoragePoolTypeAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::StoragePoolTypeAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -116461,17 +116599,17 @@ pub mod storage_pool_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::StoragePoolTypeAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -116609,8 +116747,8 @@ pub mod storage_pool_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -116620,7 +116758,7 @@ pub mod storage_pool_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pool_types::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -116651,7 +116789,7 @@ pub mod storage_pool_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116661,7 +116799,7 @@ pub mod storage_pool_types {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::storage_pool_types::GetRequest::project].
@@ -116684,8 +116822,8 @@ pub mod storage_pool_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -116695,8 +116833,8 @@ pub mod storage_pool_types {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pool_types::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -116730,7 +116868,7 @@ pub mod storage_pool_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116740,13 +116878,13 @@ pub mod storage_pool_types {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::StoragePoolTypeList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::StoragePoolTypeList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -116755,15 +116893,17 @@ pub mod storage_pool_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::StoragePoolTypeList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::StoragePoolTypeList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -116871,8 +117011,8 @@ pub mod storage_pool_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -116886,7 +117026,7 @@ pub mod storage_pools {
     /// A builder for [StoragePools][crate::client::StoragePools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::storage_pools::ClientBuilder;
     /// # use client::StoragePools;
@@ -116896,19 +117036,18 @@ pub mod storage_pools {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::StoragePools;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = StoragePools;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -116919,7 +117058,7 @@ pub mod storage_pools {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::StoragePools>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -116932,7 +117071,7 @@ pub mod storage_pools {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -116942,8 +117081,8 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -116977,7 +117116,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116987,14 +117126,16 @@ pub mod storage_pools {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::StoragePoolAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::StoragePoolAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -117002,15 +117143,17 @@ pub mod storage_pools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::StoragePoolAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::StoragePoolAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -117148,8 +117291,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117159,7 +117302,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -117190,7 +117333,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117200,7 +117343,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -117213,7 +117356,7 @@ pub mod storage_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -117280,8 +117423,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117291,7 +117434,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -117322,7 +117465,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117332,7 +117475,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::storage_pools::GetRequest::project].
@@ -117355,8 +117498,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117366,7 +117509,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -117397,7 +117540,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117407,7 +117550,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::storage_pools::GetIamPolicyRequest::options_requested_policy_version].
@@ -117451,8 +117594,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117462,7 +117605,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -117493,7 +117636,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117503,7 +117646,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -117516,7 +117659,7 @@ pub mod storage_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -117595,8 +117738,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117606,8 +117749,8 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -117641,7 +117784,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117651,13 +117794,13 @@ pub mod storage_pools {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::StoragePoolList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::StoragePoolList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -117666,15 +117809,15 @@ pub mod storage_pools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::StoragePoolList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::StoragePoolList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -117782,8 +117925,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117793,8 +117936,8 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::ListDisks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -117828,7 +117971,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117838,13 +117981,13 @@ pub mod storage_pools {
             (*self.0.stub)
                 .list_disks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::StoragePoolListDisks, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::StoragePoolListDisks, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -117853,15 +117996,17 @@ pub mod storage_pools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::StoragePoolListDisks, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::StoragePoolListDisks,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -117975,8 +118120,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDisks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDisks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -117986,7 +118131,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -118017,7 +118162,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118027,7 +118172,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::storage_pools::SetIamPolicyRequest::project].
@@ -118068,8 +118213,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118079,7 +118224,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -118112,7 +118257,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118122,7 +118267,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::storage_pools::TestIamPermissionsRequest::project].
@@ -118163,8 +118308,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118174,7 +118319,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -118205,7 +118350,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118215,7 +118360,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -118228,7 +118373,7 @@ pub mod storage_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -118331,8 +118476,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118342,7 +118487,7 @@ pub mod storage_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::storage_pools::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -118373,7 +118518,7 @@ pub mod storage_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118383,7 +118528,7 @@ pub mod storage_pools {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -118406,8 +118551,8 @@ pub mod storage_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118421,7 +118566,7 @@ pub mod subnetworks {
     /// A builder for [Subnetworks][crate::client::Subnetworks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::subnetworks::ClientBuilder;
     /// # use client::Subnetworks;
@@ -118431,19 +118576,18 @@ pub mod subnetworks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Subnetworks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Subnetworks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -118454,7 +118598,7 @@ pub mod subnetworks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Subnetworks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -118467,7 +118611,7 @@ pub mod subnetworks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -118477,8 +118621,8 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -118512,7 +118656,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118522,14 +118666,16 @@ pub mod subnetworks {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SubnetworkAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SubnetworkAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -118537,15 +118683,17 @@ pub mod subnetworks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SubnetworkAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SubnetworkAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -118701,8 +118849,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118712,7 +118860,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -118743,7 +118891,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118753,7 +118901,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -118766,7 +118914,7 @@ pub mod subnetworks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -118833,8 +118981,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118844,7 +118992,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::ExpandIpCidrRange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -118877,7 +119025,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118887,7 +119035,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .expand_ip_cidr_range(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `expand_ip_cidr_range`.
@@ -118900,7 +119048,7 @@ pub mod subnetworks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -118985,8 +119133,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExpandIpCidrRange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExpandIpCidrRange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -118996,7 +119144,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -119027,7 +119175,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119037,7 +119185,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::subnetworks::GetRequest::project].
@@ -119078,8 +119226,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119089,7 +119237,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -119120,7 +119268,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119130,7 +119278,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [options_requested_policy_version][crate::model::subnetworks::GetIamPolicyRequest::options_requested_policy_version].
@@ -119174,8 +119322,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119185,7 +119333,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -119216,7 +119364,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119226,7 +119374,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -119239,7 +119387,7 @@ pub mod subnetworks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -119318,8 +119466,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119329,8 +119477,8 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -119364,7 +119512,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119374,13 +119522,13 @@ pub mod subnetworks {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SubnetworkList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SubnetworkList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -119389,15 +119537,15 @@ pub mod subnetworks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SubnetworkList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::SubnetworkList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -119523,8 +119671,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119534,8 +119682,8 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::ListUsable;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -119569,7 +119717,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119579,15 +119727,15 @@ pub mod subnetworks {
             (*self.0.stub)
                 .list_usable(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::UsableSubnetworksAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -119596,17 +119744,17 @@ pub mod subnetworks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::UsableSubnetworksAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -119726,8 +119874,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListUsable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListUsable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119737,7 +119885,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -119768,7 +119916,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119778,7 +119926,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -119791,7 +119939,7 @@ pub mod subnetworks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -119894,8 +120042,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119905,7 +120053,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -119936,7 +120084,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119946,7 +120094,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::subnetworks::SetIamPolicyRequest::project].
@@ -119987,8 +120135,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -119998,7 +120146,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::SetPrivateIpGoogleAccess;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120031,7 +120179,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120041,7 +120189,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .set_private_ip_google_access(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_private_ip_google_access`.
@@ -120054,7 +120202,7 @@ pub mod subnetworks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -120139,8 +120287,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetPrivateIpGoogleAccess {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetPrivateIpGoogleAccess {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120150,7 +120298,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120183,7 +120331,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120193,7 +120341,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::subnetworks::TestIamPermissionsRequest::project].
@@ -120234,8 +120382,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120245,7 +120393,7 @@ pub mod subnetworks {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::subnetworks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120276,7 +120424,7 @@ pub mod subnetworks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120286,7 +120434,7 @@ pub mod subnetworks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -120309,8 +120457,8 @@ pub mod subnetworks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120324,7 +120472,7 @@ pub mod target_grpc_proxies {
     /// A builder for [TargetGrpcProxies][crate::client::TargetGrpcProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_grpc_proxies::ClientBuilder;
     /// # use client::TargetGrpcProxies;
@@ -120334,19 +120482,18 @@ pub mod target_grpc_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetGrpcProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetGrpcProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -120357,7 +120504,7 @@ pub mod target_grpc_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetGrpcProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -120370,7 +120517,7 @@ pub mod target_grpc_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -120380,7 +120527,7 @@ pub mod target_grpc_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_grpc_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120411,7 +120558,7 @@ pub mod target_grpc_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120421,7 +120568,7 @@ pub mod target_grpc_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -120434,7 +120581,7 @@ pub mod target_grpc_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -120492,8 +120639,8 @@ pub mod target_grpc_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120503,7 +120650,7 @@ pub mod target_grpc_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_grpc_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120534,7 +120681,7 @@ pub mod target_grpc_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120544,7 +120691,7 @@ pub mod target_grpc_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_grpc_proxies::GetRequest::project].
@@ -120561,8 +120708,8 @@ pub mod target_grpc_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120572,7 +120719,7 @@ pub mod target_grpc_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_grpc_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120603,7 +120750,7 @@ pub mod target_grpc_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120613,7 +120760,7 @@ pub mod target_grpc_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -120626,7 +120773,7 @@ pub mod target_grpc_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -120696,8 +120843,8 @@ pub mod target_grpc_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120707,8 +120854,8 @@ pub mod target_grpc_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_grpc_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -120742,7 +120889,7 @@ pub mod target_grpc_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120752,13 +120899,13 @@ pub mod target_grpc_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetGrpcProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetGrpcProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -120767,15 +120914,17 @@ pub mod target_grpc_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetGrpcProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetGrpcProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -120877,8 +121026,8 @@ pub mod target_grpc_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -120888,7 +121037,7 @@ pub mod target_grpc_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_grpc_proxies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -120919,7 +121068,7 @@ pub mod target_grpc_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120929,7 +121078,7 @@ pub mod target_grpc_proxies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -120942,7 +121091,7 @@ pub mod target_grpc_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -121018,8 +121167,8 @@ pub mod target_grpc_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121029,7 +121178,7 @@ pub mod target_grpc_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_grpc_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -121060,7 +121209,7 @@ pub mod target_grpc_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121070,7 +121219,7 @@ pub mod target_grpc_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -121087,8 +121236,8 @@ pub mod target_grpc_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121102,7 +121251,7 @@ pub mod target_http_proxies {
     /// A builder for [TargetHttpProxies][crate::client::TargetHttpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_http_proxies::ClientBuilder;
     /// # use client::TargetHttpProxies;
@@ -121112,19 +121261,18 @@ pub mod target_http_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetHttpProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetHttpProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -121135,7 +121283,7 @@ pub mod target_http_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetHttpProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -121148,7 +121296,7 @@ pub mod target_http_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -121158,8 +121306,8 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -121195,7 +121343,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121205,14 +121353,16 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetHttpProxyAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::TargetHttpProxyAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -121220,17 +121370,17 @@ pub mod target_http_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::TargetHttpProxyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -121368,8 +121518,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121379,7 +121529,7 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -121410,7 +121560,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121420,7 +121570,7 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -121433,7 +121583,7 @@ pub mod target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -121491,8 +121641,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121502,7 +121652,7 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -121533,7 +121683,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121543,7 +121693,7 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_http_proxies::GetRequest::project].
@@ -121560,8 +121710,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121571,7 +121721,7 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -121602,7 +121752,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121612,7 +121762,7 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -121625,7 +121775,7 @@ pub mod target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -121695,8 +121845,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121706,8 +121856,8 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -121741,7 +121891,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121751,13 +121901,13 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetHttpProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetHttpProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -121766,15 +121916,17 @@ pub mod target_http_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetHttpProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetHttpProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -121876,8 +122028,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -121887,7 +122039,7 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -121918,7 +122070,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121928,7 +122080,7 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -121941,7 +122093,7 @@ pub mod target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -122017,8 +122169,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122028,7 +122180,7 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::SetUrlMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -122059,7 +122211,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122069,7 +122221,7 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .set_url_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_url_map`.
@@ -122082,7 +122234,7 @@ pub mod target_http_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -122158,8 +122310,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetUrlMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetUrlMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122169,7 +122321,7 @@ pub mod target_http_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_http_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -122200,7 +122352,7 @@ pub mod target_http_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122210,7 +122362,7 @@ pub mod target_http_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -122227,8 +122379,8 @@ pub mod target_http_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122242,7 +122394,7 @@ pub mod target_https_proxies {
     /// A builder for [TargetHttpsProxies][crate::client::TargetHttpsProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_https_proxies::ClientBuilder;
     /// # use client::TargetHttpsProxies;
@@ -122252,19 +122404,18 @@ pub mod target_https_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetHttpsProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetHttpsProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -122275,7 +122426,7 @@ pub mod target_https_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetHttpsProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -122288,7 +122439,7 @@ pub mod target_https_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -122298,8 +122449,8 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -122335,7 +122486,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122345,15 +122496,15 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::TargetHttpsProxyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -122362,17 +122513,17 @@ pub mod target_https_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::TargetHttpsProxyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -122510,8 +122661,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122521,7 +122672,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -122552,7 +122703,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122562,7 +122713,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -122575,7 +122726,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -122633,8 +122784,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122644,7 +122795,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -122675,7 +122826,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122685,7 +122836,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_https_proxies::GetRequest::project].
@@ -122702,8 +122853,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122713,7 +122864,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -122744,7 +122895,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122754,7 +122905,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -122767,7 +122918,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -122837,8 +122988,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -122848,8 +122999,8 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -122883,7 +123034,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -122893,13 +123044,13 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetHttpsProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetHttpsProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -122908,15 +123059,17 @@ pub mod target_https_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetHttpsProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetHttpsProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -123018,8 +123171,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123029,7 +123182,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123060,7 +123213,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123070,7 +123223,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -123083,7 +123236,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -123159,8 +123312,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123170,7 +123323,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::SetCertificateMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123205,7 +123358,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123215,7 +123368,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .set_certificate_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_certificate_map`.
@@ -123228,7 +123381,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -123304,8 +123457,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetCertificateMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetCertificateMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123315,7 +123468,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::SetQuicOverride;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123348,7 +123501,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123358,7 +123511,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .set_quic_override(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_quic_override`.
@@ -123371,7 +123524,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -123447,8 +123600,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetQuicOverride {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetQuicOverride {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123458,7 +123611,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::SetSslCertificates;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123493,7 +123646,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123503,7 +123656,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .set_ssl_certificates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_ssl_certificates`.
@@ -123516,7 +123669,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -123592,8 +123745,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSslCertificates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSslCertificates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123603,7 +123756,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::SetSslPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123636,7 +123789,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123646,7 +123799,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .set_ssl_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_ssl_policy`.
@@ -123659,7 +123812,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -123735,8 +123888,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSslPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSslPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123746,7 +123899,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::SetUrlMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123777,7 +123930,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123787,7 +123940,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .set_url_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_url_map`.
@@ -123800,7 +123953,7 @@ pub mod target_https_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -123876,8 +124029,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetUrlMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetUrlMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123887,7 +124040,7 @@ pub mod target_https_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_https_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -123918,7 +124071,7 @@ pub mod target_https_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123928,7 +124081,7 @@ pub mod target_https_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -123945,8 +124098,8 @@ pub mod target_https_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -123960,7 +124113,7 @@ pub mod target_instances {
     /// A builder for [TargetInstances][crate::client::TargetInstances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_instances::ClientBuilder;
     /// # use client::TargetInstances;
@@ -123970,19 +124123,18 @@ pub mod target_instances {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetInstances;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetInstances;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -123993,7 +124145,7 @@ pub mod target_instances {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetInstances>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -124006,7 +124158,7 @@ pub mod target_instances {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -124016,8 +124168,8 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -124053,7 +124205,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124063,14 +124215,16 @@ pub mod target_instances {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetInstanceAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::TargetInstanceAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -124078,17 +124232,17 @@ pub mod target_instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::TargetInstanceAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -124226,8 +124380,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -124237,7 +124391,7 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -124268,7 +124422,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124278,7 +124432,7 @@ pub mod target_instances {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -124291,7 +124445,7 @@ pub mod target_instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -124358,8 +124512,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -124369,7 +124523,7 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -124400,7 +124554,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124410,7 +124564,7 @@ pub mod target_instances {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_instances::GetRequest::project].
@@ -124433,8 +124587,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -124444,7 +124598,7 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -124475,7 +124629,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124485,7 +124639,7 @@ pub mod target_instances {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -124498,7 +124652,7 @@ pub mod target_instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -124577,8 +124731,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -124588,8 +124742,8 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -124623,7 +124777,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124633,13 +124787,13 @@ pub mod target_instances {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetInstanceList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetInstanceList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -124648,15 +124802,17 @@ pub mod target_instances {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetInstanceList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetInstanceList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -124764,8 +124920,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -124775,7 +124931,7 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::SetSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -124808,7 +124964,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124818,7 +124974,7 @@ pub mod target_instances {
             (*self.0.stub)
                 .set_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_security_policy`.
@@ -124831,7 +124987,7 @@ pub mod target_instances {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let zone = self.0.request.zone.clone();
             let query = move |name| {
@@ -124916,8 +125072,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -124927,7 +125083,7 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -124960,7 +125116,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -124970,7 +125126,7 @@ pub mod target_instances {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_instances::TestIamPermissionsRequest::project].
@@ -125011,8 +125167,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125022,7 +125178,7 @@ pub mod target_instances {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_instances::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -125053,7 +125209,7 @@ pub mod target_instances {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125063,7 +125219,7 @@ pub mod target_instances {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -125086,8 +125242,8 @@ pub mod target_instances {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125101,7 +125257,7 @@ pub mod target_pools {
     /// A builder for [TargetPools][crate::client::TargetPools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_pools::ClientBuilder;
     /// # use client::TargetPools;
@@ -125111,19 +125267,18 @@ pub mod target_pools {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetPools;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetPools;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -125134,7 +125289,7 @@ pub mod target_pools {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetPools>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -125147,7 +125302,7 @@ pub mod target_pools {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -125157,7 +125312,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::AddHealthCheck;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -125188,7 +125343,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125198,7 +125353,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .add_health_check(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_health_check`.
@@ -125211,7 +125366,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -125296,8 +125451,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddHealthCheck {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddHealthCheck {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125307,7 +125462,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::AddInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -125338,7 +125493,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125348,7 +125503,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .add_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_instance`.
@@ -125361,7 +125516,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -125446,8 +125601,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125457,8 +125612,8 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -125492,7 +125647,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125502,14 +125657,16 @@ pub mod target_pools {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetPoolAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::TargetPoolAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -125517,15 +125674,17 @@ pub mod target_pools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetPoolAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetPoolAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -125663,8 +125822,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125674,7 +125833,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -125705,7 +125864,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125715,7 +125874,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -125728,7 +125887,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -125795,8 +125954,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125806,7 +125965,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -125837,7 +125996,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125847,7 +126006,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_pools::GetRequest::project].
@@ -125870,8 +126029,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125881,7 +126040,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::GetHealth;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -125912,7 +126071,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125922,7 +126081,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .get_health(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_pools::GetHealthRequest::project].
@@ -125963,8 +126122,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHealth {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHealth {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -125974,7 +126133,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -126005,7 +126164,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126015,7 +126174,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -126028,7 +126187,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -126107,8 +126266,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -126118,8 +126277,8 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -126153,7 +126312,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126163,13 +126322,13 @@ pub mod target_pools {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetPoolList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetPoolList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -126178,15 +126337,15 @@ pub mod target_pools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetPoolList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::TargetPoolList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -126294,8 +126453,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -126305,7 +126464,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::RemoveHealthCheck;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -126338,7 +126497,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126348,7 +126507,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .remove_health_check(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_health_check`.
@@ -126361,7 +126520,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -126446,8 +126605,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveHealthCheck {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveHealthCheck {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -126457,7 +126616,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::RemoveInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -126488,7 +126647,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126498,7 +126657,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .remove_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_instance`.
@@ -126511,7 +126670,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -126596,8 +126755,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -126607,7 +126766,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::SetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -126638,7 +126797,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126648,7 +126807,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .set_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_backup`.
@@ -126661,7 +126820,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -126764,8 +126923,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -126775,7 +126934,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::SetSecurityPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -126808,7 +126967,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126818,7 +126977,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .set_security_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_security_policy`.
@@ -126831,7 +126990,7 @@ pub mod target_pools {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -126916,8 +127075,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSecurityPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSecurityPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -126927,7 +127086,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -126960,7 +127119,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -126970,7 +127129,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_pools::TestIamPermissionsRequest::project].
@@ -127011,8 +127170,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127022,7 +127181,7 @@ pub mod target_pools {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_pools::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127053,7 +127212,7 @@ pub mod target_pools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127063,7 +127222,7 @@ pub mod target_pools {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -127086,8 +127245,8 @@ pub mod target_pools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127101,7 +127260,7 @@ pub mod target_ssl_proxies {
     /// A builder for [TargetSslProxies][crate::client::TargetSslProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_ssl_proxies::ClientBuilder;
     /// # use client::TargetSslProxies;
@@ -127111,19 +127270,18 @@ pub mod target_ssl_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetSslProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetSslProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -127134,7 +127292,7 @@ pub mod target_ssl_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetSslProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -127147,7 +127305,7 @@ pub mod target_ssl_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -127157,7 +127315,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127188,7 +127346,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127198,7 +127356,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -127211,7 +127369,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -127269,8 +127427,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127280,7 +127438,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127311,7 +127469,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127321,7 +127479,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_ssl_proxies::GetRequest::project].
@@ -127338,8 +127496,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127349,7 +127507,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127380,7 +127538,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127390,7 +127548,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -127403,7 +127561,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -127473,8 +127631,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127484,8 +127642,8 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -127519,7 +127677,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127529,13 +127687,13 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetSslProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetSslProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -127544,15 +127702,17 @@ pub mod target_ssl_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetSslProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetSslProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -127654,8 +127814,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127665,7 +127825,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::SetBackendService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127698,7 +127858,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127708,7 +127868,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .set_backend_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_backend_service`.
@@ -127721,7 +127881,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -127797,8 +127957,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetBackendService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetBackendService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127808,7 +127968,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::SetCertificateMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127841,7 +128001,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127851,7 +128011,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .set_certificate_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_certificate_map`.
@@ -127864,7 +128024,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -127940,8 +128100,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetCertificateMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetCertificateMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -127951,7 +128111,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::SetProxyHeader;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -127984,7 +128144,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -127994,7 +128154,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .set_proxy_header(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_proxy_header`.
@@ -128007,7 +128167,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -128083,8 +128243,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetProxyHeader {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetProxyHeader {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128094,7 +128254,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::SetSslCertificates;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -128129,7 +128289,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128139,7 +128299,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .set_ssl_certificates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_ssl_certificates`.
@@ -128152,7 +128312,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -128228,8 +128388,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSslCertificates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSslCertificates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128239,7 +128399,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::SetSslPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -128270,7 +128430,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128280,7 +128440,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .set_ssl_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_ssl_policy`.
@@ -128293,7 +128453,7 @@ pub mod target_ssl_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -128369,8 +128529,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSslPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSslPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128380,7 +128540,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -128415,7 +128575,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128425,7 +128585,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_ssl_proxies::TestIamPermissionsRequest::project].
@@ -128460,8 +128620,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128471,7 +128631,7 @@ pub mod target_ssl_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_ssl_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -128502,7 +128662,7 @@ pub mod target_ssl_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128512,7 +128672,7 @@ pub mod target_ssl_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -128529,8 +128689,8 @@ pub mod target_ssl_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128544,7 +128704,7 @@ pub mod target_tcp_proxies {
     /// A builder for [TargetTcpProxies][crate::client::TargetTcpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_tcp_proxies::ClientBuilder;
     /// # use client::TargetTcpProxies;
@@ -128554,19 +128714,18 @@ pub mod target_tcp_proxies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetTcpProxies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetTcpProxies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -128577,7 +128736,7 @@ pub mod target_tcp_proxies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetTcpProxies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -128590,7 +128749,7 @@ pub mod target_tcp_proxies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -128600,8 +128759,8 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -128637,7 +128796,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128647,14 +128806,16 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetTcpProxyAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::TargetTcpProxyAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -128662,17 +128823,17 @@ pub mod target_tcp_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::TargetTcpProxyAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -128810,8 +128971,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128821,7 +128982,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -128852,7 +129013,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128862,7 +129023,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -128875,7 +129036,7 @@ pub mod target_tcp_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -128933,8 +129094,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -128944,7 +129105,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -128975,7 +129136,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -128985,7 +129146,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_tcp_proxies::GetRequest::project].
@@ -129002,8 +129163,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129013,7 +129174,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -129044,7 +129205,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129054,7 +129215,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -129067,7 +129228,7 @@ pub mod target_tcp_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -129137,8 +129298,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129148,8 +129309,8 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -129183,7 +129344,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129193,13 +129354,13 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetTcpProxyList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetTcpProxyList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -129208,15 +129369,17 @@ pub mod target_tcp_proxies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetTcpProxyList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetTcpProxyList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -129318,8 +129481,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129329,7 +129492,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::SetBackendService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -129362,7 +129525,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129372,7 +129535,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .set_backend_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_backend_service`.
@@ -129385,7 +129548,7 @@ pub mod target_tcp_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -129461,8 +129624,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetBackendService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetBackendService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129472,7 +129635,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::SetProxyHeader;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -129505,7 +129668,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129515,7 +129678,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .set_proxy_header(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_proxy_header`.
@@ -129528,7 +129691,7 @@ pub mod target_tcp_proxies {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -129604,8 +129767,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetProxyHeader {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetProxyHeader {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129615,7 +129778,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -129650,7 +129813,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129660,7 +129823,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_tcp_proxies::TestIamPermissionsRequest::project].
@@ -129695,8 +129858,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129706,7 +129869,7 @@ pub mod target_tcp_proxies {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_tcp_proxies::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -129737,7 +129900,7 @@ pub mod target_tcp_proxies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129747,7 +129910,7 @@ pub mod target_tcp_proxies {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -129764,8 +129927,8 @@ pub mod target_tcp_proxies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -129779,7 +129942,7 @@ pub mod target_vpn_gateways {
     /// A builder for [TargetVpnGateways][crate::client::TargetVpnGateways].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::target_vpn_gateways::ClientBuilder;
     /// # use client::TargetVpnGateways;
@@ -129789,19 +129952,18 @@ pub mod target_vpn_gateways {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TargetVpnGateways;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TargetVpnGateways;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -129812,7 +129974,7 @@ pub mod target_vpn_gateways {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TargetVpnGateways>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -129825,7 +129987,7 @@ pub mod target_vpn_gateways {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -129835,8 +129997,8 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -129872,7 +130034,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -129882,15 +130044,15 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::TargetVpnGatewayAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -129899,17 +130061,17 @@ pub mod target_vpn_gateways {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::TargetVpnGatewayAggregatedList,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -130047,8 +130209,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130058,7 +130220,7 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -130089,7 +130251,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130099,7 +130261,7 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -130112,7 +130274,7 @@ pub mod target_vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -130179,8 +130341,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130190,7 +130352,7 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -130221,7 +130383,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130231,7 +130393,7 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::target_vpn_gateways::GetRequest::project].
@@ -130254,8 +130416,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130265,7 +130427,7 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -130296,7 +130458,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130306,7 +130468,7 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -130319,7 +130481,7 @@ pub mod target_vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -130398,8 +130560,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130409,8 +130571,8 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -130444,7 +130606,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130454,13 +130616,13 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::TargetVpnGatewayList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::TargetVpnGatewayList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -130469,15 +130631,17 @@ pub mod target_vpn_gateways {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::TargetVpnGatewayList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::TargetVpnGatewayList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -130585,8 +130749,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130596,7 +130760,7 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -130627,7 +130791,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130637,7 +130801,7 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -130650,7 +130814,7 @@ pub mod target_vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -130735,8 +130899,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130746,7 +130910,7 @@ pub mod target_vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::target_vpn_gateways::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -130777,7 +130941,7 @@ pub mod target_vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130787,7 +130951,7 @@ pub mod target_vpn_gateways {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -130810,8 +130974,8 @@ pub mod target_vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -130825,7 +130989,7 @@ pub mod url_maps {
     /// A builder for [UrlMaps][crate::client::UrlMaps].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::url_maps::ClientBuilder;
     /// # use client::UrlMaps;
@@ -130835,19 +130999,18 @@ pub mod url_maps {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::UrlMaps;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = UrlMaps;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -130858,7 +131021,7 @@ pub mod url_maps {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::UrlMaps>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -130869,7 +131032,7 @@ pub mod url_maps {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -130879,8 +131042,8 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -130912,7 +131075,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -130922,13 +131085,13 @@ pub mod url_maps {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::UrlMapsAggregatedList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::UrlMapsAggregatedList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -130937,15 +131100,17 @@ pub mod url_maps {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::UrlMapsAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::UrlMapsAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -131083,8 +131248,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131094,7 +131259,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131123,7 +131288,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131133,7 +131298,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -131146,7 +131311,7 @@ pub mod url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -131204,8 +131369,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131215,7 +131380,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131241,7 +131406,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131251,7 +131416,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::url_maps::GetRequest::project].
@@ -131268,8 +131433,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131279,7 +131444,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131308,7 +131473,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131318,7 +131483,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -131331,7 +131496,7 @@ pub mod url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -131401,8 +131566,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131412,7 +131577,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::InvalidateCache;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131441,7 +131606,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131451,7 +131616,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .invalidate_cache(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `invalidate_cache`.
@@ -131464,7 +131629,7 @@ pub mod url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -131540,8 +131705,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InvalidateCache {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InvalidateCache {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131551,8 +131716,8 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -131581,7 +131746,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131591,13 +131756,14 @@ pub mod url_maps {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::UrlMapList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::UrlMapList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -131605,15 +131771,15 @@ pub mod url_maps {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::UrlMapList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::UrlMapList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -131715,8 +131881,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131726,7 +131892,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131752,7 +131918,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131762,7 +131928,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -131775,7 +131941,7 @@ pub mod url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -131851,8 +132017,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131862,7 +132028,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131893,7 +132059,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131903,7 +132069,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::url_maps::TestIamPermissionsRequest::project].
@@ -131938,8 +132104,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -131949,7 +132115,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -131978,7 +132144,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -131988,7 +132154,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -132001,7 +132167,7 @@ pub mod url_maps {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -132077,8 +132243,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132088,7 +132254,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::Validate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -132117,7 +132283,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132127,7 +132293,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .validate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::url_maps::ValidateRequest::project].
@@ -132162,8 +132328,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Validate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Validate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132173,7 +132339,7 @@ pub mod url_maps {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::url_maps::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -132202,7 +132368,7 @@ pub mod url_maps {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132212,7 +132378,7 @@ pub mod url_maps {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -132229,8 +132395,8 @@ pub mod url_maps {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132244,7 +132410,7 @@ pub mod vpn_gateways {
     /// A builder for [VpnGateways][crate::client::VpnGateways].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::vpn_gateways::ClientBuilder;
     /// # use client::VpnGateways;
@@ -132254,19 +132420,18 @@ pub mod vpn_gateways {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::VpnGateways;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = VpnGateways;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -132277,7 +132442,7 @@ pub mod vpn_gateways {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::VpnGateways>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -132290,7 +132455,7 @@ pub mod vpn_gateways {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -132300,8 +132465,8 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -132335,7 +132500,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132345,14 +132510,16 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::VpnGatewayAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::VpnGatewayAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -132360,15 +132527,17 @@ pub mod vpn_gateways {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::VpnGatewayAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::VpnGatewayAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -132506,8 +132675,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132517,7 +132686,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -132548,7 +132717,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132558,7 +132727,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -132571,7 +132740,7 @@ pub mod vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -132638,8 +132807,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132649,7 +132818,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -132680,7 +132849,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132690,7 +132859,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::vpn_gateways::GetRequest::project].
@@ -132713,8 +132882,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132724,7 +132893,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::GetStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -132755,7 +132924,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132765,7 +132934,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .get_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::vpn_gateways::GetStatusRequest::project].
@@ -132788,8 +132957,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132799,7 +132968,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -132830,7 +132999,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132840,7 +133009,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -132853,7 +133022,7 @@ pub mod vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -132932,8 +133101,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -132943,8 +133112,8 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -132978,7 +133147,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -132988,13 +133157,13 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::VpnGatewayList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::VpnGatewayList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -133003,15 +133172,15 @@ pub mod vpn_gateways {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::VpnGatewayList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::VpnGatewayList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -133119,8 +133288,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133130,7 +133299,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -133161,7 +133330,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133171,7 +133340,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -133184,7 +133353,7 @@ pub mod vpn_gateways {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -133269,8 +133438,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133280,7 +133449,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -133313,7 +133482,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133323,7 +133492,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::vpn_gateways::TestIamPermissionsRequest::project].
@@ -133364,8 +133533,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133375,7 +133544,7 @@ pub mod vpn_gateways {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_gateways::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -133406,7 +133575,7 @@ pub mod vpn_gateways {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133416,7 +133585,7 @@ pub mod vpn_gateways {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -133439,8 +133608,8 @@ pub mod vpn_gateways {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133454,7 +133623,7 @@ pub mod vpn_tunnels {
     /// A builder for [VpnTunnels][crate::client::VpnTunnels].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::vpn_tunnels::ClientBuilder;
     /// # use client::VpnTunnels;
@@ -133464,19 +133633,18 @@ pub mod vpn_tunnels {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::VpnTunnels;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = VpnTunnels;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -133487,7 +133655,7 @@ pub mod vpn_tunnels {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::VpnTunnels>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -133500,7 +133668,7 @@ pub mod vpn_tunnels {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -133510,8 +133678,8 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::AggregatedList;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -133545,7 +133713,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133555,14 +133723,16 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .aggregated_list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::VpnTunnelAggregatedList, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::VpnTunnelAggregatedList,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -133570,15 +133740,17 @@ pub mod vpn_tunnels {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::VpnTunnelAggregatedList, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::VpnTunnelAggregatedList,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -133716,8 +133888,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregatedList {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregatedList {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133727,7 +133899,7 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -133758,7 +133930,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133768,7 +133940,7 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -133781,7 +133953,7 @@ pub mod vpn_tunnels {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -133848,8 +134020,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133859,7 +134031,7 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -133890,7 +134062,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133900,7 +134072,7 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::vpn_tunnels::GetRequest::project].
@@ -133923,8 +134095,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -133934,7 +134106,7 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -133965,7 +134137,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -133975,7 +134147,7 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -133988,7 +134160,7 @@ pub mod vpn_tunnels {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -134067,8 +134239,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134078,8 +134250,8 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -134113,7 +134285,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134123,13 +134295,13 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::VpnTunnelList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::VpnTunnelList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -134138,15 +134310,15 @@ pub mod vpn_tunnels {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::VpnTunnelList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::VpnTunnelList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -134254,8 +134426,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134265,7 +134437,7 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::SetLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -134296,7 +134468,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134306,7 +134478,7 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .set_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_labels`.
@@ -134319,7 +134491,7 @@ pub mod vpn_tunnels {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let region = self.0.request.region.clone();
             let query = move |name| {
@@ -134404,8 +134576,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134415,7 +134587,7 @@ pub mod vpn_tunnels {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::vpn_tunnels::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -134446,7 +134618,7 @@ pub mod vpn_tunnels {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134456,7 +134628,7 @@ pub mod vpn_tunnels {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::region_operations::GetRequest::operation].
@@ -134479,8 +134651,8 @@ pub mod vpn_tunnels {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134494,7 +134666,7 @@ pub mod wire_groups {
     /// A builder for [WireGroups][crate::client::WireGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::wire_groups::ClientBuilder;
     /// # use client::WireGroups;
@@ -134504,19 +134676,18 @@ pub mod wire_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::WireGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = WireGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -134527,7 +134698,7 @@ pub mod wire_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::WireGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -134540,7 +134711,7 @@ pub mod wire_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -134550,7 +134721,7 @@ pub mod wire_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::wire_groups::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -134581,7 +134752,7 @@ pub mod wire_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134591,7 +134762,7 @@ pub mod wire_groups {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete`.
@@ -134604,7 +134775,7 @@ pub mod wire_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -134668,8 +134839,8 @@ pub mod wire_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134679,7 +134850,7 @@ pub mod wire_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::wire_groups::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -134710,7 +134881,7 @@ pub mod wire_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134720,7 +134891,7 @@ pub mod wire_groups {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [cross_site_network][crate::model::wire_groups::GetRequest::cross_site_network].
@@ -134743,8 +134914,8 @@ pub mod wire_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134754,7 +134925,7 @@ pub mod wire_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::wire_groups::Insert;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -134785,7 +134956,7 @@ pub mod wire_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134795,7 +134966,7 @@ pub mod wire_groups {
             (*self.0.stub)
                 .insert(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `insert`.
@@ -134808,7 +134979,7 @@ pub mod wire_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -134902,8 +135073,8 @@ pub mod wire_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Insert {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Insert {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134913,8 +135084,8 @@ pub mod wire_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::wire_groups::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -134948,7 +135119,7 @@ pub mod wire_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -134958,13 +135129,13 @@ pub mod wire_groups {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::WireGroupList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::WireGroupList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -134973,15 +135144,15 @@ pub mod wire_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::WireGroupList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::WireGroupList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -135089,8 +135260,8 @@ pub mod wire_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135100,7 +135271,7 @@ pub mod wire_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::wire_groups::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -135131,7 +135302,7 @@ pub mod wire_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135141,7 +135312,7 @@ pub mod wire_groups {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -135154,7 +135325,7 @@ pub mod wire_groups {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let query = move |name| {
                 let stub = stub.clone();
@@ -135272,8 +135443,8 @@ pub mod wire_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135283,7 +135454,7 @@ pub mod wire_groups {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::wire_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -135314,7 +135485,7 @@ pub mod wire_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135324,7 +135495,7 @@ pub mod wire_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::global_operations::GetRequest::operation].
@@ -135341,8 +135512,8 @@ pub mod wire_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135356,7 +135527,7 @@ pub mod zone_operations {
     /// A builder for [ZoneOperations][crate::client::ZoneOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::zone_operations::ClientBuilder;
     /// # use client::ZoneOperations;
@@ -135366,19 +135537,18 @@ pub mod zone_operations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ZoneOperations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ZoneOperations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -135389,7 +135559,7 @@ pub mod zone_operations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ZoneOperations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -135402,7 +135572,7 @@ pub mod zone_operations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -135412,7 +135582,7 @@ pub mod zone_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::zone_operations::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -135443,7 +135613,7 @@ pub mod zone_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135453,7 +135623,7 @@ pub mod zone_operations {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::DeleteRequest::operation].
@@ -135476,8 +135646,8 @@ pub mod zone_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135487,7 +135657,7 @@ pub mod zone_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::zone_operations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -135518,7 +135688,7 @@ pub mod zone_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135528,7 +135698,7 @@ pub mod zone_operations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::GetRequest::operation].
@@ -135551,8 +135721,8 @@ pub mod zone_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135562,8 +135732,8 @@ pub mod zone_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::zone_operations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -135597,7 +135767,7 @@ pub mod zone_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135607,13 +135777,13 @@ pub mod zone_operations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::OperationList, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -135622,15 +135792,15 @@ pub mod zone_operations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::OperationList, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::OperationList, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -135738,8 +135908,8 @@ pub mod zone_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135749,7 +135919,7 @@ pub mod zone_operations {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::zone_operations::Wait;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -135780,7 +135950,7 @@ pub mod zone_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135790,7 +135960,7 @@ pub mod zone_operations {
             (*self.0.stub)
                 .wait(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [operation][crate::model::zone_operations::WaitRequest::operation].
@@ -135813,8 +135983,8 @@ pub mod zone_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Wait {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Wait {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135828,7 +135998,7 @@ pub mod zones {
     /// A builder for [Zones][crate::client::Zones].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::*;
     /// # use builder::zones::ClientBuilder;
     /// # use client::Zones;
@@ -135838,19 +136008,18 @@ pub mod zones {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Zones;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Zones;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -135861,7 +136030,7 @@ pub mod zones {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Zones>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -135872,7 +136041,7 @@ pub mod zones {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -135882,7 +136051,7 @@ pub mod zones {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::zones::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -135908,7 +136077,7 @@ pub mod zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135918,7 +136087,7 @@ pub mod zones {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::zones::GetRequest::project].
@@ -135935,8 +136104,8 @@ pub mod zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -135946,8 +136115,8 @@ pub mod zones {
     /// # Example
     /// ```
     /// # use google_cloud_compute_v1::builder::zones::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_compute_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -135976,7 +136145,7 @@ pub mod zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -135986,13 +136155,14 @@ pub mod zones {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ZoneList, gax::error::Error> {
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ZoneList, crate::Error>
+        {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -136000,14 +136170,15 @@ pub mod zones {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ZoneList, gax::error::Error> {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ZoneList, crate::Error>
+        {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -136109,8 +136280,8 @@ pub mod zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/compute/v1/src/client.rs b/src/generated/cloud/compute/v1/src/client.rs
index 98e062e2b4..968ab82238 100644
--- a/src/generated/cloud/compute/v1/src/client.rs
+++ b/src/generated/cloud/compute/v1/src/client.rs
@@ -21,7 +21,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::AcceleratorTypes;
 /// let client = AcceleratorTypes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -70,15 +70,13 @@ impl AcceleratorTypes {
     /// Returns a builder for [AcceleratorTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::AcceleratorTypes;
     /// let client = AcceleratorTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::accelerator_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::accelerator_types::client::Factory,
-        )
+        crate::new_client_builder(super::builder::accelerator_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -96,14 +94,14 @@ impl AcceleratorTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AcceleratorTypes>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AcceleratorTypes>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -113,13 +111,13 @@ impl AcceleratorTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AcceleratorTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AcceleratorTypes> {
         super::transport::AcceleratorTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AcceleratorTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AcceleratorTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AcceleratorTypes::new)
@@ -149,7 +147,7 @@ impl AcceleratorTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Addresses;
 /// let client = Addresses::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -198,13 +196,13 @@ impl Addresses {
     /// Returns a builder for [Addresses].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Addresses;
     /// let client = Addresses::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::addresses::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::addresses::client::Factory)
+        crate::new_client_builder(super::builder::addresses::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -222,14 +220,14 @@ impl Addresses {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Addresses>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Addresses>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -238,13 +236,13 @@ impl Addresses {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Addresses> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Addresses> {
         super::transport::Addresses::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Addresses> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Addresses> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Addresses::new)
@@ -306,7 +304,7 @@ impl Addresses {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Advice;
 /// let client = Advice::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -355,13 +353,13 @@ impl Advice {
     /// Returns a builder for [Advice].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Advice;
     /// let client = Advice::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::advice::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::advice::client::Factory)
+        crate::new_client_builder(super::builder::advice::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -379,14 +377,14 @@ impl Advice {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Advice>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Advice>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -395,13 +393,13 @@ impl Advice {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Advice> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Advice> {
         super::transport::Advice::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Advice> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Advice> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Advice::new)
@@ -420,7 +418,7 @@ impl Advice {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Autoscalers;
 /// let client = Autoscalers::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -469,13 +467,13 @@ impl Autoscalers {
     /// Returns a builder for [Autoscalers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Autoscalers;
     /// let client = Autoscalers::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::autoscalers::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::autoscalers::client::Factory)
+        crate::new_client_builder(super::builder::autoscalers::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -493,14 +491,14 @@ impl Autoscalers {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Autoscalers>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Autoscalers>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -509,13 +507,13 @@ impl Autoscalers {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Autoscalers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Autoscalers> {
         super::transport::Autoscalers::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Autoscalers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Autoscalers> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Autoscalers::new)
@@ -580,7 +578,7 @@ impl Autoscalers {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::BackendBuckets;
 /// let client = BackendBuckets::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -629,13 +627,13 @@ impl BackendBuckets {
     /// Returns a builder for [BackendBuckets].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::BackendBuckets;
     /// let client = BackendBuckets::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::backend_buckets::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::backend_buckets::client::Factory)
+        crate::new_client_builder(super::builder::backend_buckets::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -653,14 +651,14 @@ impl BackendBuckets {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BackendBuckets>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BackendBuckets>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -669,13 +667,13 @@ impl BackendBuckets {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackendBuckets> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackendBuckets> {
         super::transport::BackendBuckets::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackendBuckets> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackendBuckets> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BackendBuckets::new)
@@ -763,7 +761,7 @@ impl BackendBuckets {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::BackendServices;
 /// let client = BackendServices::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -812,15 +810,13 @@ impl BackendServices {
     /// Returns a builder for [BackendServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::BackendServices;
     /// let client = BackendServices::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::backend_services::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::backend_services::client::Factory,
-        )
+        crate::new_client_builder(super::builder::backend_services::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -838,15 +834,14 @@ impl BackendServices {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BackendServices>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BackendServices>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -855,13 +850,13 @@ impl BackendServices {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackendServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackendServices> {
         super::transport::BackendServices::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackendServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackendServices> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BackendServices::new)
@@ -992,7 +987,7 @@ impl BackendServices {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::CrossSiteNetworks;
 /// let client = CrossSiteNetworks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -1041,15 +1036,13 @@ impl CrossSiteNetworks {
     /// Returns a builder for [CrossSiteNetworks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::CrossSiteNetworks;
     /// let client = CrossSiteNetworks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cross_site_networks::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cross_site_networks::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cross_site_networks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1067,14 +1060,14 @@ impl CrossSiteNetworks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CrossSiteNetworks>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CrossSiteNetworks>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1084,13 +1077,13 @@ impl CrossSiteNetworks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CrossSiteNetworks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CrossSiteNetworks> {
         super::transport::CrossSiteNetworks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CrossSiteNetworks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CrossSiteNetworks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CrossSiteNetworks::new)
@@ -1135,7 +1128,7 @@ impl CrossSiteNetworks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::DiskTypes;
 /// let client = DiskTypes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -1184,13 +1177,13 @@ impl DiskTypes {
     /// Returns a builder for [DiskTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::DiskTypes;
     /// let client = DiskTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::disk_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::disk_types::client::Factory)
+        crate::new_client_builder(super::builder::disk_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1208,14 +1201,14 @@ impl DiskTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DiskTypes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DiskTypes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1224,13 +1217,13 @@ impl DiskTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DiskTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DiskTypes> {
         super::transport::DiskTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DiskTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DiskTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DiskTypes::new)
@@ -1260,7 +1253,7 @@ impl DiskTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Disks;
 /// let client = Disks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -1309,13 +1302,13 @@ impl Disks {
     /// Returns a builder for [Disks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Disks;
     /// let client = Disks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::disks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::disks::client::Factory)
+        crate::new_client_builder(super::builder::disks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1333,14 +1326,14 @@ impl Disks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Disks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Disks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1349,13 +1342,13 @@ impl Disks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Disks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Disks> {
         super::transport::Disks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Disks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Disks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Disks::new)
@@ -1493,7 +1486,7 @@ impl Disks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ExternalVpnGateways;
 /// let client = ExternalVpnGateways::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -1542,15 +1535,13 @@ impl ExternalVpnGateways {
     /// Returns a builder for [ExternalVpnGateways].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ExternalVpnGateways;
     /// let client = ExternalVpnGateways::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::external_vpn_gateways::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::external_vpn_gateways::client::Factory,
-        )
+        crate::new_client_builder(super::builder::external_vpn_gateways::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1568,14 +1559,14 @@ impl ExternalVpnGateways {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ExternalVpnGateways>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ExternalVpnGateways>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1585,13 +1576,13 @@ impl ExternalVpnGateways {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ExternalVpnGateways> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ExternalVpnGateways> {
         super::transport::ExternalVpnGateways::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ExternalVpnGateways> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ExternalVpnGateways> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ExternalVpnGateways::new)
@@ -1644,7 +1635,7 @@ impl ExternalVpnGateways {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::FirewallPolicies;
 /// let client = FirewallPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -1693,15 +1684,13 @@ impl FirewallPolicies {
     /// Returns a builder for [FirewallPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::FirewallPolicies;
     /// let client = FirewallPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::firewall_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::firewall_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::firewall_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1719,14 +1708,14 @@ impl FirewallPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::FirewallPolicies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::FirewallPolicies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1736,13 +1725,13 @@ impl FirewallPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FirewallPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FirewallPolicies> {
         super::transport::FirewallPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FirewallPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FirewallPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FirewallPolicies::new)
@@ -1853,7 +1842,7 @@ impl FirewallPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Firewalls;
 /// let client = Firewalls::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -1902,13 +1891,13 @@ impl Firewalls {
     /// Returns a builder for [Firewalls].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Firewalls;
     /// let client = Firewalls::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::firewalls::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::firewalls::client::Factory)
+        crate::new_client_builder(super::builder::firewalls::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1926,14 +1915,14 @@ impl Firewalls {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Firewalls>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Firewalls>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1942,13 +1931,13 @@ impl Firewalls {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Firewalls> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Firewalls> {
         super::transport::Firewalls::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Firewalls> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Firewalls> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Firewalls::new)
@@ -2007,7 +1996,7 @@ impl Firewalls {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ForwardingRules;
 /// let client = ForwardingRules::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -2056,15 +2045,13 @@ impl ForwardingRules {
     /// Returns a builder for [ForwardingRules].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ForwardingRules;
     /// let client = ForwardingRules::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::forwarding_rules::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::forwarding_rules::client::Factory,
-        )
+        crate::new_client_builder(super::builder::forwarding_rules::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2082,15 +2069,14 @@ impl ForwardingRules {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ForwardingRules>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ForwardingRules>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2099,13 +2085,13 @@ impl ForwardingRules {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ForwardingRules> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ForwardingRules> {
         super::transport::ForwardingRules::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ForwardingRules> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ForwardingRules> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ForwardingRules::new)
@@ -2173,7 +2159,7 @@ impl ForwardingRules {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::FutureReservations;
 /// let client = FutureReservations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -2222,15 +2208,13 @@ impl FutureReservations {
     /// Returns a builder for [FutureReservations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::FutureReservations;
     /// let client = FutureReservations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::future_reservations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::future_reservations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::future_reservations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2248,14 +2232,14 @@ impl FutureReservations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::FutureReservations>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::FutureReservations>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2265,13 +2249,13 @@ impl FutureReservations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FutureReservations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FutureReservations> {
         super::transport::FutureReservations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FutureReservations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FutureReservations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FutureReservations::new)
@@ -2326,7 +2310,7 @@ impl FutureReservations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::GlobalAddresses;
 /// let client = GlobalAddresses::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -2375,15 +2359,13 @@ impl GlobalAddresses {
     /// Returns a builder for [GlobalAddresses].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::GlobalAddresses;
     /// let client = GlobalAddresses::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::global_addresses::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::global_addresses::client::Factory,
-        )
+        crate::new_client_builder(super::builder::global_addresses::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2401,15 +2383,14 @@ impl GlobalAddresses {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GlobalAddresses>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GlobalAddresses>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2418,13 +2399,13 @@ impl GlobalAddresses {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalAddresses> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalAddresses> {
         super::transport::GlobalAddresses::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalAddresses> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalAddresses> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GlobalAddresses::new)
@@ -2477,7 +2458,7 @@ impl GlobalAddresses {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::GlobalForwardingRules;
 /// let client = GlobalForwardingRules::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -2526,15 +2507,13 @@ impl GlobalForwardingRules {
     /// Returns a builder for [GlobalForwardingRules].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::GlobalForwardingRules;
     /// let client = GlobalForwardingRules::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::global_forwarding_rules::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::global_forwarding_rules::client::Factory,
-        )
+        crate::new_client_builder(super::builder::global_forwarding_rules::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2552,14 +2531,14 @@ impl GlobalForwardingRules {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GlobalForwardingRules>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GlobalForwardingRules>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2569,13 +2548,13 @@ impl GlobalForwardingRules {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalForwardingRules> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalForwardingRules> {
         super::transport::GlobalForwardingRules::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalForwardingRules> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalForwardingRules> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GlobalForwardingRules::new)
@@ -2636,7 +2615,7 @@ impl GlobalForwardingRules {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::GlobalNetworkEndpointGroups;
 /// let client = GlobalNetworkEndpointGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -2685,15 +2664,13 @@ impl GlobalNetworkEndpointGroups {
     /// Returns a builder for [GlobalNetworkEndpointGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::GlobalNetworkEndpointGroups;
     /// let client = GlobalNetworkEndpointGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::global_network_endpoint_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::global_network_endpoint_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::global_network_endpoint_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2711,14 +2688,14 @@ impl GlobalNetworkEndpointGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::GlobalNetworkEndpointGroups>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -2729,13 +2706,13 @@ impl GlobalNetworkEndpointGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalNetworkEndpointGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalNetworkEndpointGroups> {
         super::transport::GlobalNetworkEndpointGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalNetworkEndpointGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalNetworkEndpointGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GlobalNetworkEndpointGroups::new)
@@ -2801,7 +2778,7 @@ impl GlobalNetworkEndpointGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::GlobalOperations;
 /// let client = GlobalOperations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -2850,15 +2827,13 @@ impl GlobalOperations {
     /// Returns a builder for [GlobalOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::GlobalOperations;
     /// let client = GlobalOperations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::global_operations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::global_operations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::global_operations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2876,14 +2851,14 @@ impl GlobalOperations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GlobalOperations>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GlobalOperations>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2893,13 +2868,13 @@ impl GlobalOperations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalOperations> {
         super::transport::GlobalOperations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalOperations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GlobalOperations::new)
@@ -2956,7 +2931,7 @@ impl GlobalOperations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::GlobalOrganizationOperations;
 /// let client = GlobalOrganizationOperations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3005,15 +2980,13 @@ impl GlobalOrganizationOperations {
     /// Returns a builder for [GlobalOrganizationOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::GlobalOrganizationOperations;
     /// let client = GlobalOrganizationOperations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::global_organization_operations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::global_organization_operations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::global_organization_operations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3031,14 +3004,14 @@ impl GlobalOrganizationOperations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::GlobalOrganizationOperations>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -3049,13 +3022,13 @@ impl GlobalOrganizationOperations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalOrganizationOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalOrganizationOperations> {
         super::transport::GlobalOrganizationOperations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalOrganizationOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalOrganizationOperations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GlobalOrganizationOperations::new)
@@ -3083,7 +3056,7 @@ impl GlobalOrganizationOperations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::GlobalPublicDelegatedPrefixes;
 /// let client = GlobalPublicDelegatedPrefixes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3132,15 +3105,13 @@ impl GlobalPublicDelegatedPrefixes {
     /// Returns a builder for [GlobalPublicDelegatedPrefixes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::GlobalPublicDelegatedPrefixes;
     /// let client = GlobalPublicDelegatedPrefixes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::global_public_delegated_prefixes::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::global_public_delegated_prefixes::client::Factory,
-        )
+        crate::new_client_builder(super::builder::global_public_delegated_prefixes::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3158,14 +3129,14 @@ impl GlobalPublicDelegatedPrefixes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::GlobalPublicDelegatedPrefixes>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -3176,13 +3147,13 @@ impl GlobalPublicDelegatedPrefixes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalPublicDelegatedPrefixes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalPublicDelegatedPrefixes> {
         super::transport::GlobalPublicDelegatedPrefixes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GlobalPublicDelegatedPrefixes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GlobalPublicDelegatedPrefixes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GlobalPublicDelegatedPrefixes::new)
@@ -3227,7 +3198,7 @@ impl GlobalPublicDelegatedPrefixes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::HealthChecks;
 /// let client = HealthChecks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3276,13 +3247,13 @@ impl HealthChecks {
     /// Returns a builder for [HealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::HealthChecks;
     /// let client = HealthChecks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::health_checks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::health_checks::client::Factory)
+        crate::new_client_builder(super::builder::health_checks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3300,14 +3271,14 @@ impl HealthChecks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::HealthChecks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::HealthChecks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3316,13 +3287,13 @@ impl HealthChecks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HealthChecks> {
         super::transport::HealthChecks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HealthChecks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::HealthChecks::new)
@@ -3388,7 +3359,7 @@ impl HealthChecks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::HttpHealthChecks;
 /// let client = HttpHealthChecks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3437,15 +3408,13 @@ impl HttpHealthChecks {
     /// Returns a builder for [HttpHealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::HttpHealthChecks;
     /// let client = HttpHealthChecks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::http_health_checks::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::http_health_checks::client::Factory,
-        )
+        crate::new_client_builder(super::builder::http_health_checks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3463,14 +3432,14 @@ impl HttpHealthChecks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::HttpHealthChecks>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::HttpHealthChecks>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3480,13 +3449,13 @@ impl HttpHealthChecks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HttpHealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HttpHealthChecks> {
         super::transport::HttpHealthChecks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HttpHealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HttpHealthChecks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::HttpHealthChecks::new)
@@ -3543,7 +3512,7 @@ impl HttpHealthChecks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::HttpsHealthChecks;
 /// let client = HttpsHealthChecks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3592,15 +3561,13 @@ impl HttpsHealthChecks {
     /// Returns a builder for [HttpsHealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::HttpsHealthChecks;
     /// let client = HttpsHealthChecks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::https_health_checks::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::https_health_checks::client::Factory,
-        )
+        crate::new_client_builder(super::builder::https_health_checks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3618,14 +3585,14 @@ impl HttpsHealthChecks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::HttpsHealthChecks>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::HttpsHealthChecks>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3635,13 +3602,13 @@ impl HttpsHealthChecks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HttpsHealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HttpsHealthChecks> {
         super::transport::HttpsHealthChecks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HttpsHealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HttpsHealthChecks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::HttpsHealthChecks::new)
@@ -3698,7 +3665,7 @@ impl HttpsHealthChecks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ImageFamilyViews;
 /// let client = ImageFamilyViews::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3747,15 +3714,13 @@ impl ImageFamilyViews {
     /// Returns a builder for [ImageFamilyViews].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ImageFamilyViews;
     /// let client = ImageFamilyViews::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::image_family_views::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::image_family_views::client::Factory,
-        )
+        crate::new_client_builder(super::builder::image_family_views::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3773,14 +3738,14 @@ impl ImageFamilyViews {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ImageFamilyViews>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ImageFamilyViews>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3790,13 +3755,13 @@ impl ImageFamilyViews {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ImageFamilyViews> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ImageFamilyViews> {
         super::transport::ImageFamilyViews::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ImageFamilyViews> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ImageFamilyViews> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ImageFamilyViews::new)
@@ -3813,7 +3778,7 @@ impl ImageFamilyViews {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Images;
 /// let client = Images::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -3862,13 +3827,13 @@ impl Images {
     /// Returns a builder for [Images].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Images;
     /// let client = Images::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::images::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::images::client::Factory)
+        crate::new_client_builder(super::builder::images::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3886,14 +3851,14 @@ impl Images {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Images>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Images>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3902,13 +3867,13 @@ impl Images {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Images> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Images> {
         super::transport::Images::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Images> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Images> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Images::new)
@@ -3995,7 +3960,7 @@ impl Images {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InstanceGroupManagerResizeRequests;
 /// let client = InstanceGroupManagerResizeRequests::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -4044,13 +4009,13 @@ impl InstanceGroupManagerResizeRequests {
     /// Returns a builder for [InstanceGroupManagerResizeRequests].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InstanceGroupManagerResizeRequests;
     /// let client = InstanceGroupManagerResizeRequests::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instance_group_manager_resize_requests::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::instance_group_manager_resize_requests::client::Factory,
         )
     }
@@ -4070,14 +4035,14 @@ impl InstanceGroupManagerResizeRequests {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::InstanceGroupManagerResizeRequests>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -4088,13 +4053,13 @@ impl InstanceGroupManagerResizeRequests {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceGroupManagerResizeRequests> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceGroupManagerResizeRequests> {
         super::transport::InstanceGroupManagerResizeRequests::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceGroupManagerResizeRequests> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceGroupManagerResizeRequests> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstanceGroupManagerResizeRequests::new)
@@ -4146,7 +4111,7 @@ impl InstanceGroupManagerResizeRequests {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InstanceGroupManagers;
 /// let client = InstanceGroupManagers::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -4195,15 +4160,13 @@ impl InstanceGroupManagers {
     /// Returns a builder for [InstanceGroupManagers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InstanceGroupManagers;
     /// let client = InstanceGroupManagers::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instance_group_managers::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::instance_group_managers::client::Factory,
-        )
+        crate::new_client_builder(super::builder::instance_group_managers::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4221,14 +4184,14 @@ impl InstanceGroupManagers {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InstanceGroupManagers>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InstanceGroupManagers>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -4238,13 +4201,13 @@ impl InstanceGroupManagers {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceGroupManagers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceGroupManagers> {
         super::transport::InstanceGroupManagers::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceGroupManagers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceGroupManagers> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstanceGroupManagers::new)
@@ -4592,7 +4555,7 @@ impl InstanceGroupManagers {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InstanceGroups;
 /// let client = InstanceGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -4641,13 +4604,13 @@ impl InstanceGroups {
     /// Returns a builder for [InstanceGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InstanceGroups;
     /// let client = InstanceGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instance_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::instance_groups::client::Factory)
+        crate::new_client_builder(super::builder::instance_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4665,14 +4628,14 @@ impl InstanceGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InstanceGroups>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InstanceGroups>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4681,13 +4644,13 @@ impl InstanceGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceGroups> {
         super::transport::InstanceGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstanceGroups::new)
@@ -4782,7 +4745,7 @@ impl InstanceGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InstanceSettings;
 /// let client = InstanceSettings::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -4831,15 +4794,13 @@ impl InstanceSettings {
     /// Returns a builder for [InstanceSettings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InstanceSettings;
     /// let client = InstanceSettings::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instance_settings::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::instance_settings::client::Factory,
-        )
+        crate::new_client_builder(super::builder::instance_settings::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4857,14 +4818,14 @@ impl InstanceSettings {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InstanceSettings>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InstanceSettings>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -4874,13 +4835,13 @@ impl InstanceSettings {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceSettings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceSettings> {
         super::transport::InstanceSettings::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceSettings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceSettings> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstanceSettings::new)
@@ -4906,7 +4867,7 @@ impl InstanceSettings {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InstanceTemplates;
 /// let client = InstanceTemplates::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -4955,15 +4916,13 @@ impl InstanceTemplates {
     /// Returns a builder for [InstanceTemplates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InstanceTemplates;
     /// let client = InstanceTemplates::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instance_templates::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::instance_templates::client::Factory,
-        )
+        crate::new_client_builder(super::builder::instance_templates::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4981,14 +4940,14 @@ impl InstanceTemplates {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InstanceTemplates>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InstanceTemplates>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -4998,13 +4957,13 @@ impl InstanceTemplates {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceTemplates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceTemplates> {
         super::transport::InstanceTemplates::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstanceTemplates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstanceTemplates> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstanceTemplates::new)
@@ -5073,7 +5032,7 @@ impl InstanceTemplates {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Instances;
 /// let client = Instances::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -5122,13 +5081,13 @@ impl Instances {
     /// Returns a builder for [Instances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Instances;
     /// let client = Instances::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instances::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::instances::client::Factory)
+        crate::new_client_builder(super::builder::instances::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5146,14 +5105,14 @@ impl Instances {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Instances>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Instances>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -5162,13 +5121,13 @@ impl Instances {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Instances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Instances> {
         super::transport::Instances::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Instances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Instances> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Instances::new)
@@ -5531,7 +5490,7 @@ impl Instances {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InstantSnapshots;
 /// let client = InstantSnapshots::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -5580,15 +5539,13 @@ impl InstantSnapshots {
     /// Returns a builder for [InstantSnapshots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InstantSnapshots;
     /// let client = InstantSnapshots::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::instant_snapshots::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::instant_snapshots::client::Factory,
-        )
+        crate::new_client_builder(super::builder::instant_snapshots::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5606,14 +5563,14 @@ impl InstantSnapshots {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InstantSnapshots>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InstantSnapshots>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -5623,13 +5580,13 @@ impl InstantSnapshots {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstantSnapshots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstantSnapshots> {
         super::transport::InstantSnapshots::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InstantSnapshots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InstantSnapshots> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InstantSnapshots::new)
@@ -5705,7 +5662,7 @@ impl InstantSnapshots {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InterconnectAttachmentGroups;
 /// let client = InterconnectAttachmentGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -5754,15 +5711,13 @@ impl InterconnectAttachmentGroups {
     /// Returns a builder for [InterconnectAttachmentGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InterconnectAttachmentGroups;
     /// let client = InterconnectAttachmentGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::interconnect_attachment_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::interconnect_attachment_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::interconnect_attachment_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5780,14 +5735,14 @@ impl InterconnectAttachmentGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::InterconnectAttachmentGroups>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -5798,13 +5753,13 @@ impl InterconnectAttachmentGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectAttachmentGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectAttachmentGroups> {
         super::transport::InterconnectAttachmentGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectAttachmentGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectAttachmentGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InterconnectAttachmentGroups::new)
@@ -5879,7 +5834,7 @@ impl InterconnectAttachmentGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InterconnectAttachments;
 /// let client = InterconnectAttachments::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -5928,15 +5883,13 @@ impl InterconnectAttachments {
     /// Returns a builder for [InterconnectAttachments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InterconnectAttachments;
     /// let client = InterconnectAttachments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::interconnect_attachments::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::interconnect_attachments::client::Factory,
-        )
+        crate::new_client_builder(super::builder::interconnect_attachments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -5954,16 +5907,15 @@ impl InterconnectAttachments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::InterconnectAttachments>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InterconnectAttachments>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -5972,13 +5924,13 @@ impl InterconnectAttachments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectAttachments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectAttachments> {
         super::transport::InterconnectAttachments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectAttachments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectAttachments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InterconnectAttachments::new)
@@ -6039,7 +5991,7 @@ impl InterconnectAttachments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InterconnectGroups;
 /// let client = InterconnectGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6088,15 +6040,13 @@ impl InterconnectGroups {
     /// Returns a builder for [InterconnectGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InterconnectGroups;
     /// let client = InterconnectGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::interconnect_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::interconnect_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::interconnect_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6114,14 +6064,14 @@ impl InterconnectGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InterconnectGroups>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InterconnectGroups>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -6131,13 +6081,13 @@ impl InterconnectGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectGroups> {
         super::transport::InterconnectGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InterconnectGroups::new)
@@ -6213,7 +6163,7 @@ impl InterconnectGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InterconnectLocations;
 /// let client = InterconnectLocations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6262,15 +6212,13 @@ impl InterconnectLocations {
     /// Returns a builder for [InterconnectLocations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InterconnectLocations;
     /// let client = InterconnectLocations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::interconnect_locations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::interconnect_locations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::interconnect_locations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6288,14 +6236,14 @@ impl InterconnectLocations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InterconnectLocations>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InterconnectLocations>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -6305,13 +6253,13 @@ impl InterconnectLocations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectLocations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectLocations> {
         super::transport::InterconnectLocations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectLocations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectLocations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InterconnectLocations::new)
@@ -6334,7 +6282,7 @@ impl InterconnectLocations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::InterconnectRemoteLocations;
 /// let client = InterconnectRemoteLocations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6383,15 +6331,13 @@ impl InterconnectRemoteLocations {
     /// Returns a builder for [InterconnectRemoteLocations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::InterconnectRemoteLocations;
     /// let client = InterconnectRemoteLocations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::interconnect_remote_locations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::interconnect_remote_locations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::interconnect_remote_locations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6409,14 +6355,14 @@ impl InterconnectRemoteLocations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::InterconnectRemoteLocations>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -6427,13 +6373,13 @@ impl InterconnectRemoteLocations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectRemoteLocations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectRemoteLocations> {
         super::transport::InterconnectRemoteLocations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InterconnectRemoteLocations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InterconnectRemoteLocations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InterconnectRemoteLocations::new)
@@ -6456,7 +6402,7 @@ impl InterconnectRemoteLocations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Interconnects;
 /// let client = Interconnects::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6505,13 +6451,13 @@ impl Interconnects {
     /// Returns a builder for [Interconnects].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Interconnects;
     /// let client = Interconnects::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::interconnects::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::interconnects::client::Factory)
+        crate::new_client_builder(super::builder::interconnects::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6529,14 +6475,14 @@ impl Interconnects {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Interconnects>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Interconnects>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -6545,13 +6491,13 @@ impl Interconnects {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Interconnects> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Interconnects> {
         super::transport::Interconnects::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Interconnects> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Interconnects> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Interconnects::new)
@@ -6624,7 +6570,7 @@ impl Interconnects {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::LicenseCodes;
 /// let client = LicenseCodes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6673,13 +6619,13 @@ impl LicenseCodes {
     /// Returns a builder for [LicenseCodes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::LicenseCodes;
     /// let client = LicenseCodes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::license_codes::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::license_codes::client::Factory)
+        crate::new_client_builder(super::builder::license_codes::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6697,14 +6643,14 @@ impl LicenseCodes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::LicenseCodes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::LicenseCodes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -6713,13 +6659,13 @@ impl LicenseCodes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LicenseCodes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LicenseCodes> {
         super::transport::LicenseCodes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LicenseCodes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LicenseCodes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::LicenseCodes::new)
@@ -6747,7 +6693,7 @@ impl LicenseCodes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Licenses;
 /// let client = Licenses::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6796,13 +6742,13 @@ impl Licenses {
     /// Returns a builder for [Licenses].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Licenses;
     /// let client = Licenses::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::licenses::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::licenses::client::Factory)
+        crate::new_client_builder(super::builder::licenses::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -6820,14 +6766,14 @@ impl Licenses {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Licenses>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Licenses>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -6836,13 +6782,13 @@ impl Licenses {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Licenses> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Licenses> {
         super::transport::Licenses::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Licenses> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Licenses> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Licenses::new)
@@ -6929,7 +6875,7 @@ impl Licenses {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::MachineImages;
 /// let client = MachineImages::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -6978,13 +6924,13 @@ impl MachineImages {
     /// Returns a builder for [MachineImages].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::MachineImages;
     /// let client = MachineImages::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::machine_images::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::machine_images::client::Factory)
+        crate::new_client_builder(super::builder::machine_images::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7002,14 +6948,14 @@ impl MachineImages {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MachineImages>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MachineImages>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -7018,13 +6964,13 @@ impl MachineImages {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MachineImages> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MachineImages> {
         super::transport::MachineImages::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MachineImages> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MachineImages> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MachineImages::new)
@@ -7089,7 +7035,7 @@ impl MachineImages {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::MachineTypes;
 /// let client = MachineTypes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -7138,13 +7084,13 @@ impl MachineTypes {
     /// Returns a builder for [MachineTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::MachineTypes;
     /// let client = MachineTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::machine_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::machine_types::client::Factory)
+        crate::new_client_builder(super::builder::machine_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7162,14 +7108,14 @@ impl MachineTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MachineTypes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MachineTypes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -7178,13 +7124,13 @@ impl MachineTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MachineTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MachineTypes> {
         super::transport::MachineTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MachineTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MachineTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MachineTypes::new)
@@ -7214,7 +7160,7 @@ impl MachineTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NetworkAttachments;
 /// let client = NetworkAttachments::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -7263,15 +7209,13 @@ impl NetworkAttachments {
     /// Returns a builder for [NetworkAttachments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NetworkAttachments;
     /// let client = NetworkAttachments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::network_attachments::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::network_attachments::client::Factory,
-        )
+        crate::new_client_builder(super::builder::network_attachments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7289,14 +7233,14 @@ impl NetworkAttachments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NetworkAttachments>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NetworkAttachments>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -7306,13 +7250,13 @@ impl NetworkAttachments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkAttachments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkAttachments> {
         super::transport::NetworkAttachments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkAttachments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkAttachments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NetworkAttachments::new)
@@ -7383,7 +7327,7 @@ impl NetworkAttachments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NetworkEdgeSecurityServices;
 /// let client = NetworkEdgeSecurityServices::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -7432,15 +7376,13 @@ impl NetworkEdgeSecurityServices {
     /// Returns a builder for [NetworkEdgeSecurityServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NetworkEdgeSecurityServices;
     /// let client = NetworkEdgeSecurityServices::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::network_edge_security_services::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::network_edge_security_services::client::Factory,
-        )
+        crate::new_client_builder(super::builder::network_edge_security_services::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7458,14 +7400,14 @@ impl NetworkEdgeSecurityServices {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::NetworkEdgeSecurityServices>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -7476,13 +7418,13 @@ impl NetworkEdgeSecurityServices {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkEdgeSecurityServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkEdgeSecurityServices> {
         super::transport::NetworkEdgeSecurityServices::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkEdgeSecurityServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkEdgeSecurityServices> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NetworkEdgeSecurityServices::new)
@@ -7530,7 +7472,7 @@ impl NetworkEdgeSecurityServices {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NetworkEndpointGroups;
 /// let client = NetworkEndpointGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -7579,15 +7521,13 @@ impl NetworkEndpointGroups {
     /// Returns a builder for [NetworkEndpointGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NetworkEndpointGroups;
     /// let client = NetworkEndpointGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::network_endpoint_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::network_endpoint_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::network_endpoint_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7605,14 +7545,14 @@ impl NetworkEndpointGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NetworkEndpointGroups>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NetworkEndpointGroups>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -7622,13 +7562,13 @@ impl NetworkEndpointGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkEndpointGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkEndpointGroups> {
         super::transport::NetworkEndpointGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkEndpointGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkEndpointGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NetworkEndpointGroups::new)
@@ -7706,7 +7646,7 @@ impl NetworkEndpointGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NetworkFirewallPolicies;
 /// let client = NetworkFirewallPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -7755,15 +7695,13 @@ impl NetworkFirewallPolicies {
     /// Returns a builder for [NetworkFirewallPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NetworkFirewallPolicies;
     /// let client = NetworkFirewallPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::network_firewall_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::network_firewall_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::network_firewall_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -7781,16 +7719,15 @@ impl NetworkFirewallPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::NetworkFirewallPolicies>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NetworkFirewallPolicies>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -7799,13 +7736,13 @@ impl NetworkFirewallPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkFirewallPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkFirewallPolicies> {
         super::transport::NetworkFirewallPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkFirewallPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkFirewallPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NetworkFirewallPolicies::new)
@@ -7948,7 +7885,7 @@ impl NetworkFirewallPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NetworkProfiles;
 /// let client = NetworkProfiles::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -7997,15 +7934,13 @@ impl NetworkProfiles {
     /// Returns a builder for [NetworkProfiles].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NetworkProfiles;
     /// let client = NetworkProfiles::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::network_profiles::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::network_profiles::client::Factory,
-        )
+        crate::new_client_builder(super::builder::network_profiles::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8023,15 +7958,14 @@ impl NetworkProfiles {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NetworkProfiles>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NetworkProfiles>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -8040,13 +7974,13 @@ impl NetworkProfiles {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkProfiles> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkProfiles> {
         super::transport::NetworkProfiles::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetworkProfiles> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetworkProfiles> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NetworkProfiles::new)
@@ -8068,7 +8002,7 @@ impl NetworkProfiles {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Networks;
 /// let client = Networks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -8117,13 +8051,13 @@ impl Networks {
     /// Returns a builder for [Networks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Networks;
     /// let client = Networks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::networks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::networks::client::Factory)
+        crate::new_client_builder(super::builder::networks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8141,14 +8075,14 @@ impl Networks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Networks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Networks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -8157,13 +8091,13 @@ impl Networks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Networks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Networks> {
         super::transport::Networks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Networks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Networks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Networks::new)
@@ -8244,7 +8178,7 @@ impl Networks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NodeGroups;
 /// let client = NodeGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -8293,13 +8227,13 @@ impl NodeGroups {
     /// Returns a builder for [NodeGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NodeGroups;
     /// let client = NodeGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::node_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::node_groups::client::Factory)
+        crate::new_client_builder(super::builder::node_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8317,14 +8251,14 @@ impl NodeGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NodeGroups>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NodeGroups>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -8333,13 +8267,13 @@ impl NodeGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeGroups> {
         super::transport::NodeGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NodeGroups::new)
@@ -8443,7 +8377,7 @@ impl NodeGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NodeTemplates;
 /// let client = NodeTemplates::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -8492,13 +8426,13 @@ impl NodeTemplates {
     /// Returns a builder for [NodeTemplates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NodeTemplates;
     /// let client = NodeTemplates::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::node_templates::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::node_templates::client::Factory)
+        crate::new_client_builder(super::builder::node_templates::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8516,14 +8450,14 @@ impl NodeTemplates {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NodeTemplates>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NodeTemplates>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -8532,13 +8466,13 @@ impl NodeTemplates {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeTemplates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeTemplates> {
         super::transport::NodeTemplates::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeTemplates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeTemplates> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NodeTemplates::new)
@@ -8601,7 +8535,7 @@ impl NodeTemplates {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::NodeTypes;
 /// let client = NodeTypes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -8650,13 +8584,13 @@ impl NodeTypes {
     /// Returns a builder for [NodeTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::NodeTypes;
     /// let client = NodeTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::node_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::node_types::client::Factory)
+        crate::new_client_builder(super::builder::node_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8674,14 +8608,14 @@ impl NodeTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NodeTypes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NodeTypes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -8690,13 +8624,13 @@ impl NodeTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeTypes> {
         super::transport::NodeTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NodeTypes::new)
@@ -8726,7 +8660,7 @@ impl NodeTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::OrganizationSecurityPolicies;
 /// let client = OrganizationSecurityPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -8775,15 +8709,13 @@ impl OrganizationSecurityPolicies {
     /// Returns a builder for [OrganizationSecurityPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::OrganizationSecurityPolicies;
     /// let client = OrganizationSecurityPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::organization_security_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::organization_security_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::organization_security_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -8801,14 +8733,14 @@ impl OrganizationSecurityPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::OrganizationSecurityPolicies>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -8819,13 +8751,13 @@ impl OrganizationSecurityPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::OrganizationSecurityPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::OrganizationSecurityPolicies> {
         super::transport::OrganizationSecurityPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::OrganizationSecurityPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::OrganizationSecurityPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::OrganizationSecurityPolicies::new)
@@ -9008,7 +8940,7 @@ impl OrganizationSecurityPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::PacketMirrorings;
 /// let client = PacketMirrorings::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -9057,15 +8989,13 @@ impl PacketMirrorings {
     /// Returns a builder for [PacketMirrorings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::PacketMirrorings;
     /// let client = PacketMirrorings::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::packet_mirrorings::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::packet_mirrorings::client::Factory,
-        )
+        crate::new_client_builder(super::builder::packet_mirrorings::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9083,14 +9013,14 @@ impl PacketMirrorings {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::PacketMirrorings>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::PacketMirrorings>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -9100,13 +9030,13 @@ impl PacketMirrorings {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PacketMirrorings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PacketMirrorings> {
         super::transport::PacketMirrorings::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PacketMirrorings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PacketMirrorings> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PacketMirrorings::new)
@@ -9165,7 +9095,7 @@ impl PacketMirrorings {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::PreviewFeatures;
 /// let client = PreviewFeatures::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -9214,15 +9144,13 @@ impl PreviewFeatures {
     /// Returns a builder for [PreviewFeatures].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::PreviewFeatures;
     /// let client = PreviewFeatures::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::preview_features::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::preview_features::client::Factory,
-        )
+        crate::new_client_builder(super::builder::preview_features::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9240,15 +9168,14 @@ impl PreviewFeatures {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::PreviewFeatures>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::PreviewFeatures>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -9257,13 +9184,13 @@ impl PreviewFeatures {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PreviewFeatures> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PreviewFeatures> {
         super::transport::PreviewFeatures::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PreviewFeatures> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PreviewFeatures> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PreviewFeatures::new)
@@ -9295,7 +9222,7 @@ impl PreviewFeatures {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Projects;
 /// let client = Projects::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -9344,13 +9271,13 @@ impl Projects {
     /// Returns a builder for [Projects].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Projects;
     /// let client = Projects::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::projects::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::projects::client::Factory)
+        crate::new_client_builder(super::builder::projects::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9368,14 +9295,14 @@ impl Projects {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Projects>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Projects>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -9384,13 +9311,13 @@ impl Projects {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Projects> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Projects> {
         super::transport::Projects::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Projects> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Projects> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Projects::new)
@@ -9520,7 +9447,7 @@ impl Projects {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::PublicAdvertisedPrefixes;
 /// let client = PublicAdvertisedPrefixes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -9569,15 +9496,13 @@ impl PublicAdvertisedPrefixes {
     /// Returns a builder for [PublicAdvertisedPrefixes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::PublicAdvertisedPrefixes;
     /// let client = PublicAdvertisedPrefixes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::public_advertised_prefixes::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::public_advertised_prefixes::client::Factory,
-        )
+        crate::new_client_builder(super::builder::public_advertised_prefixes::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9595,14 +9520,14 @@ impl PublicAdvertisedPrefixes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::PublicAdvertisedPrefixes>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -9613,13 +9538,13 @@ impl PublicAdvertisedPrefixes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PublicAdvertisedPrefixes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PublicAdvertisedPrefixes> {
         super::transport::PublicAdvertisedPrefixes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PublicAdvertisedPrefixes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PublicAdvertisedPrefixes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PublicAdvertisedPrefixes::new)
@@ -9674,7 +9599,7 @@ impl PublicAdvertisedPrefixes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::PublicDelegatedPrefixes;
 /// let client = PublicDelegatedPrefixes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -9723,15 +9648,13 @@ impl PublicDelegatedPrefixes {
     /// Returns a builder for [PublicDelegatedPrefixes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::PublicDelegatedPrefixes;
     /// let client = PublicDelegatedPrefixes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::public_delegated_prefixes::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::public_delegated_prefixes::client::Factory,
-        )
+        crate::new_client_builder(super::builder::public_delegated_prefixes::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9749,16 +9672,15 @@ impl PublicDelegatedPrefixes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::PublicDelegatedPrefixes>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::PublicDelegatedPrefixes>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -9767,13 +9689,13 @@ impl PublicDelegatedPrefixes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PublicDelegatedPrefixes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PublicDelegatedPrefixes> {
         super::transport::PublicDelegatedPrefixes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PublicDelegatedPrefixes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PublicDelegatedPrefixes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PublicDelegatedPrefixes::new)
@@ -9837,7 +9759,7 @@ impl PublicDelegatedPrefixes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionAutoscalers;
 /// let client = RegionAutoscalers::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -9886,15 +9808,13 @@ impl RegionAutoscalers {
     /// Returns a builder for [RegionAutoscalers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionAutoscalers;
     /// let client = RegionAutoscalers::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_autoscalers::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_autoscalers::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_autoscalers::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -9912,14 +9832,14 @@ impl RegionAutoscalers {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionAutoscalers>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionAutoscalers>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -9929,13 +9849,13 @@ impl RegionAutoscalers {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionAutoscalers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionAutoscalers> {
         super::transport::RegionAutoscalers::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionAutoscalers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionAutoscalers> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionAutoscalers::new)
@@ -9992,7 +9912,7 @@ impl RegionAutoscalers {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionBackendServices;
 /// let client = RegionBackendServices::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -10041,15 +9961,13 @@ impl RegionBackendServices {
     /// Returns a builder for [RegionBackendServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionBackendServices;
     /// let client = RegionBackendServices::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_backend_services::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_backend_services::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_backend_services::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -10067,14 +9985,14 @@ impl RegionBackendServices {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionBackendServices>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionBackendServices>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -10084,13 +10002,13 @@ impl RegionBackendServices {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionBackendServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionBackendServices> {
         super::transport::RegionBackendServices::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionBackendServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionBackendServices> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionBackendServices::new)
@@ -10186,7 +10104,7 @@ impl RegionBackendServices {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionCommitments;
 /// let client = RegionCommitments::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -10235,15 +10153,13 @@ impl RegionCommitments {
     /// Returns a builder for [RegionCommitments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionCommitments;
     /// let client = RegionCommitments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_commitments::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_commitments::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_commitments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -10261,14 +10177,14 @@ impl RegionCommitments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionCommitments>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionCommitments>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -10278,13 +10194,13 @@ impl RegionCommitments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionCommitments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionCommitments> {
         super::transport::RegionCommitments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionCommitments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionCommitments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionCommitments::new)
@@ -10332,7 +10248,7 @@ impl RegionCommitments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionDiskTypes;
 /// let client = RegionDiskTypes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -10381,15 +10297,13 @@ impl RegionDiskTypes {
     /// Returns a builder for [RegionDiskTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionDiskTypes;
     /// let client = RegionDiskTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_disk_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_disk_types::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_disk_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -10407,15 +10321,14 @@ impl RegionDiskTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionDiskTypes>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionDiskTypes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -10424,13 +10337,13 @@ impl RegionDiskTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionDiskTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionDiskTypes> {
         super::transport::RegionDiskTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionDiskTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionDiskTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionDiskTypes::new)
@@ -10451,7 +10364,7 @@ impl RegionDiskTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionDisks;
 /// let client = RegionDisks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -10500,13 +10413,13 @@ impl RegionDisks {
     /// Returns a builder for [RegionDisks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionDisks;
     /// let client = RegionDisks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_disks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::region_disks::client::Factory)
+        crate::new_client_builder(super::builder::region_disks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -10524,14 +10437,14 @@ impl RegionDisks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionDisks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionDisks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -10540,13 +10453,13 @@ impl RegionDisks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionDisks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionDisks> {
         super::transport::RegionDisks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionDisks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionDisks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionDisks::new)
@@ -10667,7 +10580,7 @@ impl RegionDisks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionHealthCheckServices;
 /// let client = RegionHealthCheckServices::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -10716,15 +10629,13 @@ impl RegionHealthCheckServices {
     /// Returns a builder for [RegionHealthCheckServices].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionHealthCheckServices;
     /// let client = RegionHealthCheckServices::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_health_check_services::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_health_check_services::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_health_check_services::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -10742,14 +10653,14 @@ impl RegionHealthCheckServices {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RegionHealthCheckServices>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -10760,13 +10671,13 @@ impl RegionHealthCheckServices {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionHealthCheckServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionHealthCheckServices> {
         super::transport::RegionHealthCheckServices::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionHealthCheckServices> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionHealthCheckServices> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionHealthCheckServices::new)
@@ -10819,7 +10730,7 @@ impl RegionHealthCheckServices {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionHealthChecks;
 /// let client = RegionHealthChecks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -10868,15 +10779,13 @@ impl RegionHealthChecks {
     /// Returns a builder for [RegionHealthChecks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionHealthChecks;
     /// let client = RegionHealthChecks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_health_checks::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_health_checks::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_health_checks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -10894,14 +10803,14 @@ impl RegionHealthChecks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionHealthChecks>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionHealthChecks>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -10911,13 +10820,13 @@ impl RegionHealthChecks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionHealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionHealthChecks> {
         super::transport::RegionHealthChecks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionHealthChecks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionHealthChecks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionHealthChecks::new)
@@ -10974,7 +10883,7 @@ impl RegionHealthChecks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionInstanceGroupManagers;
 /// let client = RegionInstanceGroupManagers::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -11023,15 +10932,13 @@ impl RegionInstanceGroupManagers {
     /// Returns a builder for [RegionInstanceGroupManagers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionInstanceGroupManagers;
     /// let client = RegionInstanceGroupManagers::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_instance_group_managers::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_instance_group_managers::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_instance_group_managers::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -11049,14 +10956,14 @@ impl RegionInstanceGroupManagers {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RegionInstanceGroupManagers>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -11067,13 +10974,13 @@ impl RegionInstanceGroupManagers {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstanceGroupManagers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstanceGroupManagers> {
         super::transport::RegionInstanceGroupManagers::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstanceGroupManagers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstanceGroupManagers> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionInstanceGroupManagers::new)
@@ -11419,7 +11326,7 @@ impl RegionInstanceGroupManagers {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionInstanceGroups;
 /// let client = RegionInstanceGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -11468,15 +11375,13 @@ impl RegionInstanceGroups {
     /// Returns a builder for [RegionInstanceGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionInstanceGroups;
     /// let client = RegionInstanceGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_instance_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_instance_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_instance_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -11494,14 +11399,14 @@ impl RegionInstanceGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionInstanceGroups>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionInstanceGroups>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -11511,13 +11416,13 @@ impl RegionInstanceGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstanceGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstanceGroups> {
         super::transport::RegionInstanceGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstanceGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstanceGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionInstanceGroups::new)
@@ -11564,7 +11469,7 @@ impl RegionInstanceGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionInstanceTemplates;
 /// let client = RegionInstanceTemplates::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -11613,15 +11518,13 @@ impl RegionInstanceTemplates {
     /// Returns a builder for [RegionInstanceTemplates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionInstanceTemplates;
     /// let client = RegionInstanceTemplates::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_instance_templates::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_instance_templates::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_instance_templates::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -11639,16 +11542,15 @@ impl RegionInstanceTemplates {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::RegionInstanceTemplates>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionInstanceTemplates>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -11657,13 +11559,13 @@ impl RegionInstanceTemplates {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstanceTemplates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstanceTemplates> {
         super::transport::RegionInstanceTemplates::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstanceTemplates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstanceTemplates> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionInstanceTemplates::new)
@@ -11702,7 +11604,7 @@ impl RegionInstanceTemplates {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionInstances;
 /// let client = RegionInstances::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -11751,15 +11653,13 @@ impl RegionInstances {
     /// Returns a builder for [RegionInstances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionInstances;
     /// let client = RegionInstances::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_instances::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_instances::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_instances::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -11777,15 +11677,14 @@ impl RegionInstances {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionInstances>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionInstances>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -11794,13 +11693,13 @@ impl RegionInstances {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstances> {
         super::transport::RegionInstances::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstances> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionInstances::new)
@@ -11822,7 +11721,7 @@ impl RegionInstances {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionInstantSnapshots;
 /// let client = RegionInstantSnapshots::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -11871,15 +11770,13 @@ impl RegionInstantSnapshots {
     /// Returns a builder for [RegionInstantSnapshots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionInstantSnapshots;
     /// let client = RegionInstantSnapshots::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_instant_snapshots::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_instant_snapshots::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_instant_snapshots::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -11897,14 +11794,14 @@ impl RegionInstantSnapshots {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionInstantSnapshots>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionInstantSnapshots>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -11914,13 +11811,13 @@ impl RegionInstantSnapshots {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstantSnapshots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstantSnapshots> {
         super::transport::RegionInstantSnapshots::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionInstantSnapshots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionInstantSnapshots> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionInstantSnapshots::new)
@@ -11990,7 +11887,7 @@ impl RegionInstantSnapshots {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionNetworkEndpointGroups;
 /// let client = RegionNetworkEndpointGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -12039,15 +11936,13 @@ impl RegionNetworkEndpointGroups {
     /// Returns a builder for [RegionNetworkEndpointGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionNetworkEndpointGroups;
     /// let client = RegionNetworkEndpointGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_network_endpoint_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_network_endpoint_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_network_endpoint_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -12065,14 +11960,14 @@ impl RegionNetworkEndpointGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RegionNetworkEndpointGroups>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -12083,13 +11978,13 @@ impl RegionNetworkEndpointGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionNetworkEndpointGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionNetworkEndpointGroups> {
         super::transport::RegionNetworkEndpointGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionNetworkEndpointGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionNetworkEndpointGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionNetworkEndpointGroups::new)
@@ -12155,7 +12050,7 @@ impl RegionNetworkEndpointGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionNetworkFirewallPolicies;
 /// let client = RegionNetworkFirewallPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -12204,15 +12099,13 @@ impl RegionNetworkFirewallPolicies {
     /// Returns a builder for [RegionNetworkFirewallPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionNetworkFirewallPolicies;
     /// let client = RegionNetworkFirewallPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_network_firewall_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_network_firewall_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_network_firewall_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -12230,14 +12123,14 @@ impl RegionNetworkFirewallPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RegionNetworkFirewallPolicies>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -12248,13 +12141,13 @@ impl RegionNetworkFirewallPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionNetworkFirewallPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionNetworkFirewallPolicies> {
         super::transport::RegionNetworkFirewallPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionNetworkFirewallPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionNetworkFirewallPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionNetworkFirewallPolicies::new)
@@ -12372,7 +12265,7 @@ impl RegionNetworkFirewallPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionNotificationEndpoints;
 /// let client = RegionNotificationEndpoints::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -12421,15 +12314,13 @@ impl RegionNotificationEndpoints {
     /// Returns a builder for [RegionNotificationEndpoints].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionNotificationEndpoints;
     /// let client = RegionNotificationEndpoints::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_notification_endpoints::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_notification_endpoints::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_notification_endpoints::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -12447,14 +12338,14 @@ impl RegionNotificationEndpoints {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RegionNotificationEndpoints>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -12465,13 +12356,13 @@ impl RegionNotificationEndpoints {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionNotificationEndpoints> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionNotificationEndpoints> {
         super::transport::RegionNotificationEndpoints::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionNotificationEndpoints> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionNotificationEndpoints> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionNotificationEndpoints::new)
@@ -12515,7 +12406,7 @@ impl RegionNotificationEndpoints {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionOperations;
 /// let client = RegionOperations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -12564,15 +12455,13 @@ impl RegionOperations {
     /// Returns a builder for [RegionOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionOperations;
     /// let client = RegionOperations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_operations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_operations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_operations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -12590,14 +12479,14 @@ impl RegionOperations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionOperations>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionOperations>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -12607,13 +12496,13 @@ impl RegionOperations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionOperations> {
         super::transport::RegionOperations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionOperations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionOperations::new)
@@ -12662,7 +12551,7 @@ impl RegionOperations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionSecurityPolicies;
 /// let client = RegionSecurityPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -12711,15 +12600,13 @@ impl RegionSecurityPolicies {
     /// Returns a builder for [RegionSecurityPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionSecurityPolicies;
     /// let client = RegionSecurityPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_security_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_security_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_security_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -12737,14 +12624,14 @@ impl RegionSecurityPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionSecurityPolicies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionSecurityPolicies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -12754,13 +12641,13 @@ impl RegionSecurityPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionSecurityPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionSecurityPolicies> {
         super::transport::RegionSecurityPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionSecurityPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionSecurityPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionSecurityPolicies::new)
@@ -12835,7 +12722,7 @@ impl RegionSecurityPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionSslCertificates;
 /// let client = RegionSslCertificates::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -12884,15 +12771,13 @@ impl RegionSslCertificates {
     /// Returns a builder for [RegionSslCertificates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionSslCertificates;
     /// let client = RegionSslCertificates::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_ssl_certificates::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_ssl_certificates::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_ssl_certificates::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -12910,14 +12795,14 @@ impl RegionSslCertificates {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionSslCertificates>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionSslCertificates>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -12927,13 +12812,13 @@ impl RegionSslCertificates {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionSslCertificates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionSslCertificates> {
         super::transport::RegionSslCertificates::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionSslCertificates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionSslCertificates> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionSslCertificates::new)
@@ -12973,7 +12858,7 @@ impl RegionSslCertificates {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionSslPolicies;
 /// let client = RegionSslPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13022,15 +12907,13 @@ impl RegionSslPolicies {
     /// Returns a builder for [RegionSslPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionSslPolicies;
     /// let client = RegionSslPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_ssl_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_ssl_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_ssl_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13048,14 +12931,14 @@ impl RegionSslPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionSslPolicies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionSslPolicies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -13065,13 +12948,13 @@ impl RegionSslPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionSslPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionSslPolicies> {
         super::transport::RegionSslPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionSslPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionSslPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionSslPolicies::new)
@@ -13124,7 +13007,7 @@ impl RegionSslPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionTargetHttpProxies;
 /// let client = RegionTargetHttpProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13173,15 +13056,13 @@ impl RegionTargetHttpProxies {
     /// Returns a builder for [RegionTargetHttpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionTargetHttpProxies;
     /// let client = RegionTargetHttpProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_target_http_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_target_http_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_target_http_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13199,16 +13080,15 @@ impl RegionTargetHttpProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::RegionTargetHttpProxies>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionTargetHttpProxies>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -13217,13 +13097,13 @@ impl RegionTargetHttpProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionTargetHttpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionTargetHttpProxies> {
         super::transport::RegionTargetHttpProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionTargetHttpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionTargetHttpProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionTargetHttpProxies::new)
@@ -13266,7 +13146,7 @@ impl RegionTargetHttpProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionTargetHttpsProxies;
 /// let client = RegionTargetHttpsProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13315,15 +13195,13 @@ impl RegionTargetHttpsProxies {
     /// Returns a builder for [RegionTargetHttpsProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionTargetHttpsProxies;
     /// let client = RegionTargetHttpsProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_target_https_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_target_https_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_target_https_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13341,14 +13219,14 @@ impl RegionTargetHttpsProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::RegionTargetHttpsProxies>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -13359,13 +13237,13 @@ impl RegionTargetHttpsProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionTargetHttpsProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionTargetHttpsProxies> {
         super::transport::RegionTargetHttpsProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionTargetHttpsProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionTargetHttpsProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionTargetHttpsProxies::new)
@@ -13423,7 +13301,7 @@ impl RegionTargetHttpsProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionTargetTcpProxies;
 /// let client = RegionTargetTcpProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13472,15 +13350,13 @@ impl RegionTargetTcpProxies {
     /// Returns a builder for [RegionTargetTcpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionTargetTcpProxies;
     /// let client = RegionTargetTcpProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_target_tcp_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::region_target_tcp_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::region_target_tcp_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13498,14 +13374,14 @@ impl RegionTargetTcpProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionTargetTcpProxies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionTargetTcpProxies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -13515,13 +13391,13 @@ impl RegionTargetTcpProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionTargetTcpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionTargetTcpProxies> {
         super::transport::RegionTargetTcpProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionTargetTcpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionTargetTcpProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionTargetTcpProxies::new)
@@ -13559,7 +13435,7 @@ impl RegionTargetTcpProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionUrlMaps;
 /// let client = RegionUrlMaps::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13608,13 +13484,13 @@ impl RegionUrlMaps {
     /// Returns a builder for [RegionUrlMaps].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionUrlMaps;
     /// let client = RegionUrlMaps::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_url_maps::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::region_url_maps::client::Factory)
+        crate::new_client_builder(super::builder::region_url_maps::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13632,14 +13508,14 @@ impl RegionUrlMaps {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionUrlMaps>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionUrlMaps>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -13648,13 +13524,13 @@ impl RegionUrlMaps {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionUrlMaps> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionUrlMaps> {
         super::transport::RegionUrlMaps::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionUrlMaps> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionUrlMaps> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionUrlMaps::new)
@@ -13713,7 +13589,7 @@ impl RegionUrlMaps {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::RegionZones;
 /// let client = RegionZones::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13762,13 +13638,13 @@ impl RegionZones {
     /// Returns a builder for [RegionZones].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::RegionZones;
     /// let client = RegionZones::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::region_zones::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::region_zones::client::Factory)
+        crate::new_client_builder(super::builder::region_zones::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13786,14 +13662,14 @@ impl RegionZones {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RegionZones>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RegionZones>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -13802,13 +13678,13 @@ impl RegionZones {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionZones> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionZones> {
         super::transport::RegionZones::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RegionZones> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RegionZones> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RegionZones::new)
@@ -13825,7 +13701,7 @@ impl RegionZones {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Regions;
 /// let client = Regions::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -13874,13 +13750,13 @@ impl Regions {
     /// Returns a builder for [Regions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Regions;
     /// let client = Regions::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::regions::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::regions::client::Factory)
+        crate::new_client_builder(super::builder::regions::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -13898,14 +13774,14 @@ impl Regions {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Regions>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Regions>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -13914,13 +13790,13 @@ impl Regions {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Regions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Regions> {
         super::transport::Regions::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Regions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Regions> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Regions::new)
@@ -13976,7 +13852,7 @@ impl Regions {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ReservationBlocks;
 /// let client = ReservationBlocks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -14025,15 +13901,13 @@ impl ReservationBlocks {
     /// Returns a builder for [ReservationBlocks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ReservationBlocks;
     /// let client = ReservationBlocks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reservation_blocks::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::reservation_blocks::client::Factory,
-        )
+        crate::new_client_builder(super::builder::reservation_blocks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -14051,14 +13925,14 @@ impl ReservationBlocks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ReservationBlocks>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ReservationBlocks>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -14068,13 +13942,13 @@ impl ReservationBlocks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationBlocks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationBlocks> {
         super::transport::ReservationBlocks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationBlocks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationBlocks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReservationBlocks::new)
@@ -14122,7 +13996,7 @@ impl ReservationBlocks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ReservationSlots;
 /// let client = ReservationSlots::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -14171,15 +14045,13 @@ impl ReservationSlots {
     /// Returns a builder for [ReservationSlots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ReservationSlots;
     /// let client = ReservationSlots::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reservation_slots::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::reservation_slots::client::Factory,
-        )
+        crate::new_client_builder(super::builder::reservation_slots::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -14197,14 +14069,14 @@ impl ReservationSlots {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ReservationSlots>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ReservationSlots>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -14214,13 +14086,13 @@ impl ReservationSlots {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationSlots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationSlots> {
         super::transport::ReservationSlots::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationSlots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationSlots> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReservationSlots::new)
@@ -14251,7 +14123,7 @@ impl ReservationSlots {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ReservationSubBlocks;
 /// let client = ReservationSubBlocks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -14300,15 +14172,13 @@ impl ReservationSubBlocks {
     /// Returns a builder for [ReservationSubBlocks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ReservationSubBlocks;
     /// let client = ReservationSubBlocks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reservation_sub_blocks::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::reservation_sub_blocks::client::Factory,
-        )
+        crate::new_client_builder(super::builder::reservation_sub_blocks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -14326,14 +14196,14 @@ impl ReservationSubBlocks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ReservationSubBlocks>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ReservationSubBlocks>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -14343,13 +14213,13 @@ impl ReservationSubBlocks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationSubBlocks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationSubBlocks> {
         super::transport::ReservationSubBlocks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ReservationSubBlocks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ReservationSubBlocks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ReservationSubBlocks::new)
@@ -14406,7 +14276,7 @@ impl ReservationSubBlocks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Reservations;
 /// let client = Reservations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -14455,13 +14325,13 @@ impl Reservations {
     /// Returns a builder for [Reservations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Reservations;
     /// let client = Reservations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::reservations::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::reservations::client::Factory)
+        crate::new_client_builder(super::builder::reservations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -14479,14 +14349,14 @@ impl Reservations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Reservations>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Reservations>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -14495,13 +14365,13 @@ impl Reservations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Reservations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Reservations> {
         super::transport::Reservations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Reservations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Reservations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Reservations::new)
@@ -14581,7 +14451,7 @@ impl Reservations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ResourcePolicies;
 /// let client = ResourcePolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -14630,15 +14500,13 @@ impl ResourcePolicies {
     /// Returns a builder for [ResourcePolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ResourcePolicies;
     /// let client = ResourcePolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::resource_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::resource_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::resource_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -14656,14 +14524,14 @@ impl ResourcePolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ResourcePolicies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ResourcePolicies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -14673,13 +14541,13 @@ impl ResourcePolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResourcePolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResourcePolicies> {
         super::transport::ResourcePolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResourcePolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResourcePolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ResourcePolicies::new)
@@ -14746,7 +14614,7 @@ impl ResourcePolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Routers;
 /// let client = Routers::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -14795,13 +14663,13 @@ impl Routers {
     /// Returns a builder for [Routers].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Routers;
     /// let client = Routers::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::routers::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::routers::client::Factory)
+        crate::new_client_builder(super::builder::routers::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -14819,14 +14687,14 @@ impl Routers {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Routers>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Routers>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -14835,13 +14703,13 @@ impl Routers {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Routers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Routers> {
         super::transport::Routers::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Routers> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Routers> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Routers::new)
@@ -14954,7 +14822,7 @@ impl Routers {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Routes;
 /// let client = Routes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15003,13 +14871,13 @@ impl Routes {
     /// Returns a builder for [Routes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Routes;
     /// let client = Routes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::routes::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::routes::client::Factory)
+        crate::new_client_builder(super::builder::routes::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15027,14 +14895,14 @@ impl Routes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Routes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Routes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -15043,13 +14911,13 @@ impl Routes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Routes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Routes> {
         super::transport::Routes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Routes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Routes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Routes::new)
@@ -15091,7 +14959,7 @@ impl Routes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::SecurityPolicies;
 /// let client = SecurityPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15140,15 +15008,13 @@ impl SecurityPolicies {
     /// Returns a builder for [SecurityPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::SecurityPolicies;
     /// let client = SecurityPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::security_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::security_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::security_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15166,14 +15032,14 @@ impl SecurityPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SecurityPolicies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SecurityPolicies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -15183,13 +15049,13 @@ impl SecurityPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SecurityPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SecurityPolicies> {
         super::transport::SecurityPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SecurityPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SecurityPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SecurityPolicies::new)
@@ -15280,7 +15146,7 @@ impl SecurityPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ServiceAttachments;
 /// let client = ServiceAttachments::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15329,15 +15195,13 @@ impl ServiceAttachments {
     /// Returns a builder for [ServiceAttachments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ServiceAttachments;
     /// let client = ServiceAttachments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::service_attachments::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::service_attachments::client::Factory,
-        )
+        crate::new_client_builder(super::builder::service_attachments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15355,14 +15219,14 @@ impl ServiceAttachments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ServiceAttachments>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ServiceAttachments>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -15372,13 +15236,13 @@ impl ServiceAttachments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceAttachments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceAttachments> {
         super::transport::ServiceAttachments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServiceAttachments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServiceAttachments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ServiceAttachments::new)
@@ -15449,7 +15313,7 @@ impl ServiceAttachments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::SnapshotSettings;
 /// let client = SnapshotSettings::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15498,15 +15362,13 @@ impl SnapshotSettings {
     /// Returns a builder for [SnapshotSettings].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::SnapshotSettings;
     /// let client = SnapshotSettings::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::snapshot_settings::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::snapshot_settings::client::Factory,
-        )
+        crate::new_client_builder(super::builder::snapshot_settings::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15524,14 +15386,14 @@ impl SnapshotSettings {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SnapshotSettings>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SnapshotSettings>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -15541,13 +15403,13 @@ impl SnapshotSettings {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SnapshotSettings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SnapshotSettings> {
         super::transport::SnapshotSettings::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SnapshotSettings> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SnapshotSettings> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SnapshotSettings::new)
@@ -15573,7 +15435,7 @@ impl SnapshotSettings {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Snapshots;
 /// let client = Snapshots::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15622,13 +15484,13 @@ impl Snapshots {
     /// Returns a builder for [Snapshots].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Snapshots;
     /// let client = Snapshots::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::snapshots::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::snapshots::client::Factory)
+        crate::new_client_builder(super::builder::snapshots::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15646,14 +15508,14 @@ impl Snapshots {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Snapshots>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Snapshots>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -15662,13 +15524,13 @@ impl Snapshots {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Snapshots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Snapshots> {
         super::transport::Snapshots::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Snapshots> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Snapshots> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Snapshots::new)
@@ -15739,7 +15601,7 @@ impl Snapshots {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::SslCertificates;
 /// let client = SslCertificates::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15788,15 +15650,13 @@ impl SslCertificates {
     /// Returns a builder for [SslCertificates].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::SslCertificates;
     /// let client = SslCertificates::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::ssl_certificates::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::ssl_certificates::client::Factory,
-        )
+        crate::new_client_builder(super::builder::ssl_certificates::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15814,15 +15674,14 @@ impl SslCertificates {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SslCertificates>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SslCertificates>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -15831,13 +15690,13 @@ impl SslCertificates {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SslCertificates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SslCertificates> {
         super::transport::SslCertificates::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SslCertificates> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SslCertificates> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SslCertificates::new)
@@ -15884,7 +15743,7 @@ impl SslCertificates {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::SslPolicies;
 /// let client = SslPolicies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -15933,13 +15792,13 @@ impl SslPolicies {
     /// Returns a builder for [SslPolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::SslPolicies;
     /// let client = SslPolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::ssl_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::ssl_policies::client::Factory)
+        crate::new_client_builder(super::builder::ssl_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -15957,14 +15816,14 @@ impl SslPolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SslPolicies>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SslPolicies>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -15973,13 +15832,13 @@ impl SslPolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SslPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SslPolicies> {
         super::transport::SslPolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SslPolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SslPolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SslPolicies::new)
@@ -16038,7 +15897,7 @@ impl SslPolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::StoragePoolTypes;
 /// let client = StoragePoolTypes::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -16087,15 +15946,13 @@ impl StoragePoolTypes {
     /// Returns a builder for [StoragePoolTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::StoragePoolTypes;
     /// let client = StoragePoolTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::storage_pool_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::storage_pool_types::client::Factory,
-        )
+        crate::new_client_builder(super::builder::storage_pool_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -16113,14 +15970,14 @@ impl StoragePoolTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::StoragePoolTypes>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::StoragePoolTypes>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -16130,13 +15987,13 @@ impl StoragePoolTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::StoragePoolTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::StoragePoolTypes> {
         super::transport::StoragePoolTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::StoragePoolTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::StoragePoolTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::StoragePoolTypes::new)
@@ -16166,7 +16023,7 @@ impl StoragePoolTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::StoragePools;
 /// let client = StoragePools::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -16215,13 +16072,13 @@ impl StoragePools {
     /// Returns a builder for [StoragePools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::StoragePools;
     /// let client = StoragePools::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::storage_pools::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::storage_pools::client::Factory)
+        crate::new_client_builder(super::builder::storage_pools::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -16239,14 +16096,14 @@ impl StoragePools {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::StoragePools>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::StoragePools>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -16255,13 +16112,13 @@ impl StoragePools {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::StoragePools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::StoragePools> {
         super::transport::StoragePools::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::StoragePools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::StoragePools> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::StoragePools::new)
@@ -16343,7 +16200,7 @@ impl StoragePools {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Subnetworks;
 /// let client = Subnetworks::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -16392,13 +16249,13 @@ impl Subnetworks {
     /// Returns a builder for [Subnetworks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Subnetworks;
     /// let client = Subnetworks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::subnetworks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::subnetworks::client::Factory)
+        crate::new_client_builder(super::builder::subnetworks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -16416,14 +16273,14 @@ impl Subnetworks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Subnetworks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Subnetworks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -16432,13 +16289,13 @@ impl Subnetworks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Subnetworks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Subnetworks> {
         super::transport::Subnetworks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Subnetworks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Subnetworks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Subnetworks::new)
@@ -16528,7 +16385,7 @@ impl Subnetworks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetGrpcProxies;
 /// let client = TargetGrpcProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -16577,15 +16434,13 @@ impl TargetGrpcProxies {
     /// Returns a builder for [TargetGrpcProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetGrpcProxies;
     /// let client = TargetGrpcProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_grpc_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_grpc_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_grpc_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -16603,14 +16458,14 @@ impl TargetGrpcProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetGrpcProxies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetGrpcProxies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -16620,13 +16475,13 @@ impl TargetGrpcProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetGrpcProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetGrpcProxies> {
         super::transport::TargetGrpcProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetGrpcProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetGrpcProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetGrpcProxies::new)
@@ -16671,7 +16526,7 @@ impl TargetGrpcProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetHttpProxies;
 /// let client = TargetHttpProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -16720,15 +16575,13 @@ impl TargetHttpProxies {
     /// Returns a builder for [TargetHttpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetHttpProxies;
     /// let client = TargetHttpProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_http_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_http_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_http_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -16746,14 +16599,14 @@ impl TargetHttpProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetHttpProxies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetHttpProxies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -16763,13 +16616,13 @@ impl TargetHttpProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetHttpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetHttpProxies> {
         super::transport::TargetHttpProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetHttpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetHttpProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetHttpProxies::new)
@@ -16829,7 +16682,7 @@ impl TargetHttpProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetHttpsProxies;
 /// let client = TargetHttpsProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -16878,15 +16731,13 @@ impl TargetHttpsProxies {
     /// Returns a builder for [TargetHttpsProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetHttpsProxies;
     /// let client = TargetHttpsProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_https_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_https_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_https_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -16904,14 +16755,14 @@ impl TargetHttpsProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetHttpsProxies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetHttpsProxies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -16921,13 +16772,13 @@ impl TargetHttpsProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetHttpsProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetHttpsProxies> {
         super::transport::TargetHttpsProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetHttpsProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetHttpsProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetHttpsProxies::new)
@@ -17010,7 +16861,7 @@ impl TargetHttpsProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetInstances;
 /// let client = TargetInstances::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -17059,15 +16910,13 @@ impl TargetInstances {
     /// Returns a builder for [TargetInstances].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetInstances;
     /// let client = TargetInstances::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_instances::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_instances::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_instances::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -17085,15 +16934,14 @@ impl TargetInstances {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetInstances>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetInstances>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -17102,13 +16950,13 @@ impl TargetInstances {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetInstances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetInstances> {
         super::transport::TargetInstances::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetInstances> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetInstances> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetInstances::new)
@@ -17166,7 +17014,7 @@ impl TargetInstances {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetPools;
 /// let client = TargetPools::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -17215,13 +17063,13 @@ impl TargetPools {
     /// Returns a builder for [TargetPools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetPools;
     /// let client = TargetPools::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_pools::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::target_pools::client::Factory)
+        crate::new_client_builder(super::builder::target_pools::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -17239,14 +17087,14 @@ impl TargetPools {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetPools>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetPools>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -17255,13 +17103,13 @@ impl TargetPools {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetPools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetPools> {
         super::transport::TargetPools::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetPools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetPools> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetPools::new)
@@ -17350,7 +17198,7 @@ impl TargetPools {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetSslProxies;
 /// let client = TargetSslProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -17399,15 +17247,13 @@ impl TargetSslProxies {
     /// Returns a builder for [TargetSslProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetSslProxies;
     /// let client = TargetSslProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_ssl_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_ssl_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_ssl_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -17425,14 +17271,14 @@ impl TargetSslProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetSslProxies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetSslProxies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -17442,13 +17288,13 @@ impl TargetSslProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetSslProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetSslProxies> {
         super::transport::TargetSslProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetSslProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetSslProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetSslProxies::new)
@@ -17519,7 +17365,7 @@ impl TargetSslProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetTcpProxies;
 /// let client = TargetTcpProxies::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -17568,15 +17414,13 @@ impl TargetTcpProxies {
     /// Returns a builder for [TargetTcpProxies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetTcpProxies;
     /// let client = TargetTcpProxies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_tcp_proxies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_tcp_proxies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_tcp_proxies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -17594,14 +17438,14 @@ impl TargetTcpProxies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetTcpProxies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetTcpProxies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -17611,13 +17455,13 @@ impl TargetTcpProxies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetTcpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetTcpProxies> {
         super::transport::TargetTcpProxies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetTcpProxies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetTcpProxies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetTcpProxies::new)
@@ -17679,7 +17523,7 @@ impl TargetTcpProxies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::TargetVpnGateways;
 /// let client = TargetVpnGateways::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -17728,15 +17572,13 @@ impl TargetVpnGateways {
     /// Returns a builder for [TargetVpnGateways].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::TargetVpnGateways;
     /// let client = TargetVpnGateways::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::target_vpn_gateways::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::target_vpn_gateways::client::Factory,
-        )
+        crate::new_client_builder(super::builder::target_vpn_gateways::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -17754,14 +17596,14 @@ impl TargetVpnGateways {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TargetVpnGateways>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TargetVpnGateways>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -17771,13 +17613,13 @@ impl TargetVpnGateways {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetVpnGateways> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetVpnGateways> {
         super::transport::TargetVpnGateways::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TargetVpnGateways> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TargetVpnGateways> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TargetVpnGateways::new)
@@ -17829,7 +17671,7 @@ impl TargetVpnGateways {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::UrlMaps;
 /// let client = UrlMaps::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -17878,13 +17720,13 @@ impl UrlMaps {
     /// Returns a builder for [UrlMaps].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::UrlMaps;
     /// let client = UrlMaps::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::url_maps::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::url_maps::client::Factory)
+        crate::new_client_builder(super::builder::url_maps::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -17902,14 +17744,14 @@ impl UrlMaps {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::UrlMaps>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::UrlMaps>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -17918,13 +17760,13 @@ impl UrlMaps {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::UrlMaps> {
+    ) -> crate::ClientBuilderResult<impl super::stub::UrlMaps> {
         super::transport::UrlMaps::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::UrlMaps> {
+    ) -> crate::ClientBuilderResult<impl super::stub::UrlMaps> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::UrlMaps::new)
@@ -18006,7 +17848,7 @@ impl UrlMaps {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::VpnGateways;
 /// let client = VpnGateways::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -18055,13 +17897,13 @@ impl VpnGateways {
     /// Returns a builder for [VpnGateways].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::VpnGateways;
     /// let client = VpnGateways::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::vpn_gateways::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::vpn_gateways::client::Factory)
+        crate::new_client_builder(super::builder::vpn_gateways::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -18079,14 +17921,14 @@ impl VpnGateways {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::VpnGateways>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::VpnGateways>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -18095,13 +17937,13 @@ impl VpnGateways {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VpnGateways> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VpnGateways> {
         super::transport::VpnGateways::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VpnGateways> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VpnGateways> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::VpnGateways::new)
@@ -18163,7 +18005,7 @@ impl VpnGateways {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::VpnTunnels;
 /// let client = VpnTunnels::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -18212,13 +18054,13 @@ impl VpnTunnels {
     /// Returns a builder for [VpnTunnels].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::VpnTunnels;
     /// let client = VpnTunnels::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::vpn_tunnels::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::vpn_tunnels::client::Factory)
+        crate::new_client_builder(super::builder::vpn_tunnels::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -18236,14 +18078,14 @@ impl VpnTunnels {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::VpnTunnels>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::VpnTunnels>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -18252,13 +18094,13 @@ impl VpnTunnels {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VpnTunnels> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VpnTunnels> {
         super::transport::VpnTunnels::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::VpnTunnels> {
+    ) -> crate::ClientBuilderResult<impl super::stub::VpnTunnels> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::VpnTunnels::new)
@@ -18310,7 +18152,7 @@ impl VpnTunnels {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::WireGroups;
 /// let client = WireGroups::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -18359,13 +18201,13 @@ impl WireGroups {
     /// Returns a builder for [WireGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::WireGroups;
     /// let client = WireGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::wire_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::wire_groups::client::Factory)
+        crate::new_client_builder(super::builder::wire_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -18383,14 +18225,14 @@ impl WireGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::WireGroups>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::WireGroups>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -18399,13 +18241,13 @@ impl WireGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::WireGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::WireGroups> {
         super::transport::WireGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::WireGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::WireGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::WireGroups::new)
@@ -18450,7 +18292,7 @@ impl WireGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::ZoneOperations;
 /// let client = ZoneOperations::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -18499,13 +18341,13 @@ impl ZoneOperations {
     /// Returns a builder for [ZoneOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::ZoneOperations;
     /// let client = ZoneOperations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::zone_operations::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::zone_operations::client::Factory)
+        crate::new_client_builder(super::builder::zone_operations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -18523,14 +18365,14 @@ impl ZoneOperations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ZoneOperations>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ZoneOperations>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -18539,13 +18381,13 @@ impl ZoneOperations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ZoneOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ZoneOperations> {
         super::transport::ZoneOperations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ZoneOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ZoneOperations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ZoneOperations::new)
@@ -18593,7 +18435,7 @@ impl ZoneOperations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_compute_v1::client::Zones;
 /// let client = Zones::builder().build().await?;
 /// // use `client` to make requests to the Google Compute Engine API.
@@ -18642,13 +18484,13 @@ impl Zones {
     /// Returns a builder for [Zones].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_compute_v1::client::Zones;
     /// let client = Zones::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::zones::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::zones::client::Factory)
+        crate::new_client_builder(super::builder::zones::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -18666,14 +18508,14 @@ impl Zones {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Zones>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Zones>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -18682,13 +18524,13 @@ impl Zones {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Zones> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Zones> {
         super::transport::Zones::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Zones> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Zones> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Zones::new)
diff --git a/src/generated/cloud/compute/v1/src/lib.rs b/src/generated/cloud/compute/v1/src/lib.rs
index 5dbf28b437..7f2031de72 100644
--- a/src/generated/cloud/compute/v1/src/lib.rs
+++ b/src/generated/cloud/compute/v1/src/lib.rs
@@ -162,8 +162,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -427,5 +427,15 @@ pub(crate) mod info {
     }
 }
 
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
+
 pub mod errors;
+
 pub mod operation;
diff --git a/src/generated/cloud/compute/v1/src/model.rs b/src/generated/cloud/compute/v1/src/model.rs
index 311013f591..73ab869422 100644
--- a/src/generated/cloud/compute/v1/src/model.rs
+++ b/src/generated/cloud/compute/v1/src/model.rs
@@ -21,8 +21,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_lro;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
@@ -1319,7 +1319,7 @@ impl wkt::message::Message for AcceleratorTypeAggregatedList {
 
 #[cfg(feature = "accelerator-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AcceleratorTypeAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for AcceleratorTypeAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::AcceleratorTypesScopedList,
@@ -2231,7 +2231,7 @@ impl wkt::message::Message for AcceleratorTypeList {
 
 #[cfg(feature = "accelerator-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AcceleratorTypeList {
+impl google_cloud_gax::paginator::internal::PageableResponse for AcceleratorTypeList {
     type PageItem = crate::model::AcceleratorType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6478,7 +6478,7 @@ impl wkt::message::Message for AddressAggregatedList {
 
 #[cfg(feature = "addresses")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AddressAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for AddressAggregatedList {
     type PageItem = (std::string::String, crate::model::AddressesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7387,7 +7387,7 @@ impl wkt::message::Message for AddressList {
 
 #[cfg(any(feature = "addresses", feature = "global-addresses",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AddressList {
+impl google_cloud_gax::paginator::internal::PageableResponse for AddressList {
     type PageItem = crate::model::Address;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -16277,7 +16277,7 @@ impl wkt::message::Message for AutoscalerAggregatedList {
 
 #[cfg(feature = "autoscalers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AutoscalerAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for AutoscalerAggregatedList {
     type PageItem = (std::string::String, crate::model::AutoscalersScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17186,7 +17186,7 @@ impl wkt::message::Message for AutoscalerList {
 
 #[cfg(feature = "autoscalers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AutoscalerList {
+impl google_cloud_gax::paginator::internal::PageableResponse for AutoscalerList {
     type PageItem = crate::model::Autoscaler;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23491,7 +23491,7 @@ impl wkt::message::Message for BackendBucketList {
 
 #[cfg(feature = "backend-buckets")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for BackendBucketList {
+impl google_cloud_gax::paginator::internal::PageableResponse for BackendBucketList {
     type PageItem = crate::model::BackendBucket;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -27986,7 +27986,7 @@ impl wkt::message::Message for BackendServiceAggregatedList {
 
 #[cfg(feature = "backend-services")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for BackendServiceAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for BackendServiceAggregatedList {
     type PageItem = (std::string::String, crate::model::BackendServicesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -31354,7 +31354,7 @@ impl wkt::message::Message for BackendServiceList {
 
 #[cfg(any(feature = "backend-services", feature = "region-backend-services",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for BackendServiceList {
+impl google_cloud_gax::paginator::internal::PageableResponse for BackendServiceList {
     type PageItem = crate::model::BackendService;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -32262,7 +32262,7 @@ impl wkt::message::Message for BackendServiceListUsable {
 
 #[cfg(any(feature = "backend-services", feature = "region-backend-services",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for BackendServiceListUsable {
+impl google_cloud_gax::paginator::internal::PageableResponse for BackendServiceListUsable {
     type PageItem = crate::model::BackendService;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43164,7 +43164,7 @@ impl wkt::message::Message for CommitmentAggregatedList {
 
 #[cfg(feature = "region-commitments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for CommitmentAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for CommitmentAggregatedList {
     type PageItem = (std::string::String, crate::model::CommitmentsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -44073,7 +44073,7 @@ impl wkt::message::Message for CommitmentList {
 
 #[cfg(feature = "region-commitments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for CommitmentList {
+impl google_cloud_gax::paginator::internal::PageableResponse for CommitmentList {
     type PageItem = crate::model::Commitment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -46991,7 +46991,7 @@ impl wkt::message::Message for CrossSiteNetworkList {
 
 #[cfg(feature = "cross-site-networks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for CrossSiteNetworkList {
+impl google_cloud_gax::paginator::internal::PageableResponse for CrossSiteNetworkList {
     type PageItem = crate::model::CrossSiteNetwork;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -51525,7 +51525,7 @@ impl wkt::message::Message for DiskAggregatedList {
 
 #[cfg(feature = "disks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DiskAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for DiskAggregatedList {
     type PageItem = (std::string::String, crate::model::DisksScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -53042,7 +53042,7 @@ impl wkt::message::Message for DiskList {
 
 #[cfg(any(feature = "disks", feature = "region-disks",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DiskList {
+impl google_cloud_gax::paginator::internal::PageableResponse for DiskList {
     type PageItem = crate::model::Disk;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -54857,7 +54857,7 @@ impl wkt::message::Message for DiskTypeAggregatedList {
 
 #[cfg(feature = "disk-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DiskTypeAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for DiskTypeAggregatedList {
     type PageItem = (std::string::String, crate::model::DiskTypesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -55766,7 +55766,7 @@ impl wkt::message::Message for DiskTypeList {
 
 #[cfg(feature = "disk-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DiskTypeList {
+impl google_cloud_gax::paginator::internal::PageableResponse for DiskTypeList {
     type PageItem = crate::model::DiskType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -59831,7 +59831,7 @@ impl wkt::message::Message for ExchangedPeeringRoutesList {
 
 #[cfg(feature = "networks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ExchangedPeeringRoutesList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ExchangedPeeringRoutesList {
     type PageItem = crate::model::ExchangedPeeringRoute;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -61763,7 +61763,7 @@ impl wkt::message::Message for ExternalVpnGatewayList {
 
 #[cfg(feature = "external-vpn-gateways")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ExternalVpnGatewayList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ExternalVpnGatewayList {
     type PageItem = crate::model::ExternalVpnGateway;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -64111,7 +64111,7 @@ impl wkt::message::Message for FirewallList {
 
 #[cfg(feature = "firewalls")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FirewallList {
+impl google_cloud_gax::paginator::internal::PageableResponse for FirewallList {
     type PageItem = crate::model::Firewall;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -67226,7 +67226,7 @@ impl wkt::message::Message for FirewallPolicyList {
     feature = "region-network-firewall-policies",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FirewallPolicyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for FirewallPolicyList {
     type PageItem = crate::model::FirewallPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -73588,7 +73588,7 @@ impl wkt::message::Message for ForwardingRuleAggregatedList {
 
 #[cfg(feature = "forwarding-rules")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ForwardingRuleAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ForwardingRuleAggregatedList {
     type PageItem = (std::string::String, crate::model::ForwardingRulesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -74496,7 +74496,7 @@ impl wkt::message::Message for ForwardingRuleList {
 
 #[cfg(any(feature = "forwarding-rules", feature = "global-forwarding-rules",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ForwardingRuleList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ForwardingRuleList {
     type PageItem = crate::model::ForwardingRule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -80085,7 +80085,9 @@ impl wkt::message::Message for FutureReservationsAggregatedListResponse {
 
 #[cfg(feature = "future-reservations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FutureReservationsAggregatedListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for FutureReservationsAggregatedListResponse
+{
     type PageItem = (
         std::string::String,
         crate::model::FutureReservationsScopedList,
@@ -81059,7 +81061,7 @@ impl wkt::message::Message for FutureReservationsListResponse {
 
 #[cfg(feature = "future-reservations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FutureReservationsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for FutureReservationsListResponse {
     type PageItem = crate::model::FutureReservation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -90243,7 +90245,7 @@ impl wkt::message::Message for HealthCheckList {
 
 #[cfg(any(feature = "health-checks", feature = "region-health-checks",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for HealthCheckList {
+impl google_cloud_gax::paginator::internal::PageableResponse for HealthCheckList {
     type PageItem = crate::model::HealthCheck;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -91938,7 +91940,7 @@ impl wkt::message::Message for HealthCheckServicesList {
 
 #[cfg(feature = "region-health-check-services")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for HealthCheckServicesList {
+impl google_cloud_gax::paginator::internal::PageableResponse for HealthCheckServicesList {
     type PageItem = crate::model::HealthCheckService;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -92864,7 +92866,7 @@ impl wkt::message::Message for HealthChecksAggregatedList {
 
 #[cfg(feature = "health-checks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for HealthChecksAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for HealthChecksAggregatedList {
     type PageItem = (std::string::String, crate::model::HealthChecksScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -98365,7 +98367,7 @@ impl wkt::message::Message for HttpHealthCheckList {
 
 #[cfg(feature = "http-health-checks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for HttpHealthCheckList {
+impl google_cloud_gax::paginator::internal::PageableResponse for HttpHealthCheckList {
     type PageItem = crate::model::HttpHealthCheck;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -101610,7 +101612,7 @@ impl wkt::message::Message for HttpsHealthCheckList {
 
 #[cfg(feature = "https-health-checks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for HttpsHealthCheckList {
+impl google_cloud_gax::paginator::internal::PageableResponse for HttpsHealthCheckList {
     type PageItem = crate::model::HttpsHealthCheck;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -104577,7 +104579,7 @@ impl wkt::message::Message for ImageList {
 
 #[cfg(feature = "images")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ImageList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ImageList {
     type PageItem = crate::model::Image;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -107899,7 +107901,7 @@ impl wkt::message::Message for InstanceAggregatedList {
 
 #[cfg(feature = "instances")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceAggregatedList {
     type PageItem = (std::string::String, crate::model::InstancesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -109743,7 +109745,7 @@ impl wkt::message::Message for InstanceGroupAggregatedList {
 
 #[cfg(feature = "instance-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceGroupAggregatedList {
     type PageItem = (std::string::String, crate::model::InstanceGroupsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -110651,7 +110653,7 @@ impl wkt::message::Message for InstanceGroupList {
 
 #[cfg(feature = "instance-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceGroupList {
     type PageItem = crate::model::InstanceGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -113436,7 +113438,9 @@ impl wkt::message::Message for InstanceGroupManagerAggregatedList {
 
 #[cfg(feature = "instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupManagerAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for InstanceGroupManagerAggregatedList
+{
     type PageItem = (
         std::string::String,
         crate::model::InstanceGroupManagersScopedList,
@@ -115143,7 +115147,7 @@ impl wkt::message::Message for InstanceGroupManagerList {
 
 #[cfg(feature = "instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupManagerList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceGroupManagerList {
     type PageItem = crate::model::InstanceGroupManager;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -117650,7 +117654,9 @@ impl wkt::message::Message for InstanceGroupManagerResizeRequestsListResponse {
 
 #[cfg(feature = "instance-group-manager-resize-requests")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupManagerResizeRequestsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for InstanceGroupManagerResizeRequestsListResponse
+{
     type PageItem = crate::model::InstanceGroupManagerResizeRequest;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -121429,7 +121435,9 @@ impl wkt::message::Message for InstanceGroupManagersListErrorsResponse {
 
 #[cfg(feature = "instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupManagersListErrorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for InstanceGroupManagersListErrorsResponse
+{
     type PageItem = crate::model::InstanceManagedByIgmError;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -121528,7 +121536,7 @@ impl wkt::message::Message for InstanceGroupManagersListManagedInstancesResponse
 
 #[cfg(feature = "instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for InstanceGroupManagersListManagedInstancesResponse
 {
     type PageItem = crate::model::ManagedInstance;
@@ -121671,7 +121679,7 @@ impl wkt::message::Message for InstanceGroupManagersListPerInstanceConfigsResp {
 
 #[cfg(feature = "instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for InstanceGroupManagersListPerInstanceConfigsResp
 {
     type PageItem = crate::model::PerInstanceConfig;
@@ -123898,7 +123906,7 @@ impl wkt::message::Message for InstanceGroupsListInstances {
 
 #[cfg(feature = "instance-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceGroupsListInstances {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceGroupsListInstances {
     type PageItem = crate::model::InstanceWithNamedPorts;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -125894,7 +125902,7 @@ impl wkt::message::Message for InstanceList {
 
 #[cfg(feature = "instances")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceList {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -126801,7 +126809,7 @@ impl wkt::message::Message for InstanceListReferrers {
 
 #[cfg(feature = "instances")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceListReferrers {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceListReferrers {
     type PageItem = crate::model::Reference;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -130528,7 +130536,7 @@ impl wkt::message::Message for InstanceTemplateAggregatedList {
 
 #[cfg(feature = "instance-templates")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceTemplateAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceTemplateAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::InstanceTemplatesScopedList,
@@ -131441,7 +131449,7 @@ impl wkt::message::Message for InstanceTemplateList {
 
 #[cfg(any(feature = "instance-templates", feature = "region-instance-templates",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstanceTemplateList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstanceTemplateList {
     type PageItem = crate::model::InstanceTemplate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -137184,7 +137192,7 @@ impl wkt::message::Message for InstantSnapshotAggregatedList {
 
 #[cfg(feature = "instant-snapshots")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstantSnapshotAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstantSnapshotAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::InstantSnapshotsScopedList,
@@ -138096,7 +138104,7 @@ impl wkt::message::Message for InstantSnapshotList {
 
 #[cfg(any(feature = "instant-snapshots", feature = "region-instant-snapshots",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InstantSnapshotList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InstantSnapshotList {
     type PageItem = crate::model::InstantSnapshot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -145666,7 +145674,9 @@ impl wkt::message::Message for InterconnectAttachmentAggregatedList {
 
 #[cfg(feature = "interconnect-attachments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectAttachmentAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for InterconnectAttachmentAggregatedList
+{
     type PageItem = (
         std::string::String,
         crate::model::InterconnectAttachmentsScopedList,
@@ -148918,7 +148928,9 @@ impl wkt::message::Message for InterconnectAttachmentGroupsListResponse {
 
 #[cfg(feature = "interconnect-attachment-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectAttachmentGroupsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for InterconnectAttachmentGroupsListResponse
+{
     type PageItem = crate::model::InterconnectAttachmentGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -151215,7 +151227,7 @@ impl wkt::message::Message for InterconnectAttachmentList {
 
 #[cfg(feature = "interconnect-attachments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectAttachmentList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InterconnectAttachmentList {
     type PageItem = crate::model::InterconnectAttachment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -157948,7 +157960,7 @@ impl wkt::message::Message for InterconnectGroupsListResponse {
 
 #[cfg(feature = "interconnect-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectGroupsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for InterconnectGroupsListResponse {
     type PageItem = crate::model::InterconnectGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -159527,7 +159539,7 @@ impl wkt::message::Message for InterconnectList {
 
 #[cfg(feature = "interconnects")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InterconnectList {
     type PageItem = crate::model::Interconnect;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -161824,7 +161836,7 @@ impl wkt::message::Message for InterconnectLocationList {
 
 #[cfg(feature = "interconnect-locations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectLocationList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InterconnectLocationList {
     type PageItem = crate::model::InterconnectLocation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -166083,7 +166095,7 @@ impl wkt::message::Message for InterconnectRemoteLocationList {
 
 #[cfg(feature = "interconnect-remote-locations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for InterconnectRemoteLocationList {
+impl google_cloud_gax::paginator::internal::PageableResponse for InterconnectRemoteLocationList {
     type PageItem = crate::model::InterconnectRemoteLocation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -168775,7 +168787,7 @@ impl wkt::message::Message for LicensesListResponse {
 
 #[cfg(feature = "licenses")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for LicensesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for LicensesListResponse {
     type PageItem = crate::model::License;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -171663,7 +171675,7 @@ impl wkt::message::Message for MachineImageList {
 
 #[cfg(feature = "machine-images")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for MachineImageList {
+impl google_cloud_gax::paginator::internal::PageableResponse for MachineImageList {
     type PageItem = crate::model::MachineImage;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -173498,7 +173510,7 @@ impl wkt::message::Message for MachineTypeAggregatedList {
 
 #[cfg(feature = "machine-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for MachineTypeAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for MachineTypeAggregatedList {
     type PageItem = (std::string::String, crate::model::MachineTypesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -174407,7 +174419,7 @@ impl wkt::message::Message for MachineTypeList {
 
 #[cfg(feature = "machine-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for MachineTypeList {
+impl google_cloud_gax::paginator::internal::PageableResponse for MachineTypeList {
     type PageItem = crate::model::MachineType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -180890,7 +180902,7 @@ impl wkt::message::Message for NetworkAttachmentAggregatedList {
 
 #[cfg(feature = "network-attachments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkAttachmentAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NetworkAttachmentAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::NetworkAttachmentsScopedList,
@@ -182228,7 +182240,7 @@ impl wkt::message::Message for NetworkAttachmentList {
 
 #[cfg(feature = "network-attachments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkAttachmentList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NetworkAttachmentList {
     type PageItem = crate::model::NetworkAttachment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -184326,7 +184338,9 @@ impl wkt::message::Message for NetworkEdgeSecurityServiceAggregatedList {
 
 #[cfg(feature = "network-edge-security-services")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkEdgeSecurityServiceAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for NetworkEdgeSecurityServiceAggregatedList
+{
     type PageItem = (
         std::string::String,
         crate::model::NetworkEdgeSecurityServicesScopedList,
@@ -187258,7 +187272,9 @@ impl wkt::message::Message for NetworkEndpointGroupAggregatedList {
 
 #[cfg(feature = "network-endpoint-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkEndpointGroupAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for NetworkEndpointGroupAggregatedList
+{
     type PageItem = (
         std::string::String,
         crate::model::NetworkEndpointGroupsScopedList,
@@ -188639,7 +188655,7 @@ impl wkt::message::Message for NetworkEndpointGroupList {
     feature = "region-network-endpoint-groups",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkEndpointGroupList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NetworkEndpointGroupList {
     type PageItem = crate::model::NetworkEndpointGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -190299,7 +190315,9 @@ impl wkt::message::Message for NetworkEndpointGroupsListNetworkEndpoints {
     feature = "region-network-endpoint-groups",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkEndpointGroupsListNetworkEndpoints {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for NetworkEndpointGroupsListNetworkEndpoints
+{
     type PageItem = crate::model::NetworkEndpointWithHealthStatus;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -192156,7 +192174,9 @@ impl wkt::message::Message for NetworkFirewallPolicyAggregatedList {
 
 #[cfg(feature = "network-firewall-policies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkFirewallPolicyAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for NetworkFirewallPolicyAggregatedList
+{
     type PageItem = (
         std::string::String,
         crate::model::FirewallPoliciesScopedList,
@@ -194615,7 +194635,7 @@ impl wkt::message::Message for NetworkList {
 
 #[cfg(feature = "networks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NetworkList {
     type PageItem = crate::model::Network;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -205859,7 +205879,7 @@ impl wkt::message::Message for NetworkProfilesListResponse {
 
 #[cfg(feature = "network-profiles")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NetworkProfilesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for NetworkProfilesListResponse {
     type PageItem = crate::model::NetworkProfile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -209507,7 +209527,7 @@ impl wkt::message::Message for NodeGroupAggregatedList {
 
 #[cfg(feature = "node-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeGroupAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeGroupAggregatedList {
     type PageItem = (std::string::String, crate::model::NodeGroupsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -210704,7 +210724,7 @@ impl wkt::message::Message for NodeGroupList {
 
 #[cfg(feature = "node-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeGroupList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeGroupList {
     type PageItem = crate::model::NodeGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -212575,7 +212595,7 @@ impl wkt::message::Message for NodeGroupsListNodes {
 
 #[cfg(feature = "node-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeGroupsListNodes {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeGroupsListNodes {
     type PageItem = crate::model::NodeGroupNode;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -215298,7 +215318,7 @@ impl wkt::message::Message for NodeTemplateAggregatedList {
 
 #[cfg(feature = "node-templates")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeTemplateAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeTemplateAggregatedList {
     type PageItem = (std::string::String, crate::model::NodeTemplatesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -216207,7 +216227,7 @@ impl wkt::message::Message for NodeTemplateList {
 
 #[cfg(feature = "node-templates")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeTemplateList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeTemplateList {
     type PageItem = crate::model::NodeTemplate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -218483,7 +218503,7 @@ impl wkt::message::Message for NodeTypeAggregatedList {
 
 #[cfg(feature = "node-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeTypeAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeTypeAggregatedList {
     type PageItem = (std::string::String, crate::model::NodeTypesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -219392,7 +219412,7 @@ impl wkt::message::Message for NodeTypeList {
 
 #[cfg(feature = "node-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NodeTypeList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NodeTypeList {
     type PageItem = crate::model::NodeType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -221571,7 +221591,7 @@ impl wkt::message::Message for NotificationEndpointList {
 
 #[cfg(feature = "region-notification-endpoints")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for NotificationEndpointList {
+impl google_cloud_gax::paginator::internal::PageableResponse for NotificationEndpointList {
     type PageItem = crate::model::NotificationEndpoint;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -228587,7 +228607,7 @@ impl wkt::message::Message for OperationAggregatedList {
 
 #[cfg(feature = "global-operations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for OperationAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for OperationAggregatedList {
     type PageItem = (std::string::String, crate::model::OperationsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -229518,7 +229538,7 @@ impl wkt::message::Message for OperationList {
     feature = "zone-operations",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for OperationList {
+impl google_cloud_gax::paginator::internal::PageableResponse for OperationList {
     type PageItem = crate::model::Operation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -233000,7 +233020,7 @@ impl wkt::message::Message for PacketMirroringAggregatedList {
 
 #[cfg(feature = "packet-mirrorings")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PacketMirroringAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for PacketMirroringAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::PacketMirroringsScopedList,
@@ -234263,7 +234283,7 @@ impl wkt::message::Message for PacketMirroringList {
 
 #[cfg(feature = "packet-mirrorings")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PacketMirroringList {
+impl google_cloud_gax::paginator::internal::PageableResponse for PacketMirroringList {
     type PageItem = crate::model::PacketMirroring;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -239251,7 +239271,7 @@ impl wkt::message::Message for PreviewFeatureList {
 
 #[cfg(feature = "preview-features")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PreviewFeatureList {
+impl google_cloud_gax::paginator::internal::PageableResponse for PreviewFeatureList {
     type PageItem = crate::model::PreviewFeature;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -242008,7 +242028,7 @@ impl wkt::message::Message for ProjectsGetXpnResources {
 
 #[cfg(feature = "projects")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ProjectsGetXpnResources {
+impl google_cloud_gax::paginator::internal::PageableResponse for ProjectsGetXpnResources {
     type PageItem = crate::model::XpnResourceId;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -243954,7 +243974,7 @@ impl wkt::message::Message for PublicAdvertisedPrefixList {
 
 #[cfg(feature = "public-advertised-prefixes")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PublicAdvertisedPrefixList {
+impl google_cloud_gax::paginator::internal::PageableResponse for PublicAdvertisedPrefixList {
     type PageItem = crate::model::PublicAdvertisedPrefix;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -246521,7 +246541,9 @@ impl wkt::message::Message for PublicDelegatedPrefixAggregatedList {
 
 #[cfg(feature = "public-delegated-prefixes")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PublicDelegatedPrefixAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for PublicDelegatedPrefixAggregatedList
+{
     type PageItem = (
         std::string::String,
         crate::model::PublicDelegatedPrefixesScopedList,
@@ -247453,7 +247475,7 @@ impl wkt::message::Message for PublicDelegatedPrefixList {
     feature = "public-delegated-prefixes",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PublicDelegatedPrefixList {
+impl google_cloud_gax::paginator::internal::PageableResponse for PublicDelegatedPrefixList {
     type PageItem = crate::model::PublicDelegatedPrefix;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -254821,7 +254843,7 @@ impl wkt::message::Message for RegionAutoscalerList {
 
 #[cfg(feature = "region-autoscalers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionAutoscalerList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RegionAutoscalerList {
     type PageItem = crate::model::Autoscaler;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -255727,7 +255749,7 @@ impl wkt::message::Message for RegionDiskTypeList {
 
 #[cfg(feature = "region-disk-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionDiskTypeList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RegionDiskTypeList {
     type PageItem = crate::model::DiskType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -256848,7 +256870,7 @@ impl wkt::message::Message for RegionInstanceGroupList {
 
 #[cfg(feature = "region-instance-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionInstanceGroupList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RegionInstanceGroupList {
     type PageItem = crate::model::InstanceGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -257800,7 +257822,7 @@ impl wkt::message::Message for RegionInstanceGroupManagerList {
 
 #[cfg(feature = "region-instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionInstanceGroupManagerList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RegionInstanceGroupManagerList {
     type PageItem = crate::model::InstanceGroupManager;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -259340,7 +259362,9 @@ impl wkt::message::Message for RegionInstanceGroupManagersListErrorsResponse {
 
 #[cfg(feature = "region-instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionInstanceGroupManagersListErrorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for RegionInstanceGroupManagersListErrorsResponse
+{
     type PageItem = crate::model::InstanceManagedByIgmError;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -259481,7 +259505,7 @@ impl wkt::message::Message for RegionInstanceGroupManagersListInstanceConfigsRes
 
 #[cfg(feature = "region-instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for RegionInstanceGroupManagersListInstanceConfigsResp
 {
     type PageItem = crate::model::PerInstanceConfig;
@@ -260252,7 +260276,7 @@ impl wkt::message::Message for RegionInstanceGroupManagersListInstancesResponse
 
 #[cfg(feature = "region-instance-group-managers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for RegionInstanceGroupManagersListInstancesResponse
 {
     type PageItem = crate::model::ManagedInstance;
@@ -260905,7 +260929,7 @@ impl wkt::message::Message for RegionInstanceGroupsListInstances {
 
 #[cfg(feature = "region-instance-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionInstanceGroupsListInstances {
+impl google_cloud_gax::paginator::internal::PageableResponse for RegionInstanceGroupsListInstances {
     type PageItem = crate::model::InstanceWithNamedPorts;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -262149,7 +262173,7 @@ impl wkt::message::Message for RegionList {
 
 #[cfg(feature = "regions")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RegionList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RegionList {
     type PageItem = crate::model::Region;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -266190,7 +266214,7 @@ impl wkt::message::Message for ReservationAggregatedList {
 
 #[cfg(feature = "reservations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ReservationAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ReservationAggregatedList {
     type PageItem = (std::string::String, crate::model::ReservationsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -268515,7 +268539,7 @@ impl wkt::message::Message for ReservationBlocksListResponse {
 
 #[cfg(feature = "reservation-blocks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ReservationBlocksListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ReservationBlocksListResponse {
     type PageItem = crate::model::ReservationBlock;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -269424,7 +269448,7 @@ impl wkt::message::Message for ReservationList {
 
 #[cfg(feature = "reservations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ReservationList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ReservationList {
     type PageItem = crate::model::Reservation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -271212,7 +271236,7 @@ impl wkt::message::Message for ReservationSlotsListResponse {
 
 #[cfg(feature = "reservation-slots")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ReservationSlotsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ReservationSlotsListResponse {
     type PageItem = crate::model::ReservationSlot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -273359,7 +273383,7 @@ impl wkt::message::Message for ReservationSubBlocksListResponse {
 
 #[cfg(feature = "reservation-sub-blocks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ReservationSubBlocksListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ReservationSubBlocksListResponse {
     type PageItem = crate::model::ReservationSubBlock;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -278085,7 +278109,7 @@ impl wkt::message::Message for ResourcePolicyAggregatedList {
 
 #[cfg(feature = "resource-policies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ResourcePolicyAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ResourcePolicyAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::ResourcePoliciesScopedList,
@@ -280052,7 +280076,7 @@ impl wkt::message::Message for ResourcePolicyList {
 
 #[cfg(feature = "resource-policies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ResourcePolicyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ResourcePolicyList {
     type PageItem = crate::model::ResourcePolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -285743,7 +285767,7 @@ impl wkt::message::Message for RouteList {
 
 #[cfg(feature = "routes")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RouteList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RouteList {
     type PageItem = crate::model::Route;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -287809,7 +287833,7 @@ impl wkt::message::Message for RouterAggregatedList {
 
 #[cfg(feature = "routers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RouterAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RouterAggregatedList {
     type PageItem = (std::string::String, crate::model::RoutersScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -291664,7 +291688,7 @@ impl wkt::message::Message for RouterList {
 
 #[cfg(feature = "routers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RouterList {
+impl google_cloud_gax::paginator::internal::PageableResponse for RouterList {
     type PageItem = crate::model::Router;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -297110,7 +297134,7 @@ impl wkt::message::Message for RoutersListBgpRoutes {
 
 #[cfg(feature = "routers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RoutersListBgpRoutes {
+impl google_cloud_gax::paginator::internal::PageableResponse for RoutersListBgpRoutes {
     type PageItem = crate::model::BgpRoute;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -298070,7 +298094,7 @@ impl wkt::message::Message for RoutersListRoutePolicies {
 
 #[cfg(feature = "routers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for RoutersListRoutePolicies {
+impl google_cloud_gax::paginator::internal::PageableResponse for RoutersListRoutePolicies {
     type PageItem = crate::model::RoutePolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -304003,7 +304027,7 @@ impl wkt::message::Message for SecurityPoliciesAggregatedList {
 
 #[cfg(feature = "security-policies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SecurityPoliciesAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SecurityPoliciesAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::SecurityPoliciesScopedList,
@@ -308916,7 +308940,7 @@ impl wkt::message::Message for SecurityPolicyList {
     feature = "security-policies",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SecurityPolicyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SecurityPolicyList {
     type PageItem = crate::model::SecurityPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -315566,7 +315590,7 @@ impl wkt::message::Message for ServiceAttachmentAggregatedList {
 
 #[cfg(feature = "service-attachments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ServiceAttachmentAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ServiceAttachmentAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::ServiceAttachmentsScopedList,
@@ -316993,7 +317017,7 @@ impl wkt::message::Message for ServiceAttachmentList {
 
 #[cfg(feature = "service-attachments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ServiceAttachmentList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ServiceAttachmentList {
     type PageItem = crate::model::ServiceAttachment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -323513,7 +323537,7 @@ impl wkt::message::Message for SnapshotList {
 
 #[cfg(feature = "snapshots")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SnapshotList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SnapshotList {
     type PageItem = crate::model::Snapshot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -326544,7 +326568,7 @@ impl wkt::message::Message for SslCertificateAggregatedList {
 
 #[cfg(feature = "ssl-certificates")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SslCertificateAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SslCertificateAggregatedList {
     type PageItem = (std::string::String, crate::model::SslCertificatesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -327452,7 +327476,7 @@ impl wkt::message::Message for SslCertificateList {
 
 #[cfg(any(feature = "region-ssl-certificates", feature = "ssl-certificates",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SslCertificateList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SslCertificateList {
     type PageItem = crate::model::SslCertificate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -329735,7 +329759,7 @@ impl wkt::message::Message for SslPoliciesAggregatedList {
 
 #[cfg(feature = "ssl-policies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SslPoliciesAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SslPoliciesAggregatedList {
     type PageItem = (std::string::String, crate::model::SslPoliciesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -330642,7 +330666,7 @@ impl wkt::message::Message for SslPoliciesList {
 
 #[cfg(any(feature = "region-ssl-policies", feature = "ssl-policies",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SslPoliciesList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SslPoliciesList {
     type PageItem = crate::model::SslPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -336238,7 +336262,7 @@ impl wkt::message::Message for StoragePoolAggregatedList {
 
 #[cfg(feature = "storage-pools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for StoragePoolAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for StoragePoolAggregatedList {
     type PageItem = (std::string::String, crate::model::StoragePoolsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -337872,7 +337896,7 @@ impl wkt::message::Message for StoragePoolList {
 
 #[cfg(feature = "storage-pools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for StoragePoolList {
+impl google_cloud_gax::paginator::internal::PageableResponse for StoragePoolList {
     type PageItem = crate::model::StoragePool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -338833,7 +338857,7 @@ impl wkt::message::Message for StoragePoolListDisks {
 
 #[cfg(feature = "storage-pools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for StoragePoolListDisks {
+impl google_cloud_gax::paginator::internal::PageableResponse for StoragePoolListDisks {
     type PageItem = crate::model::StoragePoolDisk;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -340916,7 +340940,7 @@ impl wkt::message::Message for StoragePoolTypeAggregatedList {
 
 #[cfg(feature = "storage-pool-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for StoragePoolTypeAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for StoragePoolTypeAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::StoragePoolTypesScopedList,
@@ -341828,7 +341852,7 @@ impl wkt::message::Message for StoragePoolTypeList {
 
 #[cfg(feature = "storage-pool-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for StoragePoolTypeList {
+impl google_cloud_gax::paginator::internal::PageableResponse for StoragePoolTypeList {
     type PageItem = crate::model::StoragePoolType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -346673,7 +346697,7 @@ impl wkt::message::Message for SubnetworkAggregatedList {
 
 #[cfg(feature = "subnetworks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SubnetworkAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SubnetworkAggregatedList {
     type PageItem = (std::string::String, crate::model::SubnetworksScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -347582,7 +347606,7 @@ impl wkt::message::Message for SubnetworkList {
 
 #[cfg(feature = "subnetworks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SubnetworkList {
+impl google_cloud_gax::paginator::internal::PageableResponse for SubnetworkList {
     type PageItem = crate::model::Subnetwork;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -352508,7 +352532,7 @@ impl wkt::message::Message for TargetGrpcProxyList {
 
 #[cfg(feature = "target-grpc-proxies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetGrpcProxyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetGrpcProxyList {
     type PageItem = crate::model::TargetGrpcProxy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -354610,7 +354634,7 @@ impl wkt::message::Message for TargetHttpProxyAggregatedList {
 
 #[cfg(feature = "target-http-proxies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetHttpProxyAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetHttpProxyAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::TargetHttpProxiesScopedList,
@@ -354865,7 +354889,7 @@ impl wkt::message::Message for TargetHttpProxyList {
     feature = "target-http-proxies",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetHttpProxyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetHttpProxyList {
     type PageItem = crate::model::TargetHttpProxy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -358059,7 +358083,7 @@ impl wkt::message::Message for TargetHttpsProxyAggregatedList {
 
 #[cfg(feature = "target-https-proxies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetHttpsProxyAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetHttpsProxyAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::TargetHttpsProxiesScopedList,
@@ -358984,7 +359008,7 @@ impl wkt::message::Message for TargetHttpsProxyList {
     feature = "target-https-proxies",
 ))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetHttpsProxyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetHttpsProxyList {
     type PageItem = crate::model::TargetHttpsProxy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -360525,7 +360549,7 @@ impl wkt::message::Message for TargetInstanceAggregatedList {
 
 #[cfg(feature = "target-instances")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetInstanceAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetInstanceAggregatedList {
     type PageItem = (std::string::String, crate::model::TargetInstancesScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -361433,7 +361457,7 @@ impl wkt::message::Message for TargetInstanceList {
 
 #[cfg(feature = "target-instances")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetInstanceList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetInstanceList {
     type PageItem = crate::model::TargetInstance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -363819,7 +363843,7 @@ impl wkt::message::Message for TargetPoolAggregatedList {
 
 #[cfg(feature = "target-pools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetPoolAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetPoolAggregatedList {
     type PageItem = (std::string::String, crate::model::TargetPoolsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -364808,7 +364832,7 @@ impl wkt::message::Message for TargetPoolList {
 
 #[cfg(feature = "target-pools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetPoolList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetPoolList {
     type PageItem = crate::model::TargetPool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -367638,7 +367662,7 @@ impl wkt::message::Message for TargetSslProxyList {
 
 #[cfg(feature = "target-ssl-proxies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetSslProxyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetSslProxyList {
     type PageItem = crate::model::TargetSslProxy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -370109,7 +370133,7 @@ impl wkt::message::Message for TargetTcpProxyAggregatedList {
 
 #[cfg(feature = "target-tcp-proxies")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetTcpProxyAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetTcpProxyAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::TargetTcpProxiesScopedList,
@@ -371021,7 +371045,7 @@ impl wkt::message::Message for TargetTcpProxyList {
 
 #[cfg(any(feature = "region-target-tcp-proxies", feature = "target-tcp-proxies",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetTcpProxyList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetTcpProxyList {
     type PageItem = crate::model::TargetTcpProxy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -372563,7 +372587,7 @@ impl wkt::message::Message for TargetVpnGatewayAggregatedList {
 
 #[cfg(feature = "target-vpn-gateways")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetVpnGatewayAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetVpnGatewayAggregatedList {
     type PageItem = (
         std::string::String,
         crate::model::TargetVpnGatewaysScopedList,
@@ -373475,7 +373499,7 @@ impl wkt::message::Message for TargetVpnGatewayList {
 
 #[cfg(feature = "target-vpn-gateways")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for TargetVpnGatewayList {
+impl google_cloud_gax::paginator::internal::PageableResponse for TargetVpnGatewayList {
     type PageItem = crate::model::TargetVpnGateway;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -377714,7 +377738,7 @@ impl wkt::message::Message for UrlMapList {
 
 #[cfg(any(feature = "region-url-maps", feature = "url-maps",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for UrlMapList {
+impl google_cloud_gax::paginator::internal::PageableResponse for UrlMapList {
     type PageItem = crate::model::UrlMap;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -379210,7 +379234,7 @@ impl wkt::message::Message for UrlMapsAggregatedList {
 
 #[cfg(feature = "url-maps")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for UrlMapsAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for UrlMapsAggregatedList {
     type PageItem = (std::string::String, crate::model::UrlMapsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -382467,7 +382491,7 @@ impl wkt::message::Message for UsableSubnetworksAggregatedList {
 
 #[cfg(feature = "subnetworks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for UsableSubnetworksAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for UsableSubnetworksAggregatedList {
     type PageItem = crate::model::UsableSubnetwork;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -383969,7 +383993,7 @@ impl wkt::message::Message for VmEndpointNatMappingsList {
 
 #[cfg(feature = "routers")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for VmEndpointNatMappingsList {
+impl google_cloud_gax::paginator::internal::PageableResponse for VmEndpointNatMappingsList {
     type PageItem = crate::model::VmEndpointNatMappings;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -385661,7 +385685,7 @@ impl wkt::message::Message for VpnGatewayAggregatedList {
 
 #[cfg(feature = "vpn-gateways")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for VpnGatewayAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for VpnGatewayAggregatedList {
     type PageItem = (std::string::String, crate::model::VpnGatewaysScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -386570,7 +386594,7 @@ impl wkt::message::Message for VpnGatewayList {
 
 #[cfg(feature = "vpn-gateways")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for VpnGatewayList {
+impl google_cloud_gax::paginator::internal::PageableResponse for VpnGatewayList {
     type PageItem = crate::model::VpnGateway;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -390356,7 +390380,7 @@ impl wkt::message::Message for VpnTunnelAggregatedList {
 
 #[cfg(feature = "vpn-tunnels")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for VpnTunnelAggregatedList {
+impl google_cloud_gax::paginator::internal::PageableResponse for VpnTunnelAggregatedList {
     type PageItem = (std::string::String, crate::model::VpnTunnelsScopedList);
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -391356,7 +391380,7 @@ impl wkt::message::Message for VpnTunnelList {
 
 #[cfg(feature = "vpn-tunnels")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for VpnTunnelList {
+impl google_cloud_gax::paginator::internal::PageableResponse for VpnTunnelList {
     type PageItem = crate::model::VpnTunnel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -394460,7 +394484,7 @@ impl wkt::message::Message for WireGroupList {
 
 #[cfg(feature = "wire-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for WireGroupList {
+impl google_cloud_gax::paginator::internal::PageableResponse for WireGroupList {
     type PageItem = crate::model::WireGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -395933,7 +395957,7 @@ impl wkt::message::Message for XpnHostList {
 
 #[cfg(feature = "projects")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for XpnHostList {
+impl google_cloud_gax::paginator::internal::PageableResponse for XpnHostList {
     type PageItem = crate::model::Project;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -397613,7 +397637,7 @@ impl wkt::message::Message for ZoneList {
 
 #[cfg(any(feature = "region-zones", feature = "zones",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ZoneList {
+impl google_cloud_gax::paginator::internal::PageableResponse for ZoneList {
     type PageItem = crate::model::Zone;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/compute/v1/src/stub.rs b/src/generated/cloud/compute/v1/src/stub.rs
index ace31de9c7..26a322c6ef 100644
--- a/src/generated/cloud/compute/v1/src/stub.rs
+++ b/src/generated/cloud/compute/v1/src/stub.rs
@@ -44,11 +44,9 @@ pub trait AcceleratorTypes: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::accelerator_types::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::AcceleratorTypeAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::AcceleratorTypeAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -57,9 +55,9 @@ pub trait AcceleratorTypes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::accelerator_types::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AcceleratorType>>,
+        Output = crate::Result<crate::Response<crate::model::AcceleratorType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -68,9 +66,9 @@ pub trait AcceleratorTypes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::accelerator_types::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AcceleratorTypeList>>,
+        Output = crate::Result<crate::Response<crate::model::AcceleratorTypeList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -94,9 +92,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::addresses::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AddressAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::AddressAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -105,10 +103,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::addresses::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -116,10 +113,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::addresses::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Address>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Address>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -127,10 +123,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::addresses::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -138,10 +133,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::addresses::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AddressList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AddressList>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -149,10 +143,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn r#move(
         &self,
         _req: crate::model::addresses::MoveRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -160,10 +153,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::addresses::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -171,9 +163,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::addresses::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -182,10 +174,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -195,9 +186,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -206,9 +197,9 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -230,9 +221,9 @@ pub trait Advice: std::fmt::Debug + Send + Sync {
     fn calendar_mode(
         &self,
         _req: crate::model::advice::CalendarModeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CalendarModeAdviceResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CalendarModeAdviceResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -256,9 +247,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::autoscalers::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutoscalerAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::AutoscalerAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -267,10 +258,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::autoscalers::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -278,10 +268,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::autoscalers::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Autoscaler>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Autoscaler>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -289,10 +278,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::autoscalers::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -300,9 +288,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::autoscalers::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutoscalerList>>,
+        Output = crate::Result<crate::Response<crate::model::AutoscalerList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -311,10 +299,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::autoscalers::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -322,9 +309,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::autoscalers::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -333,10 +320,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::autoscalers::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -344,10 +330,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -357,9 +342,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -368,9 +353,9 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -392,10 +377,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn add_signed_url_key(
         &self,
         _req: crate::model::backend_buckets::AddSignedUrlKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -403,10 +387,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::backend_buckets::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -414,10 +397,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn delete_signed_url_key(
         &self,
         _req: crate::model::backend_buckets::DeleteSignedUrlKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -425,9 +407,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::backend_buckets::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendBucket>>,
+        Output = crate::Result<crate::Response<crate::model::BackendBucket>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -436,10 +418,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::backend_buckets::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -447,10 +428,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::backend_buckets::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -458,9 +438,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::backend_buckets::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendBucketList>>,
+        Output = crate::Result<crate::Response<crate::model::BackendBucketList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -469,10 +449,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::backend_buckets::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -480,10 +459,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn set_edge_security_policy(
         &self,
         _req: crate::model::backend_buckets::SetEdgeSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -491,10 +469,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::backend_buckets::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -502,9 +479,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::backend_buckets::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -513,10 +490,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::backend_buckets::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -524,10 +500,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -537,9 +512,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -548,9 +523,9 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -572,10 +547,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn add_signed_url_key(
         &self,
         _req: crate::model::backend_services::AddSignedUrlKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -583,9 +557,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::backend_services::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -594,10 +568,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::backend_services::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -605,10 +578,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn delete_signed_url_key(
         &self,
         _req: crate::model::backend_services::DeleteSignedUrlKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -616,9 +588,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::backend_services::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendService>>,
+        Output = crate::Result<crate::Response<crate::model::BackendService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -627,8 +599,8 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn get_effective_security_policies(
         &self,
         _req: crate::model::backend_services::GetEffectiveSecurityPoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -636,9 +608,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn get_health(
         &self,
         _req: crate::model::backend_services::GetHealthRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceGroupHealth>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceGroupHealth>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -647,10 +619,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::backend_services::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -658,10 +629,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::backend_services::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -669,9 +639,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::backend_services::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceList>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -680,9 +650,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn list_usable(
         &self,
         _req: crate::model::backend_services::ListUsableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceListUsable>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceListUsable>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -691,10 +661,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::backend_services::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -702,10 +671,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn set_edge_security_policy(
         &self,
         _req: crate::model::backend_services::SetEdgeSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -713,10 +681,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::backend_services::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -724,10 +691,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn set_security_policy(
         &self,
         _req: crate::model::backend_services::SetSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -735,9 +701,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::backend_services::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -746,10 +712,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::backend_services::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -757,10 +722,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -770,9 +734,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -781,9 +745,9 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -805,10 +769,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::cross_site_networks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -816,9 +779,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::cross_site_networks::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CrossSiteNetwork>>,
+        Output = crate::Result<crate::Response<crate::model::CrossSiteNetwork>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -827,10 +790,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::cross_site_networks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -838,9 +800,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::cross_site_networks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CrossSiteNetworkList>>,
+        Output = crate::Result<crate::Response<crate::model::CrossSiteNetworkList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -849,10 +811,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::cross_site_networks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -860,10 +821,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -873,9 +833,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -884,9 +844,9 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -908,9 +868,9 @@ pub trait DiskTypes: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::disk_types::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskTypeAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::DiskTypeAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -919,10 +879,9 @@ pub trait DiskTypes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::disk_types::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DiskType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -930,9 +889,9 @@ pub trait DiskTypes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::disk_types::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskTypeList>>,
+        Output = crate::Result<crate::Response<crate::model::DiskTypeList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -956,10 +915,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn add_resource_policies(
         &self,
         _req: crate::model::disks::AddResourcePoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -967,9 +925,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::disks::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::DiskAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -978,10 +936,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn bulk_insert(
         &self,
         _req: crate::model::disks::BulkInsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -989,10 +946,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn bulk_set_labels(
         &self,
         _req: crate::model::disks::BulkSetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1000,10 +956,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn create_snapshot(
         &self,
         _req: crate::model::disks::CreateSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1011,10 +966,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::disks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1022,10 +976,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::disks::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Disk>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Disk>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1033,10 +986,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::disks::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1044,10 +996,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::disks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1055,10 +1006,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::disks::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DiskList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1066,10 +1016,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn remove_resource_policies(
         &self,
         _req: crate::model::disks::RemoveResourcePoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1077,10 +1026,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn resize(
         &self,
         _req: crate::model::disks::ResizeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1088,10 +1036,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::disks::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1099,10 +1046,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::disks::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1110,10 +1056,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn start_async_replication(
         &self,
         _req: crate::model::disks::StartAsyncReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1121,10 +1066,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn stop_async_replication(
         &self,
         _req: crate::model::disks::StopAsyncReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1132,10 +1076,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn stop_group_async_replication(
         &self,
         _req: crate::model::disks::StopGroupAsyncReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1143,9 +1086,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::disks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1154,10 +1097,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::disks::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1165,10 +1107,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1178,9 +1119,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1189,9 +1130,9 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1213,10 +1154,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::external_vpn_gateways::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1224,9 +1164,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::external_vpn_gateways::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExternalVpnGateway>>,
+        Output = crate::Result<crate::Response<crate::model::ExternalVpnGateway>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1235,10 +1175,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::external_vpn_gateways::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1246,9 +1185,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::external_vpn_gateways::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExternalVpnGatewayList>>,
+        Output = crate::Result<crate::Response<crate::model::ExternalVpnGatewayList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1257,10 +1196,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::external_vpn_gateways::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1268,9 +1206,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::external_vpn_gateways::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1279,10 +1217,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1292,9 +1229,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1303,9 +1240,9 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1327,10 +1264,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_association(
         &self,
         _req: crate::model::firewall_policies::AddAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1338,10 +1274,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_rule(
         &self,
         _req: crate::model::firewall_policies::AddRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1349,10 +1284,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn clone_rules(
         &self,
         _req: crate::model::firewall_policies::CloneRulesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1360,10 +1294,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::firewall_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1371,9 +1304,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::firewall_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1382,9 +1315,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_association(
         &self,
         _req: crate::model::firewall_policies::GetAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1393,10 +1326,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::firewall_policies::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1404,9 +1336,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::firewall_policies::GetRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1415,10 +1347,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::firewall_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1426,9 +1357,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::firewall_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1437,10 +1368,10 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn list_associations(
         &self,
         _req: crate::model::firewall_policies::ListAssociationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::FirewallPoliciesListAssociationsResponse>,
+            crate::Response<crate::model::FirewallPoliciesListAssociationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1450,10 +1381,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn r#move(
         &self,
         _req: crate::model::firewall_policies::MoveRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1461,10 +1391,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::firewall_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1472,10 +1401,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch_rule(
         &self,
         _req: crate::model::firewall_policies::PatchRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1483,10 +1411,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_association(
         &self,
         _req: crate::model::firewall_policies::RemoveAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1494,10 +1421,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_rule(
         &self,
         _req: crate::model::firewall_policies::RemoveRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1505,10 +1431,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::firewall_policies::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1516,9 +1441,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::firewall_policies::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1527,10 +1452,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_organization_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1540,9 +1464,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1551,9 +1475,9 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1575,10 +1499,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::firewalls::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1586,10 +1509,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::firewalls::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Firewall>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Firewall>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1597,10 +1519,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::firewalls::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1608,9 +1529,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::firewalls::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallList>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1619,10 +1540,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::firewalls::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1630,9 +1550,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::firewalls::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1641,10 +1561,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::firewalls::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1652,10 +1571,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1665,9 +1583,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1676,9 +1594,9 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1700,9 +1618,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::forwarding_rules::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ForwardingRuleAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::ForwardingRuleAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1711,10 +1629,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::forwarding_rules::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1722,9 +1639,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::forwarding_rules::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ForwardingRule>>,
+        Output = crate::Result<crate::Response<crate::model::ForwardingRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1733,10 +1650,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::forwarding_rules::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1744,9 +1660,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::forwarding_rules::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ForwardingRuleList>>,
+        Output = crate::Result<crate::Response<crate::model::ForwardingRuleList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1755,10 +1671,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::forwarding_rules::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1766,10 +1681,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::forwarding_rules::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1777,10 +1691,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn set_target(
         &self,
         _req: crate::model::forwarding_rules::SetTargetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1788,10 +1701,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1801,9 +1713,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1812,9 +1724,9 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1836,10 +1748,10 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::future_reservations::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::FutureReservationsAggregatedListResponse>,
+            crate::Response<crate::model::FutureReservationsAggregatedListResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1849,10 +1761,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn cancel(
         &self,
         _req: crate::model::future_reservations::CancelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1860,10 +1771,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::future_reservations::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1871,9 +1781,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::future_reservations::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FutureReservation>>,
+        Output = crate::Result<crate::Response<crate::model::FutureReservation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1882,10 +1792,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::future_reservations::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1893,11 +1802,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::future_reservations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FutureReservationsListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FutureReservationsListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1906,10 +1813,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::future_reservations::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1917,10 +1823,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1930,9 +1835,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1941,9 +1846,9 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1965,10 +1870,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::global_addresses::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1976,10 +1880,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::global_addresses::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Address>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Address>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1987,10 +1890,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::global_addresses::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1998,10 +1900,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::global_addresses::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AddressList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AddressList>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2009,10 +1910,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn r#move(
         &self,
         _req: crate::model::global_addresses::MoveRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2020,10 +1920,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::global_addresses::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2031,9 +1930,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::global_addresses::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2042,10 +1941,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2055,9 +1953,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2066,9 +1964,9 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2090,10 +1988,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::global_forwarding_rules::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2101,9 +1998,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::global_forwarding_rules::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ForwardingRule>>,
+        Output = crate::Result<crate::Response<crate::model::ForwardingRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2112,10 +2009,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::global_forwarding_rules::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2123,9 +2019,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::global_forwarding_rules::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ForwardingRuleList>>,
+        Output = crate::Result<crate::Response<crate::model::ForwardingRuleList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2134,10 +2030,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::global_forwarding_rules::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2145,10 +2040,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::global_forwarding_rules::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2156,10 +2050,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn set_target(
         &self,
         _req: crate::model::global_forwarding_rules::SetTargetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2167,10 +2060,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2180,9 +2072,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2191,9 +2083,9 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2215,10 +2107,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn attach_network_endpoints(
         &self,
         _req: crate::model::global_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2226,10 +2117,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::global_network_endpoint_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2237,10 +2127,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn detach_network_endpoints(
         &self,
         _req: crate::model::global_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2248,9 +2137,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::global_network_endpoint_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2259,10 +2148,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::global_network_endpoint_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2270,9 +2158,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::global_network_endpoint_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2281,10 +2169,10 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn list_network_endpoints(
         &self,
         _req: crate::model::global_network_endpoint_groups::ListNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
+            crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2294,10 +2182,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2307,9 +2194,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2318,9 +2205,9 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2342,9 +2229,9 @@ pub trait GlobalOperations: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::global_operations::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::OperationAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::OperationAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2353,8 +2240,8 @@ pub trait GlobalOperations: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::global_operations::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2362,10 +2249,9 @@ pub trait GlobalOperations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2373,9 +2259,9 @@ pub trait GlobalOperations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::global_operations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::OperationList>>,
+        Output = crate::Result<crate::Response<crate::model::OperationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2384,10 +2270,9 @@ pub trait GlobalOperations: std::fmt::Debug + Send + Sync {
     fn wait(
         &self,
         _req: crate::model::global_operations::WaitRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2410,8 +2295,8 @@ pub trait GlobalOrganizationOperations: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::global_organization_operations::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2419,10 +2304,9 @@ pub trait GlobalOrganizationOperations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::global_organization_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2430,9 +2314,9 @@ pub trait GlobalOrganizationOperations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::global_organization_operations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::OperationList>>,
+        Output = crate::Result<crate::Response<crate::model::OperationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2456,10 +2340,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::global_public_delegated_prefixes::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2467,9 +2350,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::global_public_delegated_prefixes::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefix>>,
+        Output = crate::Result<crate::Response<crate::model::PublicDelegatedPrefix>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2478,10 +2361,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::global_public_delegated_prefixes::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2489,9 +2371,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::global_public_delegated_prefixes::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>>,
+        Output = crate::Result<crate::Response<crate::model::PublicDelegatedPrefixList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2500,10 +2382,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::global_public_delegated_prefixes::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2511,10 +2392,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2524,9 +2404,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2535,9 +2415,9 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2559,9 +2439,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::health_checks::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthChecksAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::HealthChecksAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2570,10 +2450,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::health_checks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2581,10 +2460,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::health_checks::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthCheck>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::HealthCheck>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2592,10 +2470,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::health_checks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2603,9 +2480,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::health_checks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthCheckList>>,
+        Output = crate::Result<crate::Response<crate::model::HealthCheckList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2614,10 +2491,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::health_checks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2625,9 +2501,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::health_checks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2636,10 +2512,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::health_checks::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2647,10 +2522,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2660,9 +2534,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2671,9 +2545,9 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2695,10 +2569,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::http_health_checks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2706,9 +2579,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::http_health_checks::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HttpHealthCheck>>,
+        Output = crate::Result<crate::Response<crate::model::HttpHealthCheck>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2717,10 +2590,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::http_health_checks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2728,9 +2600,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::http_health_checks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HttpHealthCheckList>>,
+        Output = crate::Result<crate::Response<crate::model::HttpHealthCheckList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2739,10 +2611,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::http_health_checks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2750,9 +2621,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::http_health_checks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2761,10 +2632,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::http_health_checks::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2772,10 +2642,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2785,9 +2654,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2796,9 +2665,9 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2820,10 +2689,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::https_health_checks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2831,9 +2699,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::https_health_checks::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HttpsHealthCheck>>,
+        Output = crate::Result<crate::Response<crate::model::HttpsHealthCheck>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2842,10 +2710,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::https_health_checks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2853,9 +2720,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::https_health_checks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HttpsHealthCheckList>>,
+        Output = crate::Result<crate::Response<crate::model::HttpsHealthCheckList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2864,10 +2731,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::https_health_checks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2875,9 +2741,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::https_health_checks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2886,10 +2752,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::https_health_checks::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2897,10 +2762,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2910,9 +2774,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2921,9 +2785,9 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2945,9 +2809,9 @@ pub trait ImageFamilyViews: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::image_family_views::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImageFamilyView>>,
+        Output = crate::Result<crate::Response<crate::model::ImageFamilyView>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2971,10 +2835,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::images::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2982,10 +2845,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn deprecate(
         &self,
         _req: crate::model::images::DeprecateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2993,10 +2855,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::images::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Image>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Image>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3004,10 +2865,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn get_from_family(
         &self,
         _req: crate::model::images::GetFromFamilyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Image>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Image>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3015,10 +2875,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::images::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3026,10 +2885,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::images::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3037,10 +2895,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::images::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImageList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ImageList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3048,10 +2905,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::images::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3059,10 +2915,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::images::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3070,10 +2925,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::images::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3081,9 +2935,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::images::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3092,10 +2946,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3105,9 +2958,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3116,9 +2969,9 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3140,10 +2993,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     fn cancel(
         &self,
         _req: crate::model::instance_group_manager_resize_requests::CancelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3151,10 +3003,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::instance_group_manager_resize_requests::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3162,11 +3013,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instance_group_manager_resize_requests::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InstanceGroupManagerResizeRequest>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupManagerResizeRequest>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3175,10 +3024,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::instance_group_manager_resize_requests::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3186,10 +3034,10 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::instance_group_manager_resize_requests::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>,
+            crate::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3199,10 +3047,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3212,9 +3059,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3223,9 +3070,9 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3247,10 +3094,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn abandon_instances(
         &self,
         _req: crate::model::instance_group_managers::AbandonInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3258,11 +3104,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::instance_group_managers::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InstanceGroupManagerAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupManagerAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3271,10 +3115,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn apply_updates_to_instances(
         &self,
         _req: crate::model::instance_group_managers::ApplyUpdatesToInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3282,10 +3125,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn create_instances(
         &self,
         _req: crate::model::instance_group_managers::CreateInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3293,10 +3135,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::instance_group_managers::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3304,10 +3145,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn delete_instances(
         &self,
         _req: crate::model::instance_group_managers::DeleteInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3315,10 +3155,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn delete_per_instance_configs(
         &self,
         _req: crate::model::instance_group_managers::DeletePerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3326,9 +3165,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instance_group_managers::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroupManager>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupManager>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3337,10 +3176,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::instance_group_managers::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3348,9 +3186,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::instance_group_managers::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroupManagerList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupManagerList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3359,10 +3197,10 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list_errors(
         &self,
         _req: crate::model::instance_group_managers::ListErrorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::InstanceGroupManagersListErrorsResponse>,
+            crate::Response<crate::model::InstanceGroupManagersListErrorsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3372,12 +3210,10 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list_managed_instances(
         &self,
         _req: crate::model::instance_group_managers::ListManagedInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::InstanceGroupManagersListManagedInstancesResponse,
-            >,
+            crate::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3387,10 +3223,10 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list_per_instance_configs(
         &self,
         _req: crate::model::instance_group_managers::ListPerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>,
+            crate::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3400,10 +3236,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::instance_group_managers::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3411,10 +3246,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn patch_per_instance_configs(
         &self,
         _req: crate::model::instance_group_managers::PatchPerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3422,10 +3256,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn recreate_instances(
         &self,
         _req: crate::model::instance_group_managers::RecreateInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3433,10 +3266,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn resize(
         &self,
         _req: crate::model::instance_group_managers::ResizeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3444,10 +3276,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn resume_instances(
         &self,
         _req: crate::model::instance_group_managers::ResumeInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3455,10 +3286,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn set_instance_template(
         &self,
         _req: crate::model::instance_group_managers::SetInstanceTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3466,10 +3296,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn set_target_pools(
         &self,
         _req: crate::model::instance_group_managers::SetTargetPoolsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3477,10 +3306,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn start_instances(
         &self,
         _req: crate::model::instance_group_managers::StartInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3488,10 +3316,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn stop_instances(
         &self,
         _req: crate::model::instance_group_managers::StopInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3499,10 +3326,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn suspend_instances(
         &self,
         _req: crate::model::instance_group_managers::SuspendInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3510,10 +3336,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn update_per_instance_configs(
         &self,
         _req: crate::model::instance_group_managers::UpdatePerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3521,10 +3346,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3534,9 +3358,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3545,9 +3369,9 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3569,10 +3393,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn add_instances(
         &self,
         _req: crate::model::instance_groups::AddInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3580,9 +3403,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::instance_groups::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroupAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3591,10 +3414,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::instance_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3602,9 +3424,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instance_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroup>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3613,10 +3435,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::instance_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3624,9 +3445,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::instance_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3635,9 +3456,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::instance_groups::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroupsListInstances>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupsListInstances>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3646,10 +3467,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn remove_instances(
         &self,
         _req: crate::model::instance_groups::RemoveInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3657,10 +3477,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn set_named_ports(
         &self,
         _req: crate::model::instance_groups::SetNamedPortsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3668,9 +3487,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::instance_groups::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3679,10 +3498,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3692,9 +3510,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3703,9 +3521,9 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3727,9 +3545,9 @@ pub trait InstanceSettings: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instance_settings::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceSettings>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceSettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3738,10 +3556,9 @@ pub trait InstanceSettings: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::instance_settings::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3749,10 +3566,9 @@ pub trait InstanceSettings: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3762,9 +3578,9 @@ pub trait InstanceSettings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3773,9 +3589,9 @@ pub trait InstanceSettings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3797,11 +3613,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::instance_templates::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InstanceTemplateAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InstanceTemplateAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3810,10 +3624,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::instance_templates::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3821,9 +3634,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instance_templates::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3832,10 +3645,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::instance_templates::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3843,10 +3655,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::instance_templates::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3854,9 +3665,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::instance_templates::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceTemplateList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceTemplateList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3865,10 +3676,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::instance_templates::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3876,9 +3686,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::instance_templates::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3887,10 +3697,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3900,9 +3709,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -3911,9 +3720,9 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -3935,10 +3744,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn add_access_config(
         &self,
         _req: crate::model::instances::AddAccessConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3946,10 +3754,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn add_network_interface(
         &self,
         _req: crate::model::instances::AddNetworkInterfaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3957,10 +3764,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn add_resource_policies(
         &self,
         _req: crate::model::instances::AddResourcePoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3968,9 +3774,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::instances::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3979,10 +3785,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn attach_disk(
         &self,
         _req: crate::model::instances::AttachDiskRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3990,10 +3795,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn bulk_insert(
         &self,
         _req: crate::model::instances::BulkInsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4001,10 +3805,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::instances::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4012,10 +3815,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn delete_access_config(
         &self,
         _req: crate::model::instances::DeleteAccessConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4023,10 +3825,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn delete_network_interface(
         &self,
         _req: crate::model::instances::DeleteNetworkInterfaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4034,10 +3835,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn detach_disk(
         &self,
         _req: crate::model::instances::DetachDiskRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4045,10 +3845,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instances::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4056,10 +3855,10 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_effective_firewalls(
         &self,
         _req: crate::model::instances::GetEffectiveFirewallsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::InstancesGetEffectiveFirewallsResponse>,
+            crate::Response<crate::model::InstancesGetEffectiveFirewallsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4069,9 +3868,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_guest_attributes(
         &self,
         _req: crate::model::instances::GetGuestAttributesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GuestAttributes>>,
+        Output = crate::Result<crate::Response<crate::model::GuestAttributes>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4080,10 +3879,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::instances::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4091,10 +3889,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_screenshot(
         &self,
         _req: crate::model::instances::GetScreenshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Screenshot>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Screenshot>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4102,9 +3899,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_serial_port_output(
         &self,
         _req: crate::model::instances::GetSerialPortOutputRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SerialPortOutput>>,
+        Output = crate::Result<crate::Response<crate::model::SerialPortOutput>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4113,9 +3910,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_shielded_instance_identity(
         &self,
         _req: crate::model::instances::GetShieldedInstanceIdentityRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ShieldedInstanceIdentity>>,
+        Output = crate::Result<crate::Response<crate::model::ShieldedInstanceIdentity>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4124,10 +3921,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::instances::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4135,9 +3931,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::instances::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4146,9 +3942,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn list_referrers(
         &self,
         _req: crate::model::instances::ListReferrersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceListReferrers>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceListReferrers>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4157,10 +3953,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn perform_maintenance(
         &self,
         _req: crate::model::instances::PerformMaintenanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4168,10 +3963,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn remove_resource_policies(
         &self,
         _req: crate::model::instances::RemoveResourcePoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4179,10 +3973,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn report_host_as_faulty(
         &self,
         _req: crate::model::instances::ReportHostAsFaultyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4190,10 +3983,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn reset(
         &self,
         _req: crate::model::instances::ResetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4201,10 +3993,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn resume(
         &self,
         _req: crate::model::instances::ResumeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4212,8 +4003,8 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn send_diagnostic_interrupt(
         &self,
         _req: crate::model::instances::SendDiagnosticInterruptRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4221,10 +4012,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_deletion_protection(
         &self,
         _req: crate::model::instances::SetDeletionProtectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4232,10 +4022,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_disk_auto_delete(
         &self,
         _req: crate::model::instances::SetDiskAutoDeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4243,10 +4032,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::instances::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4254,10 +4042,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::instances::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4265,10 +4052,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_machine_resources(
         &self,
         _req: crate::model::instances::SetMachineResourcesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4276,10 +4062,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_machine_type(
         &self,
         _req: crate::model::instances::SetMachineTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4287,10 +4072,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_metadata(
         &self,
         _req: crate::model::instances::SetMetadataRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4298,10 +4082,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_min_cpu_platform(
         &self,
         _req: crate::model::instances::SetMinCpuPlatformRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4309,10 +4092,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_name(
         &self,
         _req: crate::model::instances::SetNameRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4320,10 +4102,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_scheduling(
         &self,
         _req: crate::model::instances::SetSchedulingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4331,10 +4112,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_security_policy(
         &self,
         _req: crate::model::instances::SetSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4342,10 +4122,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_service_account(
         &self,
         _req: crate::model::instances::SetServiceAccountRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4353,10 +4132,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_shielded_instance_integrity_policy(
         &self,
         _req: crate::model::instances::SetShieldedInstanceIntegrityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4364,10 +4142,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn set_tags(
         &self,
         _req: crate::model::instances::SetTagsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4375,10 +4152,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn simulate_maintenance_event(
         &self,
         _req: crate::model::instances::SimulateMaintenanceEventRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4386,10 +4162,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn start(
         &self,
         _req: crate::model::instances::StartRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4397,10 +4172,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn start_with_encryption_key(
         &self,
         _req: crate::model::instances::StartWithEncryptionKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4408,10 +4182,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn stop(
         &self,
         _req: crate::model::instances::StopRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4419,10 +4192,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn suspend(
         &self,
         _req: crate::model::instances::SuspendRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4430,9 +4202,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::instances::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4441,10 +4213,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::instances::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4452,10 +4223,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn update_access_config(
         &self,
         _req: crate::model::instances::UpdateAccessConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4463,10 +4233,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn update_display_device(
         &self,
         _req: crate::model::instances::UpdateDisplayDeviceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4474,10 +4243,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn update_network_interface(
         &self,
         _req: crate::model::instances::UpdateNetworkInterfaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4485,10 +4253,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn update_shielded_instance_config(
         &self,
         _req: crate::model::instances::UpdateShieldedInstanceConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4496,10 +4263,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4509,9 +4275,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4520,9 +4286,9 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4544,11 +4310,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::instant_snapshots::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InstantSnapshotAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InstantSnapshotAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4557,10 +4321,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::instant_snapshots::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4568,9 +4331,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::instant_snapshots::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstantSnapshot>>,
+        Output = crate::Result<crate::Response<crate::model::InstantSnapshot>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4579,10 +4342,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::instant_snapshots::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4590,10 +4352,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::instant_snapshots::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4601,9 +4362,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::instant_snapshots::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstantSnapshotList>>,
+        Output = crate::Result<crate::Response<crate::model::InstantSnapshotList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4612,10 +4373,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::instant_snapshots::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4623,10 +4383,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::instant_snapshots::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4634,9 +4393,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::instant_snapshots::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4645,10 +4404,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4658,9 +4416,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4669,9 +4427,9 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4693,10 +4451,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::interconnect_attachment_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4704,9 +4461,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::interconnect_attachment_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectAttachmentGroup>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectAttachmentGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4715,10 +4472,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::interconnect_attachment_groups::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4726,12 +4482,10 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn get_operational_status(
         &self,
         _req: crate::model::interconnect_attachment_groups::GetOperationalStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse,
-            >,
+            crate::Response<crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4741,10 +4495,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::interconnect_attachment_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4752,10 +4505,10 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::interconnect_attachment_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectAttachmentGroupsListResponse>,
+            crate::Response<crate::model::InterconnectAttachmentGroupsListResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -4765,10 +4518,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::interconnect_attachment_groups::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4776,10 +4528,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::interconnect_attachment_groups::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4787,9 +4538,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::interconnect_attachment_groups::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4798,10 +4549,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4811,9 +4561,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4822,9 +4572,9 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4846,11 +4596,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::interconnect_attachments::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectAttachmentAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InterconnectAttachmentAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4859,10 +4607,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::interconnect_attachments::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4870,9 +4617,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::interconnect_attachments::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4881,10 +4628,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::interconnect_attachments::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4892,9 +4638,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::interconnect_attachments::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectAttachmentList>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectAttachmentList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -4903,10 +4649,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::interconnect_attachments::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4914,10 +4659,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::interconnect_attachments::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4925,10 +4669,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4938,9 +4681,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -4949,9 +4692,9 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -4973,10 +4716,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn create_members(
         &self,
         _req: crate::model::interconnect_groups::CreateMembersRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4984,10 +4726,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::interconnect_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -4995,9 +4736,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::interconnect_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectGroup>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5006,10 +4747,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::interconnect_groups::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5017,10 +4757,10 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn get_operational_status(
         &self,
         _req: crate::model::interconnect_groups::GetOperationalStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>,
+            crate::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5030,10 +4770,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::interconnect_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5041,11 +4780,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::interconnect_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectGroupsListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InterconnectGroupsListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5054,10 +4791,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::interconnect_groups::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5065,10 +4801,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::interconnect_groups::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5076,9 +4811,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::interconnect_groups::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5087,10 +4822,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5100,9 +4834,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5111,9 +4845,9 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5135,9 +4869,9 @@ pub trait InterconnectLocations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::interconnect_locations::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectLocation>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectLocation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5146,9 +4880,9 @@ pub trait InterconnectLocations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::interconnect_locations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectLocationList>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectLocationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5172,9 +4906,9 @@ pub trait InterconnectRemoteLocations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::interconnect_remote_locations::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectRemoteLocation>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectRemoteLocation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5183,11 +4917,9 @@ pub trait InterconnectRemoteLocations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::interconnect_remote_locations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectRemoteLocationList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InterconnectRemoteLocationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5211,10 +4943,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::interconnects::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5222,9 +4953,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::interconnects::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Interconnect>>,
+        Output = crate::Result<crate::Response<crate::model::Interconnect>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5233,11 +4964,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn get_diagnostics(
         &self,
         _req: crate::model::interconnects::GetDiagnosticsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectsGetDiagnosticsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InterconnectsGetDiagnosticsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5246,11 +4975,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn get_macsec_config(
         &self,
         _req: crate::model::interconnects::GetMacsecConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::InterconnectsGetMacsecConfigResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::InterconnectsGetMacsecConfigResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5259,10 +4986,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::interconnects::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5270,9 +4996,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::interconnects::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectList>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5281,10 +5007,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::interconnects::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5292,10 +5017,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::interconnects::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5303,10 +5027,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5316,9 +5039,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5327,9 +5050,9 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5351,10 +5074,9 @@ pub trait LicenseCodes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::license_codes::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LicenseCode>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::LicenseCode>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5362,9 +5084,9 @@ pub trait LicenseCodes: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::license_codes::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5388,10 +5110,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::licenses::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5399,10 +5120,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::licenses::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::License>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::License>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5410,10 +5130,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::licenses::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5421,10 +5140,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::licenses::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5432,9 +5150,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::licenses::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LicensesListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::LicensesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5443,10 +5161,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::licenses::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5454,9 +5171,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::licenses::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5465,10 +5182,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::licenses::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5476,10 +5192,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5489,9 +5204,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5500,9 +5215,9 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5524,10 +5239,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::machine_images::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5535,9 +5249,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::machine_images::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MachineImage>>,
+        Output = crate::Result<crate::Response<crate::model::MachineImage>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5546,10 +5260,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::machine_images::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5557,10 +5270,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::machine_images::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5568,9 +5280,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::machine_images::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MachineImageList>>,
+        Output = crate::Result<crate::Response<crate::model::MachineImageList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5579,10 +5291,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::machine_images::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5590,10 +5301,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::machine_images::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5601,9 +5311,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::machine_images::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5612,10 +5322,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5625,9 +5334,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5636,9 +5345,9 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5660,9 +5369,9 @@ pub trait MachineTypes: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::machine_types::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MachineTypeAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::MachineTypeAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5671,10 +5380,9 @@ pub trait MachineTypes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::machine_types::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MachineType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::MachineType>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5682,9 +5390,9 @@ pub trait MachineTypes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::machine_types::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MachineTypeList>>,
+        Output = crate::Result<crate::Response<crate::model::MachineTypeList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5708,11 +5416,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::network_attachments::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::NetworkAttachmentAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::NetworkAttachmentAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5721,10 +5427,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::network_attachments::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5732,9 +5437,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::network_attachments::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5743,10 +5448,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::network_attachments::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5754,10 +5458,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::network_attachments::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5765,9 +5468,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::network_attachments::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkAttachmentList>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkAttachmentList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5776,10 +5479,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::network_attachments::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5787,10 +5489,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::network_attachments::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5798,9 +5499,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::network_attachments::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5809,10 +5510,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5822,9 +5522,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5833,9 +5533,9 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5857,10 +5557,10 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::network_edge_security_services::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>,
+            crate::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -5870,10 +5570,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::network_edge_security_services::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5881,9 +5580,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::network_edge_security_services::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEdgeSecurityService>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEdgeSecurityService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5892,10 +5591,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::network_edge_security_services::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5903,10 +5601,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::network_edge_security_services::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5914,10 +5611,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5927,9 +5623,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -5938,9 +5634,9 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -5962,11 +5658,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::network_endpoint_groups::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::NetworkEndpointGroupAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroupAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -5975,10 +5669,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn attach_network_endpoints(
         &self,
         _req: crate::model::network_endpoint_groups::AttachNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5986,10 +5679,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::network_endpoint_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -5997,10 +5689,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn detach_network_endpoints(
         &self,
         _req: crate::model::network_endpoint_groups::DetachNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6008,9 +5699,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::network_endpoint_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6019,10 +5710,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::network_endpoint_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6030,9 +5720,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::network_endpoint_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6041,10 +5731,10 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn list_network_endpoints(
         &self,
         _req: crate::model::network_endpoint_groups::ListNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
+            crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6054,9 +5744,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::network_endpoint_groups::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6065,10 +5755,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6078,9 +5767,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6089,9 +5778,9 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6113,10 +5802,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_association(
         &self,
         _req: crate::model::network_firewall_policies::AddAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6124,10 +5812,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_packet_mirroring_rule(
         &self,
         _req: crate::model::network_firewall_policies::AddPacketMirroringRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6135,10 +5822,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_rule(
         &self,
         _req: crate::model::network_firewall_policies::AddRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6146,11 +5832,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::network_firewall_policies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::NetworkFirewallPolicyAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::NetworkFirewallPolicyAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6159,10 +5843,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn clone_rules(
         &self,
         _req: crate::model::network_firewall_policies::CloneRulesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6170,10 +5853,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::network_firewall_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6181,9 +5863,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::network_firewall_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6192,9 +5874,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_association(
         &self,
         _req: crate::model::network_firewall_policies::GetAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6203,10 +5885,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::network_firewall_policies::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6214,9 +5895,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_packet_mirroring_rule(
         &self,
         _req: crate::model::network_firewall_policies::GetPacketMirroringRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6225,9 +5906,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::network_firewall_policies::GetRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6236,10 +5917,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::network_firewall_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6247,9 +5927,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::network_firewall_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6258,10 +5938,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::network_firewall_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6269,10 +5948,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch_packet_mirroring_rule(
         &self,
         _req: crate::model::network_firewall_policies::PatchPacketMirroringRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6280,10 +5958,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch_rule(
         &self,
         _req: crate::model::network_firewall_policies::PatchRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6291,10 +5968,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_association(
         &self,
         _req: crate::model::network_firewall_policies::RemoveAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6302,10 +5978,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_packet_mirroring_rule(
         &self,
         _req: crate::model::network_firewall_policies::RemovePacketMirroringRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6313,10 +5988,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_rule(
         &self,
         _req: crate::model::network_firewall_policies::RemoveRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6324,10 +5998,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::network_firewall_policies::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6335,9 +6008,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::network_firewall_policies::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6346,10 +6019,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6359,9 +6031,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6370,9 +6042,9 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6394,9 +6066,9 @@ pub trait NetworkProfiles: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::network_profiles::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkProfile>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkProfile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6405,9 +6077,9 @@ pub trait NetworkProfiles: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::network_profiles::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkProfilesListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkProfilesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6431,10 +6103,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn add_peering(
         &self,
         _req: crate::model::networks::AddPeeringRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6442,10 +6113,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::networks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6453,10 +6123,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::networks::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Network>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Network>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6464,10 +6133,10 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn get_effective_firewalls(
         &self,
         _req: crate::model::networks::GetEffectiveFirewallsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::NetworksGetEffectiveFirewallsResponse>,
+            crate::Response<crate::model::NetworksGetEffectiveFirewallsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -6477,10 +6146,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::networks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6488,10 +6156,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::networks::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NetworkList>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6499,9 +6166,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn list_peering_routes(
         &self,
         _req: crate::model::networks::ListPeeringRoutesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExchangedPeeringRoutesList>>,
+        Output = crate::Result<crate::Response<crate::model::ExchangedPeeringRoutesList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6510,10 +6177,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::networks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6521,10 +6187,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn remove_peering(
         &self,
         _req: crate::model::networks::RemovePeeringRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6532,10 +6197,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn request_remove_peering(
         &self,
         _req: crate::model::networks::RequestRemovePeeringRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6543,10 +6207,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn switch_to_custom_mode(
         &self,
         _req: crate::model::networks::SwitchToCustomModeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6554,10 +6217,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn update_peering(
         &self,
         _req: crate::model::networks::UpdatePeeringRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6565,10 +6227,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6578,9 +6239,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6589,9 +6250,9 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6613,10 +6274,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn add_nodes(
         &self,
         _req: crate::model::node_groups::AddNodesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6624,9 +6284,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::node_groups::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeGroupAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::NodeGroupAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6635,10 +6295,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::node_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6646,10 +6305,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn delete_nodes(
         &self,
         _req: crate::model::node_groups::DeleteNodesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6657,10 +6315,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::node_groups::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NodeGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6668,10 +6325,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::node_groups::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6679,10 +6335,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::node_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6690,9 +6345,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::node_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::NodeGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6701,9 +6356,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn list_nodes(
         &self,
         _req: crate::model::node_groups::ListNodesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeGroupsListNodes>>,
+        Output = crate::Result<crate::Response<crate::model::NodeGroupsListNodes>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6712,10 +6367,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::node_groups::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6723,10 +6377,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn perform_maintenance(
         &self,
         _req: crate::model::node_groups::PerformMaintenanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6734,10 +6387,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::node_groups::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6745,10 +6397,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn set_node_template(
         &self,
         _req: crate::model::node_groups::SetNodeTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6756,10 +6407,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn simulate_maintenance_event(
         &self,
         _req: crate::model::node_groups::SimulateMaintenanceEventRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6767,9 +6417,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::node_groups::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6778,10 +6428,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6791,9 +6440,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6802,9 +6451,9 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6826,9 +6475,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::node_templates::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeTemplateAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::NodeTemplateAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6837,10 +6486,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::node_templates::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6848,9 +6496,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::node_templates::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::NodeTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6859,10 +6507,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::node_templates::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6870,10 +6517,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::node_templates::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6881,9 +6527,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::node_templates::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeTemplateList>>,
+        Output = crate::Result<crate::Response<crate::model::NodeTemplateList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6892,10 +6538,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::node_templates::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6903,9 +6548,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::node_templates::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6914,10 +6559,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6927,9 +6571,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -6938,9 +6582,9 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -6962,9 +6606,9 @@ pub trait NodeTypes: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::node_types::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeTypeAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::NodeTypeAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -6973,10 +6617,9 @@ pub trait NodeTypes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::node_types::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NodeType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -6984,9 +6627,9 @@ pub trait NodeTypes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::node_types::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeTypeList>>,
+        Output = crate::Result<crate::Response<crate::model::NodeTypeList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7010,10 +6653,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn add_association(
         &self,
         _req: crate::model::organization_security_policies::AddAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7021,10 +6663,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn add_rule(
         &self,
         _req: crate::model::organization_security_policies::AddRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7032,10 +6673,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn copy_rules(
         &self,
         _req: crate::model::organization_security_policies::CopyRulesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7043,10 +6683,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::organization_security_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7054,9 +6693,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::organization_security_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7065,9 +6704,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_association(
         &self,
         _req: crate::model::organization_security_policies::GetAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyAssociation>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyAssociation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7076,9 +6715,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::organization_security_policies::GetRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7087,10 +6726,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::organization_security_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7098,9 +6736,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::organization_security_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7109,12 +6747,10 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn list_associations(
         &self,
         _req: crate::model::organization_security_policies::ListAssociationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::OrganizationSecurityPoliciesListAssociationsResponse,
-            >,
+            crate::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7124,12 +6760,10 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn list_preconfigured_expression_sets(
         &self,
         _req: crate::model::organization_security_policies::ListPreconfiguredExpressionSetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-            >,
+            crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -7139,10 +6773,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn r#move(
         &self,
         _req: crate::model::organization_security_policies::MoveRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7150,10 +6783,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::organization_security_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7161,10 +6793,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn patch_rule(
         &self,
         _req: crate::model::organization_security_policies::PatchRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7172,10 +6803,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn remove_association(
         &self,
         _req: crate::model::organization_security_policies::RemoveAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7183,10 +6813,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn remove_rule(
         &self,
         _req: crate::model::organization_security_policies::RemoveRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7194,10 +6823,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_organization_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7207,9 +6835,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7218,9 +6846,9 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7242,11 +6870,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::packet_mirrorings::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::PacketMirroringAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::PacketMirroringAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7255,10 +6881,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::packet_mirrorings::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7266,9 +6891,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::packet_mirrorings::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PacketMirroring>>,
+        Output = crate::Result<crate::Response<crate::model::PacketMirroring>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7277,10 +6902,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::packet_mirrorings::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7288,9 +6912,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::packet_mirrorings::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PacketMirroringList>>,
+        Output = crate::Result<crate::Response<crate::model::PacketMirroringList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7299,10 +6923,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::packet_mirrorings::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7310,9 +6933,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::packet_mirrorings::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7321,10 +6944,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7334,9 +6956,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7345,9 +6967,9 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7369,9 +6991,9 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::preview_features::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PreviewFeature>>,
+        Output = crate::Result<crate::Response<crate::model::PreviewFeature>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7380,9 +7002,9 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::preview_features::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PreviewFeatureList>>,
+        Output = crate::Result<crate::Response<crate::model::PreviewFeatureList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7391,10 +7013,9 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::preview_features::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7402,10 +7023,9 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7415,9 +7035,9 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7426,9 +7046,9 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7450,10 +7070,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn disable_xpn_host(
         &self,
         _req: crate::model::projects::DisableXpnHostRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7461,10 +7080,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn disable_xpn_resource(
         &self,
         _req: crate::model::projects::DisableXpnResourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7472,10 +7090,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn enable_xpn_host(
         &self,
         _req: crate::model::projects::EnableXpnHostRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7483,10 +7100,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn enable_xpn_resource(
         &self,
         _req: crate::model::projects::EnableXpnResourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7494,10 +7110,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::projects::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Project>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Project>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7505,10 +7120,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn get_xpn_host(
         &self,
         _req: crate::model::projects::GetXpnHostRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Project>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Project>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7516,9 +7130,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn get_xpn_resources(
         &self,
         _req: crate::model::projects::GetXpnResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProjectsGetXpnResources>>,
+        Output = crate::Result<crate::Response<crate::model::ProjectsGetXpnResources>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7527,10 +7141,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn list_xpn_hosts(
         &self,
         _req: crate::model::projects::ListXpnHostsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::XpnHostList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::XpnHostList>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7538,10 +7151,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn move_disk(
         &self,
         _req: crate::model::projects::MoveDiskRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7549,10 +7161,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn move_instance(
         &self,
         _req: crate::model::projects::MoveInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7560,10 +7171,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn set_cloud_armor_tier(
         &self,
         _req: crate::model::projects::SetCloudArmorTierRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7571,10 +7181,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn set_common_instance_metadata(
         &self,
         _req: crate::model::projects::SetCommonInstanceMetadataRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7582,10 +7191,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn set_default_network_tier(
         &self,
         _req: crate::model::projects::SetDefaultNetworkTierRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7593,10 +7201,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn set_usage_export_bucket(
         &self,
         _req: crate::model::projects::SetUsageExportBucketRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7604,10 +7211,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7617,9 +7223,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7628,9 +7234,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7652,10 +7258,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn announce(
         &self,
         _req: crate::model::public_advertised_prefixes::AnnounceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7663,10 +7268,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::public_advertised_prefixes::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7674,9 +7278,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::public_advertised_prefixes::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicAdvertisedPrefix>>,
+        Output = crate::Result<crate::Response<crate::model::PublicAdvertisedPrefix>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7685,10 +7289,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::public_advertised_prefixes::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7696,9 +7299,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::public_advertised_prefixes::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicAdvertisedPrefixList>>,
+        Output = crate::Result<crate::Response<crate::model::PublicAdvertisedPrefixList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7707,10 +7310,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::public_advertised_prefixes::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7718,10 +7320,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn withdraw(
         &self,
         _req: crate::model::public_advertised_prefixes::WithdrawRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7729,10 +7330,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7742,9 +7342,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7753,9 +7353,9 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7777,11 +7377,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::public_delegated_prefixes::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::PublicDelegatedPrefixAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::PublicDelegatedPrefixAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7790,10 +7388,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn announce(
         &self,
         _req: crate::model::public_delegated_prefixes::AnnounceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7801,10 +7398,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::public_delegated_prefixes::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7812,9 +7408,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::public_delegated_prefixes::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefix>>,
+        Output = crate::Result<crate::Response<crate::model::PublicDelegatedPrefix>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7823,10 +7419,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::public_delegated_prefixes::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7834,9 +7429,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::public_delegated_prefixes::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>>,
+        Output = crate::Result<crate::Response<crate::model::PublicDelegatedPrefixList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7845,10 +7440,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::public_delegated_prefixes::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7856,10 +7450,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn withdraw(
         &self,
         _req: crate::model::public_delegated_prefixes::WithdrawRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7867,10 +7460,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7880,9 +7472,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -7891,9 +7483,9 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -7915,10 +7507,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_autoscalers::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7926,10 +7517,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_autoscalers::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Autoscaler>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Autoscaler>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7937,10 +7527,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_autoscalers::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7948,9 +7537,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_autoscalers::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RegionAutoscalerList>>,
+        Output = crate::Result<crate::Response<crate::model::RegionAutoscalerList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7959,10 +7548,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_autoscalers::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7970,9 +7558,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_autoscalers::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -7981,10 +7569,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::region_autoscalers::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -7992,10 +7579,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8005,9 +7591,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8016,9 +7602,9 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -8040,10 +7626,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_backend_services::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8051,9 +7636,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_backend_services::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendService>>,
+        Output = crate::Result<crate::Response<crate::model::BackendService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8062,9 +7647,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn get_health(
         &self,
         _req: crate::model::region_backend_services::GetHealthRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceGroupHealth>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceGroupHealth>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8073,10 +7658,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::region_backend_services::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8084,10 +7668,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_backend_services::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8095,9 +7678,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_backend_services::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceList>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8106,9 +7689,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn list_usable(
         &self,
         _req: crate::model::region_backend_services::ListUsableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackendServiceListUsable>>,
+        Output = crate::Result<crate::Response<crate::model::BackendServiceListUsable>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8117,10 +7700,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_backend_services::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8128,10 +7710,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::region_backend_services::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8139,10 +7720,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn set_security_policy(
         &self,
         _req: crate::model::region_backend_services::SetSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8150,9 +7730,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_backend_services::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8161,10 +7741,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::region_backend_services::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8172,10 +7751,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8185,9 +7763,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8196,9 +7774,9 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -8220,9 +7798,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::region_commitments::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CommitmentAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::CommitmentAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8231,10 +7809,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_commitments::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Commitment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Commitment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8242,10 +7819,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_commitments::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8253,9 +7829,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_commitments::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CommitmentList>>,
+        Output = crate::Result<crate::Response<crate::model::CommitmentList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8264,10 +7840,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::region_commitments::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8275,10 +7850,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8288,9 +7862,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8299,9 +7873,9 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -8323,10 +7897,9 @@ pub trait RegionDiskTypes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_disk_types::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DiskType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8334,9 +7907,9 @@ pub trait RegionDiskTypes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_disk_types::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RegionDiskTypeList>>,
+        Output = crate::Result<crate::Response<crate::model::RegionDiskTypeList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8360,10 +7933,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn add_resource_policies(
         &self,
         _req: crate::model::region_disks::AddResourcePoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8371,10 +7943,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn bulk_insert(
         &self,
         _req: crate::model::region_disks::BulkInsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8382,10 +7953,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn create_snapshot(
         &self,
         _req: crate::model::region_disks::CreateSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8393,10 +7963,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_disks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8404,10 +7973,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_disks::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Disk>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Disk>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8415,10 +7983,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::region_disks::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8426,10 +7993,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_disks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8437,10 +8003,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_disks::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiskList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DiskList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8448,10 +8013,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn remove_resource_policies(
         &self,
         _req: crate::model::region_disks::RemoveResourcePoliciesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8459,10 +8023,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn resize(
         &self,
         _req: crate::model::region_disks::ResizeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8470,10 +8033,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::region_disks::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8481,10 +8043,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::region_disks::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8492,10 +8053,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn start_async_replication(
         &self,
         _req: crate::model::region_disks::StartAsyncReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8503,10 +8063,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn stop_async_replication(
         &self,
         _req: crate::model::region_disks::StopAsyncReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8514,10 +8073,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn stop_group_async_replication(
         &self,
         _req: crate::model::region_disks::StopGroupAsyncReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8525,9 +8083,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_disks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8536,10 +8094,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::region_disks::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8547,10 +8104,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8560,9 +8116,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8571,9 +8127,9 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -8595,10 +8151,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_health_check_services::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8606,9 +8161,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_health_check_services::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthCheckService>>,
+        Output = crate::Result<crate::Response<crate::model::HealthCheckService>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8617,10 +8172,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_health_check_services::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8628,9 +8182,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_health_check_services::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthCheckServicesList>>,
+        Output = crate::Result<crate::Response<crate::model::HealthCheckServicesList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8639,10 +8193,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_health_check_services::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8650,9 +8203,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_health_check_services::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8661,10 +8214,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8674,9 +8226,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8685,9 +8237,9 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -8709,10 +8261,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_health_checks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8720,10 +8271,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_health_checks::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthCheck>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::HealthCheck>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8731,10 +8281,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_health_checks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8742,9 +8291,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_health_checks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HealthCheckList>>,
+        Output = crate::Result<crate::Response<crate::model::HealthCheckList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8753,10 +8302,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_health_checks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8764,9 +8312,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_health_checks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8775,10 +8323,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::region_health_checks::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8786,10 +8333,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8799,9 +8345,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -8810,9 +8356,9 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -8834,10 +8380,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn abandon_instances(
         &self,
         _req: crate::model::region_instance_group_managers::AbandonInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8845,10 +8390,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn apply_updates_to_instances(
         &self,
         _req: crate::model::region_instance_group_managers::ApplyUpdatesToInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8856,10 +8400,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn create_instances(
         &self,
         _req: crate::model::region_instance_group_managers::CreateInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8867,10 +8410,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_instance_group_managers::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8878,10 +8420,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn delete_instances(
         &self,
         _req: crate::model::region_instance_group_managers::DeleteInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8889,10 +8430,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn delete_per_instance_configs(
         &self,
         _req: crate::model::region_instance_group_managers::DeletePerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8900,9 +8440,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_instance_group_managers::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroupManager>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroupManager>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8911,10 +8451,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_instance_group_managers::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8922,11 +8461,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_instance_group_managers::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RegionInstanceGroupManagerList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RegionInstanceGroupManagerList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -8935,10 +8472,10 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list_errors(
         &self,
         _req: crate::model::region_instance_group_managers::ListErrorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>,
+            crate::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -8948,10 +8485,10 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list_managed_instances(
         &self,
         _req: crate::model::region_instance_group_managers::ListManagedInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
+            crate::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -8961,12 +8498,10 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn list_per_instance_configs(
         &self,
         _req: crate::model::region_instance_group_managers::ListPerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::RegionInstanceGroupManagersListInstanceConfigsResp,
-            >,
+            crate::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -8976,10 +8511,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_instance_group_managers::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8987,10 +8521,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn patch_per_instance_configs(
         &self,
         _req: crate::model::region_instance_group_managers::PatchPerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -8998,10 +8531,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn recreate_instances(
         &self,
         _req: crate::model::region_instance_group_managers::RecreateInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9009,10 +8541,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn resize(
         &self,
         _req: crate::model::region_instance_group_managers::ResizeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9020,10 +8551,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn resume_instances(
         &self,
         _req: crate::model::region_instance_group_managers::ResumeInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9031,10 +8561,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn set_instance_template(
         &self,
         _req: crate::model::region_instance_group_managers::SetInstanceTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9042,21 +8571,19 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn set_target_pools(
         &self,
         _req: crate::model::region_instance_group_managers::SetTargetPoolsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
     /// Implements [super::client::RegionInstanceGroupManagers::start_instances].
     fn start_instances(
         &self,
-        _req: crate::model::region_instance_group_managers::StartInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _req: crate::model::region_instance_group_managers::StartInstancesRequest,
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9064,10 +8591,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn stop_instances(
         &self,
         _req: crate::model::region_instance_group_managers::StopInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9075,10 +8601,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn suspend_instances(
         &self,
         _req: crate::model::region_instance_group_managers::SuspendInstancesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9086,10 +8611,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn update_per_instance_configs(
         &self,
         _req: crate::model::region_instance_group_managers::UpdatePerInstanceConfigsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9097,10 +8621,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9110,9 +8633,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9121,9 +8644,9 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9145,9 +8668,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_instance_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceGroup>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9156,9 +8679,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_instance_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RegionInstanceGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::RegionInstanceGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9167,11 +8690,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::region_instance_groups::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RegionInstanceGroupsListInstances>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RegionInstanceGroupsListInstances>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9180,10 +8701,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     fn set_named_ports(
         &self,
         _req: crate::model::region_instance_groups::SetNamedPortsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9191,9 +8711,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_instance_groups::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9202,10 +8722,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9215,9 +8734,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9226,9 +8745,9 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9250,10 +8769,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_instance_templates::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9261,9 +8779,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_instance_templates::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9272,10 +8790,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_instance_templates::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9283,9 +8800,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_instance_templates::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstanceTemplateList>>,
+        Output = crate::Result<crate::Response<crate::model::InstanceTemplateList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9294,10 +8811,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9307,9 +8823,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9318,9 +8834,9 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9342,10 +8858,9 @@ pub trait RegionInstances: std::fmt::Debug + Send + Sync {
     fn bulk_insert(
         &self,
         _req: crate::model::region_instances::BulkInsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9353,10 +8868,9 @@ pub trait RegionInstances: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9366,9 +8880,9 @@ pub trait RegionInstances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9377,9 +8891,9 @@ pub trait RegionInstances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9401,10 +8915,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_instant_snapshots::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9412,9 +8925,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_instant_snapshots::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstantSnapshot>>,
+        Output = crate::Result<crate::Response<crate::model::InstantSnapshot>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9423,10 +8936,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::region_instant_snapshots::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9434,10 +8946,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_instant_snapshots::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9445,9 +8956,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_instant_snapshots::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstantSnapshotList>>,
+        Output = crate::Result<crate::Response<crate::model::InstantSnapshotList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9456,10 +8967,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::region_instant_snapshots::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9467,10 +8977,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::region_instant_snapshots::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9478,9 +8987,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_instant_snapshots::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9489,10 +8998,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9502,9 +9010,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9513,9 +9021,9 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9537,10 +9045,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn attach_network_endpoints(
         &self,
         _req: crate::model::region_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9548,10 +9055,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_network_endpoint_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9559,10 +9065,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn detach_network_endpoints(
         &self,
         _req: crate::model::region_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9570,9 +9075,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_network_endpoint_groups::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9581,10 +9086,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_network_endpoint_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9592,9 +9096,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_network_endpoint_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9603,10 +9107,10 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn list_network_endpoints(
         &self,
         _req: crate::model::region_network_endpoint_groups::ListNetworkEndpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
+            crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -9616,10 +9120,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9629,9 +9132,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9640,9 +9143,9 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9664,10 +9167,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_association(
         &self,
         _req: crate::model::region_network_firewall_policies::AddAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9675,10 +9177,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn add_rule(
         &self,
         _req: crate::model::region_network_firewall_policies::AddRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9686,10 +9187,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn clone_rules(
         &self,
         _req: crate::model::region_network_firewall_policies::CloneRulesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9697,10 +9197,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_network_firewall_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9708,9 +9207,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_network_firewall_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9719,9 +9218,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_association(
         &self,
         _req: crate::model::region_network_firewall_policies::GetAssociationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9730,10 +9229,10 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_effective_firewalls(
         &self,
         _req: crate::model::region_network_firewall_policies::GetEffectiveFirewallsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
+            crate::Response<
                 crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse,
             >,
         >,
@@ -9745,10 +9244,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::region_network_firewall_policies::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9756,9 +9254,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::region_network_firewall_policies::GetRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9767,10 +9265,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_network_firewall_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9778,9 +9275,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_network_firewall_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FirewallPolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::FirewallPolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9789,10 +9286,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_network_firewall_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9800,10 +9296,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn patch_rule(
         &self,
         _req: crate::model::region_network_firewall_policies::PatchRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9811,10 +9306,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_association(
         &self,
         _req: crate::model::region_network_firewall_policies::RemoveAssociationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9822,10 +9316,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn remove_rule(
         &self,
         _req: crate::model::region_network_firewall_policies::RemoveRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9833,10 +9326,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::region_network_firewall_policies::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9844,9 +9336,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_network_firewall_policies::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9855,10 +9347,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9868,9 +9359,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9879,9 +9370,9 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -9903,10 +9394,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_notification_endpoints::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9914,9 +9404,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_notification_endpoints::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NotificationEndpoint>>,
+        Output = crate::Result<crate::Response<crate::model::NotificationEndpoint>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9925,10 +9415,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_notification_endpoints::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9936,9 +9425,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_notification_endpoints::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NotificationEndpointList>>,
+        Output = crate::Result<crate::Response<crate::model::NotificationEndpointList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9947,9 +9436,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::region_notification_endpoints::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -9958,10 +9447,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -9971,9 +9459,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -9982,9 +9470,9 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10006,8 +9494,8 @@ pub trait RegionOperations: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_operations::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10015,10 +9503,9 @@ pub trait RegionOperations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10026,9 +9513,9 @@ pub trait RegionOperations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_operations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::OperationList>>,
+        Output = crate::Result<crate::Response<crate::model::OperationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10037,10 +9524,9 @@ pub trait RegionOperations: std::fmt::Debug + Send + Sync {
     fn wait(
         &self,
         _req: crate::model::region_operations::WaitRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -10063,10 +9549,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn add_rule(
         &self,
         _req: crate::model::region_security_policies::AddRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10074,10 +9559,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_security_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10085,9 +9569,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_security_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10096,9 +9580,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::region_security_policies::GetRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10107,10 +9591,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_security_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10118,9 +9601,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_security_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10129,10 +9612,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_security_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10140,10 +9622,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn patch_rule(
         &self,
         _req: crate::model::region_security_policies::PatchRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10151,10 +9632,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn remove_rule(
         &self,
         _req: crate::model::region_security_policies::RemoveRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10162,10 +9642,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::region_security_policies::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10173,10 +9652,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10186,9 +9664,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10197,9 +9675,9 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10221,10 +9699,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_ssl_certificates::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10232,9 +9709,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_ssl_certificates::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslCertificate>>,
+        Output = crate::Result<crate::Response<crate::model::SslCertificate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10243,10 +9720,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_ssl_certificates::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10254,9 +9730,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_ssl_certificates::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslCertificateList>>,
+        Output = crate::Result<crate::Response<crate::model::SslCertificateList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10265,10 +9741,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10278,9 +9753,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10289,9 +9764,9 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10313,10 +9788,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_ssl_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10324,10 +9798,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_ssl_policies::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SslPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10335,10 +9808,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_ssl_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10346,9 +9818,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_ssl_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslPoliciesList>>,
+        Output = crate::Result<crate::Response<crate::model::SslPoliciesList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10357,10 +9829,10 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn list_available_features(
         &self,
         _req: crate::model::region_ssl_policies::ListAvailableFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
+            crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -10370,10 +9842,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_ssl_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10381,10 +9852,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10394,9 +9864,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10405,9 +9875,9 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10429,10 +9899,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_target_http_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10440,9 +9909,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_target_http_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10451,10 +9920,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_target_http_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10462,9 +9930,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_target_http_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10473,10 +9941,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn set_url_map(
         &self,
         _req: crate::model::region_target_http_proxies::SetUrlMapRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10484,10 +9951,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10497,9 +9963,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10508,9 +9974,9 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10532,10 +9998,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_target_https_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10543,9 +10008,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_target_https_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpsProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpsProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10554,10 +10019,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_target_https_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10565,9 +10029,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_target_https_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpsProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpsProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10576,10 +10040,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_target_https_proxies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10587,10 +10050,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_ssl_certificates(
         &self,
         _req: crate::model::region_target_https_proxies::SetSslCertificatesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10598,10 +10060,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_url_map(
         &self,
         _req: crate::model::region_target_https_proxies::SetUrlMapRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10609,10 +10070,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10622,9 +10082,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10633,9 +10093,9 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10657,10 +10117,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_target_tcp_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10668,9 +10127,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_target_tcp_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetTcpProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetTcpProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10679,10 +10138,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_target_tcp_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10690,9 +10148,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_target_tcp_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetTcpProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetTcpProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10701,10 +10159,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10714,9 +10171,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10725,9 +10182,9 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10749,10 +10206,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::region_url_maps::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10760,10 +10216,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::region_url_maps::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMap>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::UrlMap>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10771,10 +10226,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::region_url_maps::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10782,10 +10236,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_url_maps::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMapList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::UrlMapList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10793,10 +10246,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::region_url_maps::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10804,10 +10256,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::region_url_maps::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10815,9 +10266,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn validate(
         &self,
         _req: crate::model::region_url_maps::ValidateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMapsValidateResponse>>,
+        Output = crate::Result<crate::Response<crate::model::UrlMapsValidateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10826,10 +10277,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10839,9 +10289,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -10850,9 +10300,9 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -10874,10 +10324,9 @@ pub trait RegionZones: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::region_zones::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ZoneList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ZoneList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -10900,10 +10349,9 @@ pub trait Regions: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::regions::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Region>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Region>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10911,10 +10359,9 @@ pub trait Regions: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::regions::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RegionList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RegionList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -10937,9 +10384,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::reservation_blocks::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationBlocksGetResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationBlocksGetResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10948,10 +10395,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::reservation_blocks::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10959,11 +10405,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::reservation_blocks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ReservationBlocksListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ReservationBlocksListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -10972,10 +10416,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn perform_maintenance(
         &self,
         _req: crate::model::reservation_blocks::PerformMaintenanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10983,10 +10426,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::reservation_blocks::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -10994,9 +10436,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::reservation_blocks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11005,10 +10447,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11018,9 +10459,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11029,9 +10470,9 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11053,9 +10494,9 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::reservation_slots::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationSlotsGetResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationSlotsGetResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11064,9 +10505,9 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::reservation_slots::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationSlotsListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationSlotsListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11075,10 +10516,9 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::reservation_slots::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11086,10 +10526,9 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11099,9 +10538,9 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11110,9 +10549,9 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11134,11 +10573,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::reservation_sub_blocks::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ReservationSubBlocksGetResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ReservationSubBlocksGetResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11147,10 +10584,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::reservation_sub_blocks::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11158,11 +10594,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::reservation_sub_blocks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ReservationSubBlocksListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ReservationSubBlocksListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11171,10 +10605,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn perform_maintenance(
         &self,
         _req: crate::model::reservation_sub_blocks::PerformMaintenanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11182,10 +10615,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn report_faulty(
         &self,
         _req: crate::model::reservation_sub_blocks::ReportFaultyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11193,10 +10625,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::reservation_sub_blocks::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11204,9 +10635,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::reservation_sub_blocks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11215,10 +10646,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11228,9 +10658,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11239,9 +10669,9 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11263,9 +10693,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::reservations::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11274,10 +10704,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::reservations::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11285,10 +10714,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::reservations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Reservation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Reservation>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11296,10 +10724,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::reservations::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11307,10 +10734,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::reservations::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11318,9 +10744,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::reservations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReservationList>>,
+        Output = crate::Result<crate::Response<crate::model::ReservationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11329,10 +10755,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn perform_maintenance(
         &self,
         _req: crate::model::reservations::PerformMaintenanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11340,10 +10765,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn resize(
         &self,
         _req: crate::model::reservations::ResizeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11351,10 +10775,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::reservations::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11362,9 +10785,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::reservations::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11373,10 +10796,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::reservations::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11384,10 +10806,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11397,9 +10818,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11408,9 +10829,9 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11432,9 +10853,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::resource_policies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourcePolicyAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::ResourcePolicyAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11443,10 +10864,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::resource_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11454,9 +10874,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::resource_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourcePolicy>>,
+        Output = crate::Result<crate::Response<crate::model::ResourcePolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11465,10 +10885,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::resource_policies::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11476,10 +10895,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::resource_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11487,9 +10905,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::resource_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourcePolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::ResourcePolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11498,10 +10916,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::resource_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11509,10 +10926,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::resource_policies::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11520,9 +10936,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::resource_policies::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11531,10 +10947,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11544,9 +10959,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11555,9 +10970,9 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11579,9 +10994,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::routers::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RouterAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::RouterAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11590,10 +11005,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::routers::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11601,10 +11015,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn delete_route_policy(
         &self,
         _req: crate::model::routers::DeleteRoutePolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11612,10 +11025,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::routers::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Router>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Router>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11623,9 +11035,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn get_nat_ip_info(
         &self,
         _req: crate::model::routers::GetNatIpInfoRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NatIpInfoResponse>>,
+        Output = crate::Result<crate::Response<crate::model::NatIpInfoResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11634,9 +11046,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn get_nat_mapping_info(
         &self,
         _req: crate::model::routers::GetNatMappingInfoRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VmEndpointNatMappingsList>>,
+        Output = crate::Result<crate::Response<crate::model::VmEndpointNatMappingsList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11645,11 +11057,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn get_route_policy(
         &self,
         _req: crate::model::routers::GetRoutePolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RoutersGetRoutePolicyResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RoutersGetRoutePolicyResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11658,9 +11068,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn get_router_status(
         &self,
         _req: crate::model::routers::GetRouterStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RouterStatusResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RouterStatusResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11669,10 +11079,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::routers::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11680,10 +11089,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::routers::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RouterList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RouterList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11691,9 +11099,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn list_bgp_routes(
         &self,
         _req: crate::model::routers::ListBgpRoutesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RoutersListBgpRoutes>>,
+        Output = crate::Result<crate::Response<crate::model::RoutersListBgpRoutes>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11702,9 +11110,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn list_route_policies(
         &self,
         _req: crate::model::routers::ListRoutePoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RoutersListRoutePolicies>>,
+        Output = crate::Result<crate::Response<crate::model::RoutersListRoutePolicies>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11713,10 +11121,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::routers::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11724,10 +11131,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn patch_route_policy(
         &self,
         _req: crate::model::routers::PatchRoutePolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11735,9 +11141,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn preview(
         &self,
         _req: crate::model::routers::PreviewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RoutersPreviewResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RoutersPreviewResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11746,10 +11152,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::routers::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11757,10 +11162,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn update_route_policy(
         &self,
         _req: crate::model::routers::UpdateRoutePolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11768,10 +11172,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11781,9 +11184,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11792,9 +11195,9 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11816,10 +11219,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::routes::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11827,10 +11229,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::routes::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Route>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Route>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11838,10 +11239,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::routes::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11849,10 +11249,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::routes::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RouteList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RouteList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11860,9 +11259,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::routes::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11871,10 +11270,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11884,9 +11282,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -11895,9 +11293,9 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -11919,10 +11317,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn add_rule(
         &self,
         _req: crate::model::security_policies::AddRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11930,11 +11327,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::security_policies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SecurityPoliciesAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SecurityPoliciesAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11942,11 +11337,10 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     /// Implements [super::client::SecurityPolicies::delete].
     fn delete(
         &self,
-        _req: crate::model::security_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _req: crate::model::security_policies::DeleteRequest,
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11954,9 +11348,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::security_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11965,9 +11359,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_rule(
         &self,
         _req: crate::model::security_policies::GetRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11976,10 +11370,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::security_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -11987,9 +11380,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::security_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecurityPolicyList>>,
+        Output = crate::Result<crate::Response<crate::model::SecurityPolicyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -11998,12 +11391,10 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn list_preconfigured_expression_sets(
         &self,
         _req: crate::model::security_policies::ListPreconfiguredExpressionSetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-            >,
+            crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -12013,10 +11404,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::security_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12024,10 +11414,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn patch_rule(
         &self,
         _req: crate::model::security_policies::PatchRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12035,10 +11424,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn remove_rule(
         &self,
         _req: crate::model::security_policies::RemoveRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12046,10 +11434,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::security_policies::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12057,10 +11444,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12070,9 +11456,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12081,9 +11467,9 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12105,11 +11491,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::service_attachments::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ServiceAttachmentAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ServiceAttachmentAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12118,10 +11502,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::service_attachments::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12129,9 +11512,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::service_attachments::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12140,10 +11523,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::service_attachments::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12151,10 +11533,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::service_attachments::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12162,9 +11543,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::service_attachments::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceAttachmentList>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceAttachmentList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12173,10 +11554,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::service_attachments::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12184,10 +11564,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::service_attachments::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12195,9 +11574,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::service_attachments::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12206,10 +11585,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12219,9 +11597,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12230,9 +11608,9 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12254,9 +11632,9 @@ pub trait SnapshotSettings: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::snapshot_settings::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SnapshotSettings>>,
+        Output = crate::Result<crate::Response<crate::model::SnapshotSettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12265,10 +11643,9 @@ pub trait SnapshotSettings: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::snapshot_settings::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12276,10 +11653,9 @@ pub trait SnapshotSettings: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12289,9 +11665,9 @@ pub trait SnapshotSettings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12300,9 +11676,9 @@ pub trait SnapshotSettings: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12324,10 +11700,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::snapshots::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12335,10 +11710,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::snapshots::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Snapshot>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Snapshot>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12346,10 +11720,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::snapshots::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12357,10 +11730,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::snapshots::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12368,9 +11740,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::snapshots::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SnapshotList>>,
+        Output = crate::Result<crate::Response<crate::model::SnapshotList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12379,10 +11751,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::snapshots::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12390,10 +11761,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::snapshots::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12401,9 +11771,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::snapshots::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12412,10 +11782,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12425,9 +11794,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12436,9 +11805,9 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12460,9 +11829,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::ssl_certificates::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslCertificateAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::SslCertificateAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12471,10 +11840,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::ssl_certificates::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12482,9 +11850,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::ssl_certificates::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslCertificate>>,
+        Output = crate::Result<crate::Response<crate::model::SslCertificate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12493,10 +11861,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::ssl_certificates::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12504,9 +11871,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::ssl_certificates::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslCertificateList>>,
+        Output = crate::Result<crate::Response<crate::model::SslCertificateList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12515,10 +11882,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12528,9 +11894,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12539,9 +11905,9 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12563,9 +11929,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::ssl_policies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslPoliciesAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::SslPoliciesAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12574,10 +11940,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::ssl_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12585,10 +11950,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::ssl_policies::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslPolicy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SslPolicy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12596,10 +11960,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::ssl_policies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12607,9 +11970,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::ssl_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SslPoliciesList>>,
+        Output = crate::Result<crate::Response<crate::model::SslPoliciesList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12618,10 +11981,10 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn list_available_features(
         &self,
         _req: crate::model::ssl_policies::ListAvailableFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
+            crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -12631,10 +11994,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::ssl_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12642,10 +12004,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12655,9 +12016,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12666,9 +12027,9 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12690,11 +12051,9 @@ pub trait StoragePoolTypes: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::storage_pool_types::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::StoragePoolTypeAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::StoragePoolTypeAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12703,9 +12062,9 @@ pub trait StoragePoolTypes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::storage_pool_types::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePoolType>>,
+        Output = crate::Result<crate::Response<crate::model::StoragePoolType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12714,9 +12073,9 @@ pub trait StoragePoolTypes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::storage_pool_types::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePoolTypeList>>,
+        Output = crate::Result<crate::Response<crate::model::StoragePoolTypeList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12740,9 +12099,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::storage_pools::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePoolAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::StoragePoolAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12751,10 +12110,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::storage_pools::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12762,10 +12120,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::storage_pools::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::StoragePool>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12773,10 +12130,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::storage_pools::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12784,10 +12140,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::storage_pools::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12795,9 +12150,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::storage_pools::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePoolList>>,
+        Output = crate::Result<crate::Response<crate::model::StoragePoolList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12806,9 +12161,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn list_disks(
         &self,
         _req: crate::model::storage_pools::ListDisksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePoolListDisks>>,
+        Output = crate::Result<crate::Response<crate::model::StoragePoolListDisks>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12817,10 +12172,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::storage_pools::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12828,9 +12182,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::storage_pools::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12839,10 +12193,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::storage_pools::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12850,10 +12203,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12863,9 +12215,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -12874,9 +12226,9 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -12898,9 +12250,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::subnetworks::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SubnetworkAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::SubnetworkAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12909,10 +12261,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::subnetworks::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12920,10 +12271,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn expand_ip_cidr_range(
         &self,
         _req: crate::model::subnetworks::ExpandIpCidrRangeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12931,10 +12281,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::subnetworks::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Subnetwork>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Subnetwork>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12942,10 +12291,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::subnetworks::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12953,10 +12301,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::subnetworks::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12964,9 +12311,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::subnetworks::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SubnetworkList>>,
+        Output = crate::Result<crate::Response<crate::model::SubnetworkList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12975,11 +12322,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn list_usable(
         &self,
         _req: crate::model::subnetworks::ListUsableRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::UsableSubnetworksAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::UsableSubnetworksAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -12988,10 +12333,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::subnetworks::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -12999,10 +12343,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::subnetworks::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13010,10 +12353,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn set_private_ip_google_access(
         &self,
         _req: crate::model::subnetworks::SetPrivateIpGoogleAccessRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13021,9 +12363,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::subnetworks::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13032,10 +12374,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13045,9 +12386,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13056,9 +12397,9 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13080,10 +12421,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_grpc_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13091,9 +12431,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_grpc_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetGrpcProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetGrpcProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13102,10 +12442,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_grpc_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13113,9 +12452,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_grpc_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetGrpcProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetGrpcProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13124,10 +12463,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::target_grpc_proxies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13135,10 +12473,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13148,9 +12485,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13159,9 +12496,9 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13183,11 +12520,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::target_http_proxies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::TargetHttpProxyAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpProxyAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13196,10 +12531,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_http_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13207,9 +12541,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_http_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13218,10 +12552,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_http_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13229,9 +12562,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_http_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13240,10 +12573,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::target_http_proxies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13251,10 +12583,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn set_url_map(
         &self,
         _req: crate::model::target_http_proxies::SetUrlMapRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13262,10 +12593,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13275,9 +12605,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13286,9 +12616,9 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13310,11 +12640,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::target_https_proxies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::TargetHttpsProxyAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpsProxyAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13323,10 +12651,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_https_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13334,9 +12661,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_https_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpsProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpsProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13345,10 +12672,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_https_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13356,9 +12682,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_https_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetHttpsProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetHttpsProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13367,10 +12693,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::target_https_proxies::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13378,10 +12703,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_certificate_map(
         &self,
         _req: crate::model::target_https_proxies::SetCertificateMapRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13389,10 +12713,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_quic_override(
         &self,
         _req: crate::model::target_https_proxies::SetQuicOverrideRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13400,10 +12723,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_ssl_certificates(
         &self,
         _req: crate::model::target_https_proxies::SetSslCertificatesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13411,10 +12733,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_ssl_policy(
         &self,
         _req: crate::model::target_https_proxies::SetSslPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13422,10 +12743,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn set_url_map(
         &self,
         _req: crate::model::target_https_proxies::SetUrlMapRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13433,10 +12753,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13446,9 +12765,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13457,9 +12776,9 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13481,9 +12800,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::target_instances::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetInstanceAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetInstanceAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13492,10 +12811,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_instances::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13503,9 +12821,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_instances::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetInstance>>,
+        Output = crate::Result<crate::Response<crate::model::TargetInstance>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13514,10 +12832,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_instances::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13525,9 +12842,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_instances::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetInstanceList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetInstanceList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13536,10 +12853,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn set_security_policy(
         &self,
         _req: crate::model::target_instances::SetSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13547,9 +12863,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::target_instances::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13558,10 +12874,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13571,9 +12886,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13582,9 +12897,9 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13606,10 +12921,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn add_health_check(
         &self,
         _req: crate::model::target_pools::AddHealthCheckRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13617,10 +12931,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn add_instance(
         &self,
         _req: crate::model::target_pools::AddInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13628,9 +12941,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::target_pools::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetPoolAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetPoolAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13639,10 +12952,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_pools::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13650,10 +12962,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_pools::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetPool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TargetPool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13661,9 +12972,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn get_health(
         &self,
         _req: crate::model::target_pools::GetHealthRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetPoolInstanceHealth>>,
+        Output = crate::Result<crate::Response<crate::model::TargetPoolInstanceHealth>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13672,10 +12983,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_pools::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13683,9 +12993,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_pools::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetPoolList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetPoolList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13694,10 +13004,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn remove_health_check(
         &self,
         _req: crate::model::target_pools::RemoveHealthCheckRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13705,10 +13014,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn remove_instance(
         &self,
         _req: crate::model::target_pools::RemoveInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13716,10 +13024,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn set_backup(
         &self,
         _req: crate::model::target_pools::SetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13727,10 +13034,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn set_security_policy(
         &self,
         _req: crate::model::target_pools::SetSecurityPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13738,9 +13044,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::target_pools::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13749,10 +13055,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13762,9 +13067,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13773,9 +13078,9 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13797,10 +13102,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_ssl_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13808,9 +13112,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_ssl_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetSslProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetSslProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13819,10 +13123,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_ssl_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13830,9 +13133,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_ssl_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetSslProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetSslProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13841,10 +13144,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn set_backend_service(
         &self,
         _req: crate::model::target_ssl_proxies::SetBackendServiceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13852,10 +13154,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn set_certificate_map(
         &self,
         _req: crate::model::target_ssl_proxies::SetCertificateMapRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13863,10 +13164,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn set_proxy_header(
         &self,
         _req: crate::model::target_ssl_proxies::SetProxyHeaderRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13874,10 +13174,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn set_ssl_certificates(
         &self,
         _req: crate::model::target_ssl_proxies::SetSslCertificatesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13885,10 +13184,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn set_ssl_policy(
         &self,
         _req: crate::model::target_ssl_proxies::SetSslPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13896,9 +13194,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::target_ssl_proxies::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13907,10 +13205,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13920,9 +13217,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -13931,9 +13228,9 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -13955,9 +13252,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::target_tcp_proxies::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetTcpProxyAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetTcpProxyAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13966,10 +13263,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_tcp_proxies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13977,9 +13273,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_tcp_proxies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetTcpProxy>>,
+        Output = crate::Result<crate::Response<crate::model::TargetTcpProxy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -13988,10 +13284,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_tcp_proxies::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -13999,9 +13294,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_tcp_proxies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetTcpProxyList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetTcpProxyList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14010,10 +13305,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn set_backend_service(
         &self,
         _req: crate::model::target_tcp_proxies::SetBackendServiceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14021,10 +13315,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn set_proxy_header(
         &self,
         _req: crate::model::target_tcp_proxies::SetProxyHeaderRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14032,9 +13325,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::target_tcp_proxies::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14043,10 +13336,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14056,9 +13348,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -14067,9 +13359,9 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -14091,11 +13383,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::target_vpn_gateways::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::TargetVpnGatewayAggregatedList>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::TargetVpnGatewayAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14104,10 +13394,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::target_vpn_gateways::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14115,9 +13404,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::target_vpn_gateways::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetVpnGateway>>,
+        Output = crate::Result<crate::Response<crate::model::TargetVpnGateway>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14126,10 +13415,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::target_vpn_gateways::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14137,9 +13425,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::target_vpn_gateways::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetVpnGatewayList>>,
+        Output = crate::Result<crate::Response<crate::model::TargetVpnGatewayList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14148,10 +13436,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::target_vpn_gateways::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14159,10 +13446,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14172,9 +13458,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -14183,9 +13469,9 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -14207,9 +13493,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::url_maps::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMapsAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::UrlMapsAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14218,10 +13504,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::url_maps::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14229,10 +13514,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::url_maps::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMap>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::UrlMap>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14240,10 +13524,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::url_maps::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14251,10 +13534,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn invalidate_cache(
         &self,
         _req: crate::model::url_maps::InvalidateCacheRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14262,10 +13544,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::url_maps::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMapList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::UrlMapList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14273,10 +13554,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::url_maps::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14284,9 +13564,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::url_maps::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14295,10 +13575,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::url_maps::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14306,9 +13585,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn validate(
         &self,
         _req: crate::model::url_maps::ValidateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UrlMapsValidateResponse>>,
+        Output = crate::Result<crate::Response<crate::model::UrlMapsValidateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14317,10 +13596,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14330,9 +13608,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -14341,9 +13619,9 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -14365,9 +13643,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::vpn_gateways::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnGatewayAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::VpnGatewayAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14376,10 +13654,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::vpn_gateways::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14387,10 +13664,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::vpn_gateways::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnGateway>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::VpnGateway>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14398,9 +13674,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn get_status(
         &self,
         _req: crate::model::vpn_gateways::GetStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnGatewaysGetStatusResponse>>,
+        Output = crate::Result<crate::Response<crate::model::VpnGatewaysGetStatusResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14409,10 +13685,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::vpn_gateways::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14420,9 +13695,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::vpn_gateways::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnGatewayList>>,
+        Output = crate::Result<crate::Response<crate::model::VpnGatewayList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14431,10 +13706,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::vpn_gateways::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14442,9 +13716,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::vpn_gateways::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TestPermissionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14453,10 +13727,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14466,9 +13739,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -14477,9 +13750,9 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -14501,9 +13774,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn aggregated_list(
         &self,
         _req: crate::model::vpn_tunnels::AggregatedListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnTunnelAggregatedList>>,
+        Output = crate::Result<crate::Response<crate::model::VpnTunnelAggregatedList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14512,10 +13785,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::vpn_tunnels::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14523,10 +13795,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::vpn_tunnels::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnTunnel>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::VpnTunnel>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14534,10 +13805,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::vpn_tunnels::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14545,9 +13815,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::vpn_tunnels::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnTunnelList>>,
+        Output = crate::Result<crate::Response<crate::model::VpnTunnelList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14556,10 +13826,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn set_labels(
         &self,
         _req: crate::model::vpn_tunnels::SetLabelsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14567,10 +13836,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::region_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14580,9 +13848,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -14591,9 +13859,9 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -14615,10 +13883,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::wire_groups::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14626,10 +13893,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::wire_groups::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WireGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::WireGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14637,10 +13903,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     fn insert(
         &self,
         _req: crate::model::wire_groups::InsertRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14648,9 +13913,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::wire_groups::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WireGroupList>>,
+        Output = crate::Result<crate::Response<crate::model::WireGroupList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14659,10 +13924,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::wire_groups::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14670,10 +13934,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::global_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14683,9 +13946,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -14694,9 +13957,9 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -14718,8 +13981,8 @@ pub trait ZoneOperations: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::zone_operations::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14727,10 +13990,9 @@ pub trait ZoneOperations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14738,9 +14000,9 @@ pub trait ZoneOperations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::zone_operations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::OperationList>>,
+        Output = crate::Result<crate::Response<crate::model::OperationList>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -14749,10 +14011,9 @@ pub trait ZoneOperations: std::fmt::Debug + Send + Sync {
     fn wait(
         &self,
         _req: crate::model::zone_operations::WaitRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -14775,10 +14036,9 @@ pub trait Zones: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::zones::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Zone>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Zone>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -14786,10 +14046,9 @@ pub trait Zones: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::zones::ListRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ZoneList>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ZoneList>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/compute/v1/src/stub/dynamic.rs b/src/generated/cloud/compute/v1/src/stub/dynamic.rs
index 4594873a18..0620573525 100644
--- a/src/generated/cloud/compute/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/compute/v1/src/stub/dynamic.rs
@@ -21,20 +21,20 @@ pub trait AcceleratorTypes: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::accelerator_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AcceleratorTypeAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AcceleratorTypeAggregatedList>>;
 
     async fn get(
         &self,
         req: crate::model::accelerator_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AcceleratorType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AcceleratorType>>;
 
     async fn list(
         &self,
         req: crate::model::accelerator_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AcceleratorTypeList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AcceleratorTypeList>>;
 }
 
 /// All implementations of [super::AcceleratorTypes] also implement [AcceleratorTypes].
@@ -45,8 +45,8 @@ impl<T: super::AcceleratorTypes> AcceleratorTypes for T {
     async fn aggregated_list(
         &self,
         req: crate::model::accelerator_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AcceleratorTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AcceleratorTypeAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -54,8 +54,8 @@ impl<T: super::AcceleratorTypes> AcceleratorTypes for T {
     async fn get(
         &self,
         req: crate::model::accelerator_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AcceleratorType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AcceleratorType>> {
         T::get(self, req, options).await
     }
 
@@ -63,8 +63,8 @@ impl<T: super::AcceleratorTypes> AcceleratorTypes for T {
     async fn list(
         &self,
         req: crate::model::accelerator_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AcceleratorTypeList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AcceleratorTypeList>> {
         T::list(self, req, options).await
     }
 }
@@ -76,66 +76,66 @@ pub trait Addresses: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::addresses::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddressAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddressAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Address>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Address>>;
 
     async fn insert(
         &self,
         req: crate::model::addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddressList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddressList>>;
 
     async fn r#move(
         &self,
         req: crate::model::addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Addresses] also implement [Addresses].
@@ -146,8 +146,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn aggregated_list(
         &self,
         req: crate::model::addresses::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddressAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddressAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -155,8 +155,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn delete(
         &self,
         req: crate::model::addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -164,8 +164,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn get(
         &self,
         req: crate::model::addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Address>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Address>> {
         T::get(self, req, options).await
     }
 
@@ -173,8 +173,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn insert(
         &self,
         req: crate::model::addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -182,8 +182,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn list(
         &self,
         req: crate::model::addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddressList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddressList>> {
         T::list(self, req, options).await
     }
 
@@ -191,8 +191,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn r#move(
         &self,
         req: crate::model::addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::r#move(self, req, options).await
     }
 
@@ -200,8 +200,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn set_labels(
         &self,
         req: crate::model::addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -209,8 +209,8 @@ impl<T: super::Addresses> Addresses for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -218,22 +218,22 @@ impl<T: super::Addresses> Addresses for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -245,8 +245,8 @@ pub trait Advice: std::fmt::Debug + Send + Sync {
     async fn calendar_mode(
         &self,
         req: crate::model::advice::CalendarModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalendarModeAdviceResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalendarModeAdviceResponse>>;
 }
 
 /// All implementations of [super::Advice] also implement [Advice].
@@ -257,8 +257,8 @@ impl<T: super::Advice> Advice for T {
     async fn calendar_mode(
         &self,
         req: crate::model::advice::CalendarModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalendarModeAdviceResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalendarModeAdviceResponse>> {
         T::calendar_mode(self, req, options).await
     }
 }
@@ -270,66 +270,66 @@ pub trait Autoscalers: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::autoscalers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalerAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalerAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Autoscaler>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Autoscaler>>;
 
     async fn insert(
         &self,
         req: crate::model::autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalerList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalerList>>;
 
     async fn patch(
         &self,
         req: crate::model::autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Autoscalers] also implement [Autoscalers].
@@ -340,8 +340,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn aggregated_list(
         &self,
         req: crate::model::autoscalers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalerAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalerAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -349,8 +349,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn delete(
         &self,
         req: crate::model::autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -358,8 +358,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn get(
         &self,
         req: crate::model::autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Autoscaler>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Autoscaler>> {
         T::get(self, req, options).await
     }
 
@@ -367,8 +367,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn insert(
         &self,
         req: crate::model::autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -376,8 +376,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn list(
         &self,
         req: crate::model::autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalerList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalerList>> {
         T::list(self, req, options).await
     }
 
@@ -385,8 +385,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn patch(
         &self,
         req: crate::model::autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -394,8 +394,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -403,8 +403,8 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn update(
         &self,
         req: crate::model::autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -412,22 +412,22 @@ impl<T: super::Autoscalers> Autoscalers for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -439,90 +439,90 @@ pub trait BackendBuckets: std::fmt::Debug + Send + Sync {
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_buckets::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::backend_buckets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_buckets::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::backend_buckets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendBucket>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendBucket>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_buckets::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::backend_buckets::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::backend_buckets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendBucketList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendBucketList>>;
 
     async fn patch(
         &self,
         req: crate::model::backend_buckets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_buckets::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_buckets::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_buckets::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::backend_buckets::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BackendBuckets] also implement [BackendBuckets].
@@ -533,8 +533,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_buckets::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_signed_url_key(self, req, options).await
     }
 
@@ -542,8 +542,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn delete(
         &self,
         req: crate::model::backend_buckets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -551,8 +551,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_buckets::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_signed_url_key(self, req, options).await
     }
 
@@ -560,8 +560,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn get(
         &self,
         req: crate::model::backend_buckets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendBucket>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendBucket>> {
         T::get(self, req, options).await
     }
 
@@ -569,8 +569,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_buckets::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -578,8 +578,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn insert(
         &self,
         req: crate::model::backend_buckets::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -587,8 +587,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn list(
         &self,
         req: crate::model::backend_buckets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendBucketList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendBucketList>> {
         T::list(self, req, options).await
     }
 
@@ -596,8 +596,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn patch(
         &self,
         req: crate::model::backend_buckets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -605,8 +605,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_buckets::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_edge_security_policy(self, req, options).await
     }
 
@@ -614,8 +614,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_buckets::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -623,8 +623,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_buckets::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -632,8 +632,8 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn update(
         &self,
         req: crate::model::backend_buckets::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -641,22 +641,22 @@ impl<T: super::BackendBuckets> BackendBuckets for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -668,120 +668,120 @@ pub trait BackendServices: std::fmt::Debug + Send + Sync {
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_services::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::backend_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_services::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendService>>;
 
     async fn get_effective_security_policies(
         &self,
         req: crate::model::backend_services::GetEffectiveSecurityPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_health(
         &self,
         req: crate::model::backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceGroupHealth>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceGroupHealth>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceList>>;
 
     async fn list_usable(
         &self,
         req: crate::model::backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceListUsable>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceListUsable>>;
 
     async fn patch(
         &self,
         req: crate::model::backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_services::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_security_policy(
         &self,
         req: crate::model::backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BackendServices] also implement [BackendServices].
@@ -792,8 +792,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_services::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_signed_url_key(self, req, options).await
     }
 
@@ -801,8 +801,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn aggregated_list(
         &self,
         req: crate::model::backend_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -810,8 +810,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn delete(
         &self,
         req: crate::model::backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -819,8 +819,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_services::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_signed_url_key(self, req, options).await
     }
 
@@ -828,8 +828,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn get(
         &self,
         req: crate::model::backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendService>> {
         T::get(self, req, options).await
     }
 
@@ -837,8 +837,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn get_effective_security_policies(
         &self,
         req: crate::model::backend_services::GetEffectiveSecurityPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::get_effective_security_policies(self, req, options).await
     }
 
@@ -846,8 +846,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn get_health(
         &self,
         req: crate::model::backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceGroupHealth>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceGroupHealth>> {
         T::get_health(self, req, options).await
     }
 
@@ -855,8 +855,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -864,8 +864,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn insert(
         &self,
         req: crate::model::backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -873,8 +873,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn list(
         &self,
         req: crate::model::backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceList>> {
         T::list(self, req, options).await
     }
 
@@ -882,8 +882,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn list_usable(
         &self,
         req: crate::model::backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceListUsable>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceListUsable>> {
         T::list_usable(self, req, options).await
     }
 
@@ -891,8 +891,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn patch(
         &self,
         req: crate::model::backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -900,8 +900,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_services::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_edge_security_policy(self, req, options).await
     }
 
@@ -909,8 +909,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -918,8 +918,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn set_security_policy(
         &self,
         req: crate::model::backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_security_policy(self, req, options).await
     }
 
@@ -927,8 +927,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -936,8 +936,8 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn update(
         &self,
         req: crate::model::backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -945,22 +945,22 @@ impl<T: super::BackendServices> BackendServices for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -972,48 +972,48 @@ pub trait CrossSiteNetworks: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::cross_site_networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::cross_site_networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CrossSiteNetwork>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CrossSiteNetwork>>;
 
     async fn insert(
         &self,
         req: crate::model::cross_site_networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::cross_site_networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CrossSiteNetworkList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CrossSiteNetworkList>>;
 
     async fn patch(
         &self,
         req: crate::model::cross_site_networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CrossSiteNetworks] also implement [CrossSiteNetworks].
@@ -1024,8 +1024,8 @@ impl<T: super::CrossSiteNetworks> CrossSiteNetworks for T {
     async fn delete(
         &self,
         req: crate::model::cross_site_networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -1033,8 +1033,8 @@ impl<T: super::CrossSiteNetworks> CrossSiteNetworks for T {
     async fn get(
         &self,
         req: crate::model::cross_site_networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CrossSiteNetwork>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CrossSiteNetwork>> {
         T::get(self, req, options).await
     }
 
@@ -1042,8 +1042,8 @@ impl<T: super::CrossSiteNetworks> CrossSiteNetworks for T {
     async fn insert(
         &self,
         req: crate::model::cross_site_networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -1051,8 +1051,8 @@ impl<T: super::CrossSiteNetworks> CrossSiteNetworks for T {
     async fn list(
         &self,
         req: crate::model::cross_site_networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CrossSiteNetworkList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CrossSiteNetworkList>> {
         T::list(self, req, options).await
     }
 
@@ -1060,8 +1060,8 @@ impl<T: super::CrossSiteNetworks> CrossSiteNetworks for T {
     async fn patch(
         &self,
         req: crate::model::cross_site_networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -1069,22 +1069,22 @@ impl<T: super::CrossSiteNetworks> CrossSiteNetworks for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1096,20 +1096,20 @@ pub trait DiskTypes: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::disk_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskTypeAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskTypeAggregatedList>>;
 
     async fn get(
         &self,
         req: crate::model::disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskType>>;
 
     async fn list(
         &self,
         req: crate::model::disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskTypeList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskTypeList>>;
 }
 
 /// All implementations of [super::DiskTypes] also implement [DiskTypes].
@@ -1120,8 +1120,8 @@ impl<T: super::DiskTypes> DiskTypes for T {
     async fn aggregated_list(
         &self,
         req: crate::model::disk_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskTypeAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -1129,8 +1129,8 @@ impl<T: super::DiskTypes> DiskTypes for T {
     async fn get(
         &self,
         req: crate::model::disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskType>> {
         T::get(self, req, options).await
     }
 
@@ -1138,8 +1138,8 @@ impl<T: super::DiskTypes> DiskTypes for T {
     async fn list(
         &self,
         req: crate::model::disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskTypeList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskTypeList>> {
         T::list(self, req, options).await
     }
 }
@@ -1151,132 +1151,132 @@ pub trait Disks: std::fmt::Debug + Send + Sync {
     async fn add_resource_policies(
         &self,
         req: crate::model::disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::disks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskAggregatedList>>;
 
     async fn bulk_insert(
         &self,
         req: crate::model::disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn bulk_set_labels(
         &self,
         req: crate::model::disks::BulkSetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn create_snapshot(
         &self,
         req: crate::model::disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Disk>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Disk>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskList>>;
 
     async fn remove_resource_policies(
         &self,
         req: crate::model::disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resize(
         &self,
         req: crate::model::disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn start_async_replication(
         &self,
         req: crate::model::disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop_async_replication(
         &self,
         req: crate::model::disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop_group_async_replication(
         &self,
         req: crate::model::disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Disks] also implement [Disks].
@@ -1287,8 +1287,8 @@ impl<T: super::Disks> Disks for T {
     async fn add_resource_policies(
         &self,
         req: crate::model::disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_resource_policies(self, req, options).await
     }
 
@@ -1296,8 +1296,8 @@ impl<T: super::Disks> Disks for T {
     async fn aggregated_list(
         &self,
         req: crate::model::disks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -1305,8 +1305,8 @@ impl<T: super::Disks> Disks for T {
     async fn bulk_insert(
         &self,
         req: crate::model::disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::bulk_insert(self, req, options).await
     }
 
@@ -1314,8 +1314,8 @@ impl<T: super::Disks> Disks for T {
     async fn bulk_set_labels(
         &self,
         req: crate::model::disks::BulkSetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::bulk_set_labels(self, req, options).await
     }
 
@@ -1323,8 +1323,8 @@ impl<T: super::Disks> Disks for T {
     async fn create_snapshot(
         &self,
         req: crate::model::disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::create_snapshot(self, req, options).await
     }
 
@@ -1332,8 +1332,8 @@ impl<T: super::Disks> Disks for T {
     async fn delete(
         &self,
         req: crate::model::disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -1341,8 +1341,8 @@ impl<T: super::Disks> Disks for T {
     async fn get(
         &self,
         req: crate::model::disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Disk>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Disk>> {
         T::get(self, req, options).await
     }
 
@@ -1350,8 +1350,8 @@ impl<T: super::Disks> Disks for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1359,8 +1359,8 @@ impl<T: super::Disks> Disks for T {
     async fn insert(
         &self,
         req: crate::model::disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -1368,8 +1368,8 @@ impl<T: super::Disks> Disks for T {
     async fn list(
         &self,
         req: crate::model::disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskList>> {
         T::list(self, req, options).await
     }
 
@@ -1377,8 +1377,8 @@ impl<T: super::Disks> Disks for T {
     async fn remove_resource_policies(
         &self,
         req: crate::model::disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_resource_policies(self, req, options).await
     }
 
@@ -1386,8 +1386,8 @@ impl<T: super::Disks> Disks for T {
     async fn resize(
         &self,
         req: crate::model::disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resize(self, req, options).await
     }
 
@@ -1395,8 +1395,8 @@ impl<T: super::Disks> Disks for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1404,8 +1404,8 @@ impl<T: super::Disks> Disks for T {
     async fn set_labels(
         &self,
         req: crate::model::disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -1413,8 +1413,8 @@ impl<T: super::Disks> Disks for T {
     async fn start_async_replication(
         &self,
         req: crate::model::disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::start_async_replication(self, req, options).await
     }
 
@@ -1422,8 +1422,8 @@ impl<T: super::Disks> Disks for T {
     async fn stop_async_replication(
         &self,
         req: crate::model::disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop_async_replication(self, req, options).await
     }
 
@@ -1431,8 +1431,8 @@ impl<T: super::Disks> Disks for T {
     async fn stop_group_async_replication(
         &self,
         req: crate::model::disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop_group_async_replication(self, req, options).await
     }
 
@@ -1440,8 +1440,8 @@ impl<T: super::Disks> Disks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1449,8 +1449,8 @@ impl<T: super::Disks> Disks for T {
     async fn update(
         &self,
         req: crate::model::disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -1458,22 +1458,22 @@ impl<T: super::Disks> Disks for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1485,54 +1485,54 @@ pub trait ExternalVpnGateways: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::external_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::external_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalVpnGateway>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalVpnGateway>>;
 
     async fn insert(
         &self,
         req: crate::model::external_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::external_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalVpnGatewayList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalVpnGatewayList>>;
 
     async fn set_labels(
         &self,
         req: crate::model::external_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::external_vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ExternalVpnGateways] also implement [ExternalVpnGateways].
@@ -1543,8 +1543,8 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn delete(
         &self,
         req: crate::model::external_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -1552,8 +1552,8 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn get(
         &self,
         req: crate::model::external_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalVpnGateway>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalVpnGateway>> {
         T::get(self, req, options).await
     }
 
@@ -1561,8 +1561,8 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn insert(
         &self,
         req: crate::model::external_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -1570,8 +1570,8 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn list(
         &self,
         req: crate::model::external_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExternalVpnGatewayList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExternalVpnGatewayList>> {
         T::list(self, req, options).await
     }
 
@@ -1579,8 +1579,8 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn set_labels(
         &self,
         req: crate::model::external_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -1588,8 +1588,8 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::external_vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1597,22 +1597,22 @@ impl<T: super::ExternalVpnGateways> ExternalVpnGateways for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1624,128 +1624,126 @@ pub trait FirewallPolicies: std::fmt::Debug + Send + Sync {
     async fn add_association(
         &self,
         req: crate::model::firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_rule(
         &self,
         req: crate::model::firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn clone_rules(
         &self,
         req: crate::model::firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicy>>;
 
     async fn get_association(
         &self,
         req: crate::model::firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn get_rule(
         &self,
         req: crate::model::firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>>;
 
     async fn insert(
         &self,
         req: crate::model::firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyList>>;
 
     async fn list_associations(
         &self,
         req: crate::model::firewall_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::FirewallPoliciesListAssociationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPoliciesListAssociationsResponse>>;
 
     async fn r#move(
         &self,
         req: crate::model::firewall_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch(
         &self,
         req: crate::model::firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_rule(
         &self,
         req: crate::model::firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_association(
         &self,
         req: crate::model::firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_rule(
         &self,
         req: crate::model::firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::FirewallPolicies] also implement [FirewallPolicies].
@@ -1756,8 +1754,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn add_association(
         &self,
         req: crate::model::firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_association(self, req, options).await
     }
 
@@ -1765,8 +1763,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn add_rule(
         &self,
         req: crate::model::firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_rule(self, req, options).await
     }
 
@@ -1774,8 +1772,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn clone_rules(
         &self,
         req: crate::model::firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::clone_rules(self, req, options).await
     }
 
@@ -1783,8 +1781,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn delete(
         &self,
         req: crate::model::firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -1792,8 +1790,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn get(
         &self,
         req: crate::model::firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -1801,8 +1799,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn get_association(
         &self,
         req: crate::model::firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         T::get_association(self, req, options).await
     }
 
@@ -1810,8 +1808,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1819,8 +1817,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn get_rule(
         &self,
         req: crate::model::firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -1828,8 +1826,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn insert(
         &self,
         req: crate::model::firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -1837,8 +1835,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn list(
         &self,
         req: crate::model::firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -1846,10 +1844,9 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn list_associations(
         &self,
         req: crate::model::firewall_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::FirewallPoliciesListAssociationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPoliciesListAssociationsResponse>>
+    {
         T::list_associations(self, req, options).await
     }
 
@@ -1857,8 +1854,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn r#move(
         &self,
         req: crate::model::firewall_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::r#move(self, req, options).await
     }
 
@@ -1866,8 +1863,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn patch(
         &self,
         req: crate::model::firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -1875,8 +1872,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn patch_rule(
         &self,
         req: crate::model::firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_rule(self, req, options).await
     }
 
@@ -1884,8 +1881,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn remove_association(
         &self,
         req: crate::model::firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_association(self, req, options).await
     }
 
@@ -1893,8 +1890,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn remove_rule(
         &self,
         req: crate::model::firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_rule(self, req, options).await
     }
 
@@ -1902,8 +1899,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1911,8 +1908,8 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1920,22 +1917,22 @@ impl<T: super::FirewallPolicies> FirewallPolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1947,60 +1944,60 @@ pub trait Firewalls: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::firewalls::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::firewalls::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Firewall>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Firewall>>;
 
     async fn insert(
         &self,
         req: crate::model::firewalls::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::firewalls::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallList>>;
 
     async fn patch(
         &self,
         req: crate::model::firewalls::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewalls::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::firewalls::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Firewalls] also implement [Firewalls].
@@ -2011,8 +2008,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn delete(
         &self,
         req: crate::model::firewalls::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -2020,8 +2017,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn get(
         &self,
         req: crate::model::firewalls::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Firewall>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Firewall>> {
         T::get(self, req, options).await
     }
 
@@ -2029,8 +2026,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn insert(
         &self,
         req: crate::model::firewalls::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -2038,8 +2035,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn list(
         &self,
         req: crate::model::firewalls::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallList>> {
         T::list(self, req, options).await
     }
 
@@ -2047,8 +2044,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn patch(
         &self,
         req: crate::model::firewalls::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -2056,8 +2053,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewalls::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2065,8 +2062,8 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn update(
         &self,
         req: crate::model::firewalls::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -2074,22 +2071,22 @@ impl<T: super::Firewalls> Firewalls for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2101,66 +2098,66 @@ pub trait ForwardingRules: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::forwarding_rules::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRuleAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRuleAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRule>>;
 
     async fn insert(
         &self,
         req: crate::model::forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRuleList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRuleList>>;
 
     async fn patch(
         &self,
         req: crate::model::forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_target(
         &self,
         req: crate::model::forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ForwardingRules] also implement [ForwardingRules].
@@ -2171,8 +2168,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn aggregated_list(
         &self,
         req: crate::model::forwarding_rules::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRuleAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRuleAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -2180,8 +2177,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn delete(
         &self,
         req: crate::model::forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -2189,8 +2186,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn get(
         &self,
         req: crate::model::forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRule>> {
         T::get(self, req, options).await
     }
 
@@ -2198,8 +2195,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn insert(
         &self,
         req: crate::model::forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -2207,8 +2204,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn list(
         &self,
         req: crate::model::forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRuleList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRuleList>> {
         T::list(self, req, options).await
     }
 
@@ -2216,8 +2213,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn patch(
         &self,
         req: crate::model::forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -2225,8 +2222,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn set_labels(
         &self,
         req: crate::model::forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -2234,8 +2231,8 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn set_target(
         &self,
         req: crate::model::forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_target(self, req, options).await
     }
 
@@ -2243,22 +2240,22 @@ impl<T: super::ForwardingRules> ForwardingRules for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2270,62 +2267,60 @@ pub trait FutureReservations: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::future_reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::FutureReservationsAggregatedListResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FutureReservationsAggregatedListResponse>>;
 
     async fn cancel(
         &self,
         req: crate::model::future_reservations::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::future_reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::future_reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FutureReservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FutureReservation>>;
 
     async fn insert(
         &self,
         req: crate::model::future_reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::future_reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FutureReservationsListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FutureReservationsListResponse>>;
 
     async fn update(
         &self,
         req: crate::model::future_reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::FutureReservations] also implement [FutureReservations].
@@ -2336,10 +2331,9 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn aggregated_list(
         &self,
         req: crate::model::future_reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::FutureReservationsAggregatedListResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FutureReservationsAggregatedListResponse>>
+    {
         T::aggregated_list(self, req, options).await
     }
 
@@ -2347,8 +2341,8 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn cancel(
         &self,
         req: crate::model::future_reservations::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::cancel(self, req, options).await
     }
 
@@ -2356,8 +2350,8 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn delete(
         &self,
         req: crate::model::future_reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -2365,8 +2359,8 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn get(
         &self,
         req: crate::model::future_reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FutureReservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FutureReservation>> {
         T::get(self, req, options).await
     }
 
@@ -2374,8 +2368,8 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn insert(
         &self,
         req: crate::model::future_reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -2383,8 +2377,8 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn list(
         &self,
         req: crate::model::future_reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FutureReservationsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FutureReservationsListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -2392,8 +2386,8 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn update(
         &self,
         req: crate::model::future_reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -2401,22 +2395,22 @@ impl<T: super::FutureReservations> FutureReservations for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2428,60 +2422,60 @@ pub trait GlobalAddresses: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::global_addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::global_addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Address>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Address>>;
 
     async fn insert(
         &self,
         req: crate::model::global_addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::global_addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddressList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddressList>>;
 
     async fn r#move(
         &self,
         req: crate::model::global_addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::global_addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::global_addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GlobalAddresses] also implement [GlobalAddresses].
@@ -2492,8 +2486,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn delete(
         &self,
         req: crate::model::global_addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -2501,8 +2495,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn get(
         &self,
         req: crate::model::global_addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Address>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Address>> {
         T::get(self, req, options).await
     }
 
@@ -2510,8 +2504,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn insert(
         &self,
         req: crate::model::global_addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -2519,8 +2513,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn list(
         &self,
         req: crate::model::global_addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddressList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddressList>> {
         T::list(self, req, options).await
     }
 
@@ -2528,8 +2522,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn r#move(
         &self,
         req: crate::model::global_addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::r#move(self, req, options).await
     }
 
@@ -2537,8 +2531,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn set_labels(
         &self,
         req: crate::model::global_addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -2546,8 +2540,8 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::global_addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2555,22 +2549,22 @@ impl<T: super::GlobalAddresses> GlobalAddresses for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2582,60 +2576,60 @@ pub trait GlobalForwardingRules: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::global_forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::global_forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRule>>;
 
     async fn insert(
         &self,
         req: crate::model::global_forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::global_forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRuleList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRuleList>>;
 
     async fn patch(
         &self,
         req: crate::model::global_forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::global_forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_target(
         &self,
         req: crate::model::global_forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GlobalForwardingRules] also implement [GlobalForwardingRules].
@@ -2646,8 +2640,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn delete(
         &self,
         req: crate::model::global_forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -2655,8 +2649,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn get(
         &self,
         req: crate::model::global_forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRule>> {
         T::get(self, req, options).await
     }
 
@@ -2664,8 +2658,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn insert(
         &self,
         req: crate::model::global_forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -2673,8 +2667,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn list(
         &self,
         req: crate::model::global_forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ForwardingRuleList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ForwardingRuleList>> {
         T::list(self, req, options).await
     }
 
@@ -2682,8 +2676,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn patch(
         &self,
         req: crate::model::global_forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -2691,8 +2685,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn set_labels(
         &self,
         req: crate::model::global_forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -2700,8 +2694,8 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn set_target(
         &self,
         req: crate::model::global_forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_target(self, req, options).await
     }
 
@@ -2709,22 +2703,22 @@ impl<T: super::GlobalForwardingRules> GlobalForwardingRules for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2736,62 +2730,60 @@ pub trait GlobalNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::global_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn detach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::global_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroup>>;
 
     async fn insert(
         &self,
         req: crate::model::global_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::global_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>>;
 
     async fn list_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GlobalNetworkEndpointGroups] also implement [GlobalNetworkEndpointGroups].
@@ -2802,8 +2794,8 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::attach_network_endpoints(self, req, options).await
     }
 
@@ -2811,8 +2803,8 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn delete(
         &self,
         req: crate::model::global_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -2820,8 +2812,8 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn detach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::detach_network_endpoints(self, req, options).await
     }
 
@@ -2829,8 +2821,8 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn get(
         &self,
         req: crate::model::global_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         T::get(self, req, options).await
     }
 
@@ -2838,8 +2830,8 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn insert(
         &self,
         req: crate::model::global_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -2847,8 +2839,8 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn list(
         &self,
         req: crate::model::global_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -2856,10 +2848,9 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn list_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
+    {
         T::list_network_endpoints(self, req, options).await
     }
 
@@ -2867,22 +2858,22 @@ impl<T: super::GlobalNetworkEndpointGroups> GlobalNetworkEndpointGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2894,32 +2885,32 @@ pub trait GlobalOperations: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::global_operations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::global_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::global_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>>;
 
     async fn wait(
         &self,
         req: crate::model::global_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 }
 
 /// All implementations of [super::GlobalOperations] also implement [GlobalOperations].
@@ -2930,8 +2921,8 @@ impl<T: super::GlobalOperations> GlobalOperations for T {
     async fn aggregated_list(
         &self,
         req: crate::model::global_operations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -2939,8 +2930,8 @@ impl<T: super::GlobalOperations> GlobalOperations for T {
     async fn delete(
         &self,
         req: crate::model::global_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -2948,8 +2939,8 @@ impl<T: super::GlobalOperations> GlobalOperations for T {
     async fn get(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get(self, req, options).await
     }
 
@@ -2957,8 +2948,8 @@ impl<T: super::GlobalOperations> GlobalOperations for T {
     async fn list(
         &self,
         req: crate::model::global_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>> {
         T::list(self, req, options).await
     }
 
@@ -2966,8 +2957,8 @@ impl<T: super::GlobalOperations> GlobalOperations for T {
     async fn wait(
         &self,
         req: crate::model::global_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::wait(self, req, options).await
     }
 }
@@ -2979,20 +2970,20 @@ pub trait GlobalOrganizationOperations: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::global_organization_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::global_organization_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>>;
 }
 
 /// All implementations of [super::GlobalOrganizationOperations] also implement [GlobalOrganizationOperations].
@@ -3003,8 +2994,8 @@ impl<T: super::GlobalOrganizationOperations> GlobalOrganizationOperations for T
     async fn delete(
         &self,
         req: crate::model::global_organization_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -3012,8 +3003,8 @@ impl<T: super::GlobalOrganizationOperations> GlobalOrganizationOperations for T
     async fn get(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get(self, req, options).await
     }
 
@@ -3021,8 +3012,8 @@ impl<T: super::GlobalOrganizationOperations> GlobalOrganizationOperations for T
     async fn list(
         &self,
         req: crate::model::global_organization_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>> {
         T::list(self, req, options).await
     }
 }
@@ -3034,48 +3025,48 @@ pub trait GlobalPublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::global_public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::global_public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefix>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefix>>;
 
     async fn insert(
         &self,
         req: crate::model::global_public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::global_public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefixList>>;
 
     async fn patch(
         &self,
         req: crate::model::global_public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GlobalPublicDelegatedPrefixes] also implement [GlobalPublicDelegatedPrefixes].
@@ -3086,8 +3077,8 @@ impl<T: super::GlobalPublicDelegatedPrefixes> GlobalPublicDelegatedPrefixes for
     async fn delete(
         &self,
         req: crate::model::global_public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -3095,8 +3086,8 @@ impl<T: super::GlobalPublicDelegatedPrefixes> GlobalPublicDelegatedPrefixes for
     async fn get(
         &self,
         req: crate::model::global_public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefix>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefix>> {
         T::get(self, req, options).await
     }
 
@@ -3104,8 +3095,8 @@ impl<T: super::GlobalPublicDelegatedPrefixes> GlobalPublicDelegatedPrefixes for
     async fn insert(
         &self,
         req: crate::model::global_public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -3113,8 +3104,8 @@ impl<T: super::GlobalPublicDelegatedPrefixes> GlobalPublicDelegatedPrefixes for
     async fn list(
         &self,
         req: crate::model::global_public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefixList>> {
         T::list(self, req, options).await
     }
 
@@ -3122,8 +3113,8 @@ impl<T: super::GlobalPublicDelegatedPrefixes> GlobalPublicDelegatedPrefixes for
     async fn patch(
         &self,
         req: crate::model::global_public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -3131,22 +3122,22 @@ impl<T: super::GlobalPublicDelegatedPrefixes> GlobalPublicDelegatedPrefixes for
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3158,66 +3149,66 @@ pub trait HealthChecks: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::health_checks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthChecksAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthChecksAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheck>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheck>>;
 
     async fn insert(
         &self,
         req: crate::model::health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckList>>;
 
     async fn patch(
         &self,
         req: crate::model::health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::HealthChecks] also implement [HealthChecks].
@@ -3228,8 +3219,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn aggregated_list(
         &self,
         req: crate::model::health_checks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthChecksAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthChecksAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -3237,8 +3228,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn delete(
         &self,
         req: crate::model::health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -3246,8 +3237,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn get(
         &self,
         req: crate::model::health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheck>> {
         T::get(self, req, options).await
     }
 
@@ -3255,8 +3246,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn insert(
         &self,
         req: crate::model::health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -3264,8 +3255,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn list(
         &self,
         req: crate::model::health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckList>> {
         T::list(self, req, options).await
     }
 
@@ -3273,8 +3264,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn patch(
         &self,
         req: crate::model::health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -3282,8 +3273,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3291,8 +3282,8 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn update(
         &self,
         req: crate::model::health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -3300,22 +3291,22 @@ impl<T: super::HealthChecks> HealthChecks for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3327,60 +3318,60 @@ pub trait HttpHealthChecks: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::http_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::http_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpHealthCheck>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpHealthCheck>>;
 
     async fn insert(
         &self,
         req: crate::model::http_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::http_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpHealthCheckList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpHealthCheckList>>;
 
     async fn patch(
         &self,
         req: crate::model::http_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::http_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::http_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::HttpHealthChecks] also implement [HttpHealthChecks].
@@ -3391,8 +3382,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn delete(
         &self,
         req: crate::model::http_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -3400,8 +3391,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn get(
         &self,
         req: crate::model::http_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpHealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpHealthCheck>> {
         T::get(self, req, options).await
     }
 
@@ -3409,8 +3400,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn insert(
         &self,
         req: crate::model::http_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -3418,8 +3409,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn list(
         &self,
         req: crate::model::http_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpHealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpHealthCheckList>> {
         T::list(self, req, options).await
     }
 
@@ -3427,8 +3418,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn patch(
         &self,
         req: crate::model::http_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -3436,8 +3427,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::http_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3445,8 +3436,8 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn update(
         &self,
         req: crate::model::http_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -3454,22 +3445,22 @@ impl<T: super::HttpHealthChecks> HttpHealthChecks for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3481,60 +3472,60 @@ pub trait HttpsHealthChecks: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::https_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::https_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpsHealthCheck>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpsHealthCheck>>;
 
     async fn insert(
         &self,
         req: crate::model::https_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::https_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpsHealthCheckList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpsHealthCheckList>>;
 
     async fn patch(
         &self,
         req: crate::model::https_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::https_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::https_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::HttpsHealthChecks] also implement [HttpsHealthChecks].
@@ -3545,8 +3536,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn delete(
         &self,
         req: crate::model::https_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -3554,8 +3545,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn get(
         &self,
         req: crate::model::https_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpsHealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpsHealthCheck>> {
         T::get(self, req, options).await
     }
 
@@ -3563,8 +3554,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn insert(
         &self,
         req: crate::model::https_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -3572,8 +3563,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn list(
         &self,
         req: crate::model::https_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HttpsHealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HttpsHealthCheckList>> {
         T::list(self, req, options).await
     }
 
@@ -3581,8 +3572,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn patch(
         &self,
         req: crate::model::https_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -3590,8 +3581,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::https_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3599,8 +3590,8 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn update(
         &self,
         req: crate::model::https_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -3608,22 +3599,22 @@ impl<T: super::HttpsHealthChecks> HttpsHealthChecks for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3635,8 +3626,8 @@ pub trait ImageFamilyViews: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::image_family_views::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImageFamilyView>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImageFamilyView>>;
 }
 
 /// All implementations of [super::ImageFamilyViews] also implement [ImageFamilyViews].
@@ -3647,8 +3638,8 @@ impl<T: super::ImageFamilyViews> ImageFamilyViews for T {
     async fn get(
         &self,
         req: crate::model::image_family_views::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImageFamilyView>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImageFamilyView>> {
         T::get(self, req, options).await
     }
 }
@@ -3660,84 +3651,84 @@ pub trait Images: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn deprecate(
         &self,
         req: crate::model::images::DeprecateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Image>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Image>>;
 
     async fn get_from_family(
         &self,
         req: crate::model::images::GetFromFamilyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Image>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Image>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImageList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImageList>>;
 
     async fn patch(
         &self,
         req: crate::model::images::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Images] also implement [Images].
@@ -3748,8 +3739,8 @@ impl<T: super::Images> Images for T {
     async fn delete(
         &self,
         req: crate::model::images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -3757,8 +3748,8 @@ impl<T: super::Images> Images for T {
     async fn deprecate(
         &self,
         req: crate::model::images::DeprecateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::deprecate(self, req, options).await
     }
 
@@ -3766,8 +3757,8 @@ impl<T: super::Images> Images for T {
     async fn get(
         &self,
         req: crate::model::images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Image>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Image>> {
         T::get(self, req, options).await
     }
 
@@ -3775,8 +3766,8 @@ impl<T: super::Images> Images for T {
     async fn get_from_family(
         &self,
         req: crate::model::images::GetFromFamilyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Image>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Image>> {
         T::get_from_family(self, req, options).await
     }
 
@@ -3784,8 +3775,8 @@ impl<T: super::Images> Images for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -3793,8 +3784,8 @@ impl<T: super::Images> Images for T {
     async fn insert(
         &self,
         req: crate::model::images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -3802,8 +3793,8 @@ impl<T: super::Images> Images for T {
     async fn list(
         &self,
         req: crate::model::images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImageList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImageList>> {
         T::list(self, req, options).await
     }
 
@@ -3811,8 +3802,8 @@ impl<T: super::Images> Images for T {
     async fn patch(
         &self,
         req: crate::model::images::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -3820,8 +3811,8 @@ impl<T: super::Images> Images for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -3829,8 +3820,8 @@ impl<T: super::Images> Images for T {
     async fn set_labels(
         &self,
         req: crate::model::images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -3838,8 +3829,8 @@ impl<T: super::Images> Images for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3847,22 +3838,22 @@ impl<T: super::Images> Images for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3874,50 +3865,48 @@ pub trait InstanceGroupManagerResizeRequests: std::fmt::Debug + Send + Sync {
     async fn cancel(
         &self,
         req: crate::model::instance_group_manager_resize_requests::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::instance_group_manager_resize_requests::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::instance_group_manager_resize_requests::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagerResizeRequest>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerResizeRequest>>;
 
     async fn insert(
         &self,
         req: crate::model::instance_group_manager_resize_requests::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::instance_group_manager_resize_requests::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InstanceGroupManagerResizeRequests] also implement [InstanceGroupManagerResizeRequests].
@@ -3928,8 +3917,8 @@ impl<T: super::InstanceGroupManagerResizeRequests> InstanceGroupManagerResizeReq
     async fn cancel(
         &self,
         req: crate::model::instance_group_manager_resize_requests::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::cancel(self, req, options).await
     }
 
@@ -3937,8 +3926,8 @@ impl<T: super::InstanceGroupManagerResizeRequests> InstanceGroupManagerResizeReq
     async fn delete(
         &self,
         req: crate::model::instance_group_manager_resize_requests::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -3946,9 +3935,8 @@ impl<T: super::InstanceGroupManagerResizeRequests> InstanceGroupManagerResizeReq
     async fn get(
         &self,
         req: crate::model::instance_group_manager_resize_requests::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagerResizeRequest>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerResizeRequest>> {
         T::get(self, req, options).await
     }
 
@@ -3956,8 +3944,8 @@ impl<T: super::InstanceGroupManagerResizeRequests> InstanceGroupManagerResizeReq
     async fn insert(
         &self,
         req: crate::model::instance_group_manager_resize_requests::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -3965,10 +3953,9 @@ impl<T: super::InstanceGroupManagerResizeRequests> InstanceGroupManagerResizeReq
     async fn list(
         &self,
         req: crate::model::instance_group_manager_resize_requests::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>>
+    {
         T::list(self, req, options).await
     }
 
@@ -3976,22 +3963,22 @@ impl<T: super::InstanceGroupManagerResizeRequests> InstanceGroupManagerResizeReq
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -4003,166 +3990,164 @@ pub trait InstanceGroupManagers: std::fmt::Debug + Send + Sync {
     async fn abandon_instances(
         &self,
         req: crate::model::instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::instance_group_managers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagerAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerAggregatedList>>;
 
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn create_instances(
         &self,
         req: crate::model::instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_instances(
         &self,
         req: crate::model::instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManager>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManager>>;
 
     async fn insert(
         &self,
         req: crate::model::instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagerList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerList>>;
 
     async fn list_errors(
         &self,
         req: crate::model::instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagersListErrorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagersListErrorsResponse>>;
 
     async fn list_managed_instances(
         &self,
         req: crate::model::instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
+        crate::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
     >;
 
     async fn list_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>>;
 
     async fn patch(
         &self,
         req: crate::model::instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn recreate_instances(
         &self,
         req: crate::model::instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resize(
         &self,
         req: crate::model::instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resume_instances(
         &self,
         req: crate::model::instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_instance_template(
         &self,
         req: crate::model::instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_target_pools(
         &self,
         req: crate::model::instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn start_instances(
         &self,
         req: crate::model::instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop_instances(
         &self,
         req: crate::model::instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn suspend_instances(
         &self,
         req: crate::model::instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InstanceGroupManagers] also implement [InstanceGroupManagers].
@@ -4173,8 +4158,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn abandon_instances(
         &self,
         req: crate::model::instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::abandon_instances(self, req, options).await
     }
 
@@ -4182,9 +4167,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_group_managers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagerAggregatedList>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -4192,8 +4176,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::apply_updates_to_instances(self, req, options).await
     }
 
@@ -4201,8 +4185,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn create_instances(
         &self,
         req: crate::model::instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::create_instances(self, req, options).await
     }
 
@@ -4210,8 +4194,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn delete(
         &self,
         req: crate::model::instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -4219,8 +4203,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn delete_instances(
         &self,
         req: crate::model::instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_instances(self, req, options).await
     }
 
@@ -4228,8 +4212,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_per_instance_configs(self, req, options).await
     }
 
@@ -4237,8 +4221,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn get(
         &self,
         req: crate::model::instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManager>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManager>> {
         T::get(self, req, options).await
     }
 
@@ -4246,8 +4230,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn insert(
         &self,
         req: crate::model::instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -4255,8 +4239,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn list(
         &self,
         req: crate::model::instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagerList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagerList>> {
         T::list(self, req, options).await
     }
 
@@ -4264,9 +4248,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn list_errors(
         &self,
         req: crate::model::instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManagersListErrorsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagersListErrorsResponse>> {
         T::list_errors(self, req, options).await
     }
 
@@ -4274,9 +4257,9 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn list_managed_instances(
         &self,
         req: crate::model::instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
+        crate::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
     > {
         T::list_managed_instances(self, req, options).await
     }
@@ -4285,10 +4268,9 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn list_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>>
+    {
         T::list_per_instance_configs(self, req, options).await
     }
 
@@ -4296,8 +4278,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn patch(
         &self,
         req: crate::model::instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -4305,8 +4287,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_per_instance_configs(self, req, options).await
     }
 
@@ -4314,8 +4296,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn recreate_instances(
         &self,
         req: crate::model::instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::recreate_instances(self, req, options).await
     }
 
@@ -4323,8 +4305,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn resize(
         &self,
         req: crate::model::instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resize(self, req, options).await
     }
 
@@ -4332,8 +4314,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn resume_instances(
         &self,
         req: crate::model::instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resume_instances(self, req, options).await
     }
 
@@ -4341,8 +4323,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn set_instance_template(
         &self,
         req: crate::model::instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_instance_template(self, req, options).await
     }
 
@@ -4350,8 +4332,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn set_target_pools(
         &self,
         req: crate::model::instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_target_pools(self, req, options).await
     }
 
@@ -4359,8 +4341,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn start_instances(
         &self,
         req: crate::model::instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::start_instances(self, req, options).await
     }
 
@@ -4368,8 +4350,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn stop_instances(
         &self,
         req: crate::model::instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop_instances(self, req, options).await
     }
 
@@ -4377,8 +4359,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn suspend_instances(
         &self,
         req: crate::model::instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::suspend_instances(self, req, options).await
     }
 
@@ -4386,8 +4368,8 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn update_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_per_instance_configs(self, req, options).await
     }
 
@@ -4395,22 +4377,22 @@ impl<T: super::InstanceGroupManagers> InstanceGroupManagers for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -4422,78 +4404,78 @@ pub trait InstanceGroups: std::fmt::Debug + Send + Sync {
     async fn add_instances(
         &self,
         req: crate::model::instance_groups::AddInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::instance_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::instance_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroup>>;
 
     async fn insert(
         &self,
         req: crate::model::instance_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupList>>;
 
     async fn list_instances(
         &self,
         req: crate::model::instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupsListInstances>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupsListInstances>>;
 
     async fn remove_instances(
         &self,
         req: crate::model::instance_groups::RemoveInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_named_ports(
         &self,
         req: crate::model::instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InstanceGroups] also implement [InstanceGroups].
@@ -4504,8 +4486,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn add_instances(
         &self,
         req: crate::model::instance_groups::AddInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_instances(self, req, options).await
     }
 
@@ -4513,8 +4495,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -4522,8 +4504,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn delete(
         &self,
         req: crate::model::instance_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -4531,8 +4513,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn get(
         &self,
         req: crate::model::instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroup>> {
         T::get(self, req, options).await
     }
 
@@ -4540,8 +4522,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn insert(
         &self,
         req: crate::model::instance_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -4549,8 +4531,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn list(
         &self,
         req: crate::model::instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -4558,8 +4540,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn list_instances(
         &self,
         req: crate::model::instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupsListInstances>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupsListInstances>> {
         T::list_instances(self, req, options).await
     }
 
@@ -4567,8 +4549,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn remove_instances(
         &self,
         req: crate::model::instance_groups::RemoveInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_instances(self, req, options).await
     }
 
@@ -4576,8 +4558,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn set_named_ports(
         &self,
         req: crate::model::instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_named_ports(self, req, options).await
     }
 
@@ -4585,8 +4567,8 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -4594,22 +4576,22 @@ impl<T: super::InstanceGroups> InstanceGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -4621,30 +4603,30 @@ pub trait InstanceSettings: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::instance_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceSettings>>;
 
     async fn patch(
         &self,
         req: crate::model::instance_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InstanceSettings] also implement [InstanceSettings].
@@ -4655,8 +4637,8 @@ impl<T: super::InstanceSettings> InstanceSettings for T {
     async fn get(
         &self,
         req: crate::model::instance_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceSettings>> {
         T::get(self, req, options).await
     }
 
@@ -4664,8 +4646,8 @@ impl<T: super::InstanceSettings> InstanceSettings for T {
     async fn patch(
         &self,
         req: crate::model::instance_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -4673,22 +4655,22 @@ impl<T: super::InstanceSettings> InstanceSettings for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -4700,66 +4682,66 @@ pub trait InstanceTemplates: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplateAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplateAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplate>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::instance_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplateList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplateList>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::instance_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InstanceTemplates] also implement [InstanceTemplates].
@@ -4770,8 +4752,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplateAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplateAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -4779,8 +4761,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn delete(
         &self,
         req: crate::model::instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -4788,8 +4770,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn get(
         &self,
         req: crate::model::instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplate>> {
         T::get(self, req, options).await
     }
 
@@ -4797,8 +4779,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::instance_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -4806,8 +4788,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn insert(
         &self,
         req: crate::model::instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -4815,8 +4797,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn list(
         &self,
         req: crate::model::instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplateList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplateList>> {
         T::list(self, req, options).await
     }
 
@@ -4824,8 +4806,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::instance_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -4833,8 +4815,8 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -4842,22 +4824,22 @@ impl<T: super::InstanceTemplates> InstanceTemplates for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -4869,324 +4851,324 @@ pub trait Instances: std::fmt::Debug + Send + Sync {
     async fn add_access_config(
         &self,
         req: crate::model::instances::AddAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_network_interface(
         &self,
         req: crate::model::instances::AddNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_resource_policies(
         &self,
         req: crate::model::instances::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceAggregatedList>>;
 
     async fn attach_disk(
         &self,
         req: crate::model::instances::AttachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn bulk_insert(
         &self,
         req: crate::model::instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_access_config(
         &self,
         req: crate::model::instances::DeleteAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_network_interface(
         &self,
         req: crate::model::instances::DeleteNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn detach_disk(
         &self,
         req: crate::model::instances::DetachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn get_effective_firewalls(
         &self,
         req: crate::model::instances::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstancesGetEffectiveFirewallsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstancesGetEffectiveFirewallsResponse>>;
 
     async fn get_guest_attributes(
         &self,
         req: crate::model::instances::GetGuestAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GuestAttributes>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GuestAttributes>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::instances::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn get_screenshot(
         &self,
         req: crate::model::instances::GetScreenshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Screenshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Screenshot>>;
 
     async fn get_serial_port_output(
         &self,
         req: crate::model::instances::GetSerialPortOutputRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SerialPortOutput>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SerialPortOutput>>;
 
     async fn get_shielded_instance_identity(
         &self,
         req: crate::model::instances::GetShieldedInstanceIdentityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ShieldedInstanceIdentity>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ShieldedInstanceIdentity>>;
 
     async fn insert(
         &self,
         req: crate::model::instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceList>>;
 
     async fn list_referrers(
         &self,
         req: crate::model::instances::ListReferrersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceListReferrers>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceListReferrers>>;
 
     async fn perform_maintenance(
         &self,
         req: crate::model::instances::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_resource_policies(
         &self,
         req: crate::model::instances::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn report_host_as_faulty(
         &self,
         req: crate::model::instances::ReportHostAsFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn reset(
         &self,
         req: crate::model::instances::ResetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resume(
         &self,
         req: crate::model::instances::ResumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn send_diagnostic_interrupt(
         &self,
         req: crate::model::instances::SendDiagnosticInterruptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_deletion_protection(
         &self,
         req: crate::model::instances::SetDeletionProtectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_disk_auto_delete(
         &self,
         req: crate::model::instances::SetDiskAutoDeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::instances::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::instances::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_machine_resources(
         &self,
         req: crate::model::instances::SetMachineResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_machine_type(
         &self,
         req: crate::model::instances::SetMachineTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_metadata(
         &self,
         req: crate::model::instances::SetMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_min_cpu_platform(
         &self,
         req: crate::model::instances::SetMinCpuPlatformRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_name(
         &self,
         req: crate::model::instances::SetNameRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_scheduling(
         &self,
         req: crate::model::instances::SetSchedulingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_security_policy(
         &self,
         req: crate::model::instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_service_account(
         &self,
         req: crate::model::instances::SetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_shielded_instance_integrity_policy(
         &self,
         req: crate::model::instances::SetShieldedInstanceIntegrityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_tags(
         &self,
         req: crate::model::instances::SetTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::instances::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn start(
         &self,
         req: crate::model::instances::StartRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn start_with_encryption_key(
         &self,
         req: crate::model::instances::StartWithEncryptionKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop(
         &self,
         req: crate::model::instances::StopRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn suspend(
         &self,
         req: crate::model::instances::SuspendRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::instances::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_access_config(
         &self,
         req: crate::model::instances::UpdateAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_display_device(
         &self,
         req: crate::model::instances::UpdateDisplayDeviceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_network_interface(
         &self,
         req: crate::model::instances::UpdateNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_shielded_instance_config(
         &self,
         req: crate::model::instances::UpdateShieldedInstanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Instances] also implement [Instances].
@@ -5197,8 +5179,8 @@ impl<T: super::Instances> Instances for T {
     async fn add_access_config(
         &self,
         req: crate::model::instances::AddAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_access_config(self, req, options).await
     }
 
@@ -5206,8 +5188,8 @@ impl<T: super::Instances> Instances for T {
     async fn add_network_interface(
         &self,
         req: crate::model::instances::AddNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_network_interface(self, req, options).await
     }
 
@@ -5215,8 +5197,8 @@ impl<T: super::Instances> Instances for T {
     async fn add_resource_policies(
         &self,
         req: crate::model::instances::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_resource_policies(self, req, options).await
     }
 
@@ -5224,8 +5206,8 @@ impl<T: super::Instances> Instances for T {
     async fn aggregated_list(
         &self,
         req: crate::model::instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -5233,8 +5215,8 @@ impl<T: super::Instances> Instances for T {
     async fn attach_disk(
         &self,
         req: crate::model::instances::AttachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::attach_disk(self, req, options).await
     }
 
@@ -5242,8 +5224,8 @@ impl<T: super::Instances> Instances for T {
     async fn bulk_insert(
         &self,
         req: crate::model::instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::bulk_insert(self, req, options).await
     }
 
@@ -5251,8 +5233,8 @@ impl<T: super::Instances> Instances for T {
     async fn delete(
         &self,
         req: crate::model::instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -5260,8 +5242,8 @@ impl<T: super::Instances> Instances for T {
     async fn delete_access_config(
         &self,
         req: crate::model::instances::DeleteAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_access_config(self, req, options).await
     }
 
@@ -5269,8 +5251,8 @@ impl<T: super::Instances> Instances for T {
     async fn delete_network_interface(
         &self,
         req: crate::model::instances::DeleteNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_network_interface(self, req, options).await
     }
 
@@ -5278,8 +5260,8 @@ impl<T: super::Instances> Instances for T {
     async fn detach_disk(
         &self,
         req: crate::model::instances::DetachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::detach_disk(self, req, options).await
     }
 
@@ -5287,8 +5269,8 @@ impl<T: super::Instances> Instances for T {
     async fn get(
         &self,
         req: crate::model::instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get(self, req, options).await
     }
 
@@ -5296,9 +5278,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_effective_firewalls(
         &self,
         req: crate::model::instances::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstancesGetEffectiveFirewallsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstancesGetEffectiveFirewallsResponse>> {
         T::get_effective_firewalls(self, req, options).await
     }
 
@@ -5306,8 +5287,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_guest_attributes(
         &self,
         req: crate::model::instances::GetGuestAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GuestAttributes>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GuestAttributes>> {
         T::get_guest_attributes(self, req, options).await
     }
 
@@ -5315,8 +5296,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::instances::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -5324,8 +5305,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_screenshot(
         &self,
         req: crate::model::instances::GetScreenshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Screenshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Screenshot>> {
         T::get_screenshot(self, req, options).await
     }
 
@@ -5333,8 +5314,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_serial_port_output(
         &self,
         req: crate::model::instances::GetSerialPortOutputRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SerialPortOutput>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SerialPortOutput>> {
         T::get_serial_port_output(self, req, options).await
     }
 
@@ -5342,8 +5323,8 @@ impl<T: super::Instances> Instances for T {
     async fn get_shielded_instance_identity(
         &self,
         req: crate::model::instances::GetShieldedInstanceIdentityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ShieldedInstanceIdentity>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ShieldedInstanceIdentity>> {
         T::get_shielded_instance_identity(self, req, options).await
     }
 
@@ -5351,8 +5332,8 @@ impl<T: super::Instances> Instances for T {
     async fn insert(
         &self,
         req: crate::model::instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -5360,8 +5341,8 @@ impl<T: super::Instances> Instances for T {
     async fn list(
         &self,
         req: crate::model::instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceList>> {
         T::list(self, req, options).await
     }
 
@@ -5369,8 +5350,8 @@ impl<T: super::Instances> Instances for T {
     async fn list_referrers(
         &self,
         req: crate::model::instances::ListReferrersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceListReferrers>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceListReferrers>> {
         T::list_referrers(self, req, options).await
     }
 
@@ -5378,8 +5359,8 @@ impl<T: super::Instances> Instances for T {
     async fn perform_maintenance(
         &self,
         req: crate::model::instances::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::perform_maintenance(self, req, options).await
     }
 
@@ -5387,8 +5368,8 @@ impl<T: super::Instances> Instances for T {
     async fn remove_resource_policies(
         &self,
         req: crate::model::instances::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_resource_policies(self, req, options).await
     }
 
@@ -5396,8 +5377,8 @@ impl<T: super::Instances> Instances for T {
     async fn report_host_as_faulty(
         &self,
         req: crate::model::instances::ReportHostAsFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::report_host_as_faulty(self, req, options).await
     }
 
@@ -5405,8 +5386,8 @@ impl<T: super::Instances> Instances for T {
     async fn reset(
         &self,
         req: crate::model::instances::ResetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::reset(self, req, options).await
     }
 
@@ -5414,8 +5395,8 @@ impl<T: super::Instances> Instances for T {
     async fn resume(
         &self,
         req: crate::model::instances::ResumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resume(self, req, options).await
     }
 
@@ -5423,8 +5404,8 @@ impl<T: super::Instances> Instances for T {
     async fn send_diagnostic_interrupt(
         &self,
         req: crate::model::instances::SendDiagnosticInterruptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::send_diagnostic_interrupt(self, req, options).await
     }
 
@@ -5432,8 +5413,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_deletion_protection(
         &self,
         req: crate::model::instances::SetDeletionProtectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_deletion_protection(self, req, options).await
     }
 
@@ -5441,8 +5422,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_disk_auto_delete(
         &self,
         req: crate::model::instances::SetDiskAutoDeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_disk_auto_delete(self, req, options).await
     }
 
@@ -5450,8 +5431,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::instances::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -5459,8 +5440,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_labels(
         &self,
         req: crate::model::instances::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -5468,8 +5449,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_machine_resources(
         &self,
         req: crate::model::instances::SetMachineResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_machine_resources(self, req, options).await
     }
 
@@ -5477,8 +5458,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_machine_type(
         &self,
         req: crate::model::instances::SetMachineTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_machine_type(self, req, options).await
     }
 
@@ -5486,8 +5467,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_metadata(
         &self,
         req: crate::model::instances::SetMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_metadata(self, req, options).await
     }
 
@@ -5495,8 +5476,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_min_cpu_platform(
         &self,
         req: crate::model::instances::SetMinCpuPlatformRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_min_cpu_platform(self, req, options).await
     }
 
@@ -5504,8 +5485,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_name(
         &self,
         req: crate::model::instances::SetNameRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_name(self, req, options).await
     }
 
@@ -5513,8 +5494,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_scheduling(
         &self,
         req: crate::model::instances::SetSchedulingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_scheduling(self, req, options).await
     }
 
@@ -5522,8 +5503,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_security_policy(
         &self,
         req: crate::model::instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_security_policy(self, req, options).await
     }
 
@@ -5531,8 +5512,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_service_account(
         &self,
         req: crate::model::instances::SetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_service_account(self, req, options).await
     }
 
@@ -5540,8 +5521,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_shielded_instance_integrity_policy(
         &self,
         req: crate::model::instances::SetShieldedInstanceIntegrityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_shielded_instance_integrity_policy(self, req, options).await
     }
 
@@ -5549,8 +5530,8 @@ impl<T: super::Instances> Instances for T {
     async fn set_tags(
         &self,
         req: crate::model::instances::SetTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_tags(self, req, options).await
     }
 
@@ -5558,8 +5539,8 @@ impl<T: super::Instances> Instances for T {
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::instances::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::simulate_maintenance_event(self, req, options).await
     }
 
@@ -5567,8 +5548,8 @@ impl<T: super::Instances> Instances for T {
     async fn start(
         &self,
         req: crate::model::instances::StartRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::start(self, req, options).await
     }
 
@@ -5576,8 +5557,8 @@ impl<T: super::Instances> Instances for T {
     async fn start_with_encryption_key(
         &self,
         req: crate::model::instances::StartWithEncryptionKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::start_with_encryption_key(self, req, options).await
     }
 
@@ -5585,8 +5566,8 @@ impl<T: super::Instances> Instances for T {
     async fn stop(
         &self,
         req: crate::model::instances::StopRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop(self, req, options).await
     }
 
@@ -5594,8 +5575,8 @@ impl<T: super::Instances> Instances for T {
     async fn suspend(
         &self,
         req: crate::model::instances::SuspendRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::suspend(self, req, options).await
     }
 
@@ -5603,8 +5584,8 @@ impl<T: super::Instances> Instances for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -5612,8 +5593,8 @@ impl<T: super::Instances> Instances for T {
     async fn update(
         &self,
         req: crate::model::instances::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -5621,8 +5602,8 @@ impl<T: super::Instances> Instances for T {
     async fn update_access_config(
         &self,
         req: crate::model::instances::UpdateAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_access_config(self, req, options).await
     }
 
@@ -5630,8 +5611,8 @@ impl<T: super::Instances> Instances for T {
     async fn update_display_device(
         &self,
         req: crate::model::instances::UpdateDisplayDeviceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_display_device(self, req, options).await
     }
 
@@ -5639,8 +5620,8 @@ impl<T: super::Instances> Instances for T {
     async fn update_network_interface(
         &self,
         req: crate::model::instances::UpdateNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_network_interface(self, req, options).await
     }
 
@@ -5648,8 +5629,8 @@ impl<T: super::Instances> Instances for T {
     async fn update_shielded_instance_config(
         &self,
         req: crate::model::instances::UpdateShieldedInstanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_shielded_instance_config(self, req, options).await
     }
 
@@ -5657,22 +5638,22 @@ impl<T: super::Instances> Instances for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -5684,72 +5665,72 @@ pub trait InstantSnapshots: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::instant_snapshots::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshotAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshotAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshot>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshotList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshotList>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InstantSnapshots] also implement [InstantSnapshots].
@@ -5760,8 +5741,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn aggregated_list(
         &self,
         req: crate::model::instant_snapshots::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshotAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshotAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -5769,8 +5750,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn delete(
         &self,
         req: crate::model::instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -5778,8 +5759,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn get(
         &self,
         req: crate::model::instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshot>> {
         T::get(self, req, options).await
     }
 
@@ -5787,8 +5768,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -5796,8 +5777,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn insert(
         &self,
         req: crate::model::instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -5805,8 +5786,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn list(
         &self,
         req: crate::model::instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshotList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshotList>> {
         T::list(self, req, options).await
     }
 
@@ -5814,8 +5795,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -5823,8 +5804,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn set_labels(
         &self,
         req: crate::model::instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -5832,8 +5813,8 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -5841,22 +5822,22 @@ impl<T: super::InstantSnapshots> InstantSnapshots for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -5868,78 +5849,74 @@ pub trait InterconnectAttachmentGroups: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::interconnect_attachment_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::interconnect_attachment_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachmentGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentGroup>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_attachment_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse,
-        >,
+        crate::Response<crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse>,
     >;
 
     async fn insert(
         &self,
         req: crate::model::interconnect_attachment_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::interconnect_attachment_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InterconnectAttachmentGroupsListResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentGroupsListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::interconnect_attachment_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_attachment_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InterconnectAttachmentGroups] also implement [InterconnectAttachmentGroups].
@@ -5950,8 +5927,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn delete(
         &self,
         req: crate::model::interconnect_attachment_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -5959,8 +5936,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn get(
         &self,
         req: crate::model::interconnect_attachment_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachmentGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentGroup>> {
         T::get(self, req, options).await
     }
 
@@ -5968,8 +5945,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -5977,11 +5954,9 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_attachment_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse,
-        >,
+        crate::Response<crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse>,
     > {
         T::get_operational_status(self, req, options).await
     }
@@ -5990,8 +5965,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn insert(
         &self,
         req: crate::model::interconnect_attachment_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -5999,10 +5974,9 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn list(
         &self,
         req: crate::model::interconnect_attachment_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InterconnectAttachmentGroupsListResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentGroupsListResponse>>
+    {
         T::list(self, req, options).await
     }
 
@@ -6010,8 +5984,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn patch(
         &self,
         req: crate::model::interconnect_attachment_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -6019,8 +5993,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -6028,8 +6002,8 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_attachment_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6037,22 +6011,22 @@ impl<T: super::InterconnectAttachmentGroups> InterconnectAttachmentGroups for T
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6064,60 +6038,60 @@ pub trait InterconnectAttachments: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::interconnect_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachmentAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::interconnect_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::interconnect_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachment>>;
 
     async fn insert(
         &self,
         req: crate::model::interconnect_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::interconnect_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachmentList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentList>>;
 
     async fn patch(
         &self,
         req: crate::model::interconnect_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::interconnect_attachments::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InterconnectAttachments] also implement [InterconnectAttachments].
@@ -6128,9 +6102,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn aggregated_list(
         &self,
         req: crate::model::interconnect_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachmentAggregatedList>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -6138,8 +6111,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn delete(
         &self,
         req: crate::model::interconnect_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -6147,8 +6120,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn get(
         &self,
         req: crate::model::interconnect_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachment>> {
         T::get(self, req, options).await
     }
 
@@ -6156,8 +6129,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn insert(
         &self,
         req: crate::model::interconnect_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -6165,8 +6138,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn list(
         &self,
         req: crate::model::interconnect_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachmentList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachmentList>> {
         T::list(self, req, options).await
     }
 
@@ -6174,8 +6147,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn patch(
         &self,
         req: crate::model::interconnect_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -6183,8 +6156,8 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn set_labels(
         &self,
         req: crate::model::interconnect_attachments::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -6192,22 +6165,22 @@ impl<T: super::InterconnectAttachments> InterconnectAttachments for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6219,80 +6192,78 @@ pub trait InterconnectGroups: std::fmt::Debug + Send + Sync {
     async fn create_members(
         &self,
         req: crate::model::interconnect_groups::CreateMembersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::interconnect_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::interconnect_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectGroup>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>>;
 
     async fn insert(
         &self,
         req: crate::model::interconnect_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::interconnect_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectGroupsListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectGroupsListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::interconnect_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InterconnectGroups] also implement [InterconnectGroups].
@@ -6303,8 +6274,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn create_members(
         &self,
         req: crate::model::interconnect_groups::CreateMembersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::create_members(self, req, options).await
     }
 
@@ -6312,8 +6283,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn delete(
         &self,
         req: crate::model::interconnect_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -6321,8 +6292,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn get(
         &self,
         req: crate::model::interconnect_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectGroup>> {
         T::get(self, req, options).await
     }
 
@@ -6330,8 +6301,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6339,10 +6310,9 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>>
+    {
         T::get_operational_status(self, req, options).await
     }
 
@@ -6350,8 +6320,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn insert(
         &self,
         req: crate::model::interconnect_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -6359,8 +6329,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn list(
         &self,
         req: crate::model::interconnect_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectGroupsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectGroupsListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -6368,8 +6338,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn patch(
         &self,
         req: crate::model::interconnect_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -6377,8 +6347,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -6386,8 +6356,8 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6395,22 +6365,22 @@ impl<T: super::InterconnectGroups> InterconnectGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6422,14 +6392,14 @@ pub trait InterconnectLocations: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::interconnect_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectLocation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectLocation>>;
 
     async fn list(
         &self,
         req: crate::model::interconnect_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectLocationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectLocationList>>;
 }
 
 /// All implementations of [super::InterconnectLocations] also implement [InterconnectLocations].
@@ -6440,8 +6410,8 @@ impl<T: super::InterconnectLocations> InterconnectLocations for T {
     async fn get(
         &self,
         req: crate::model::interconnect_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectLocation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectLocation>> {
         T::get(self, req, options).await
     }
 
@@ -6449,8 +6419,8 @@ impl<T: super::InterconnectLocations> InterconnectLocations for T {
     async fn list(
         &self,
         req: crate::model::interconnect_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectLocationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectLocationList>> {
         T::list(self, req, options).await
     }
 }
@@ -6462,14 +6432,14 @@ pub trait InterconnectRemoteLocations: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::interconnect_remote_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectRemoteLocation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectRemoteLocation>>;
 
     async fn list(
         &self,
         req: crate::model::interconnect_remote_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectRemoteLocationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectRemoteLocationList>>;
 }
 
 /// All implementations of [super::InterconnectRemoteLocations] also implement [InterconnectRemoteLocations].
@@ -6480,8 +6450,8 @@ impl<T: super::InterconnectRemoteLocations> InterconnectRemoteLocations for T {
     async fn get(
         &self,
         req: crate::model::interconnect_remote_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectRemoteLocation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectRemoteLocation>> {
         T::get(self, req, options).await
     }
 
@@ -6489,8 +6459,8 @@ impl<T: super::InterconnectRemoteLocations> InterconnectRemoteLocations for T {
     async fn list(
         &self,
         req: crate::model::interconnect_remote_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectRemoteLocationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectRemoteLocationList>> {
         T::list(self, req, options).await
     }
 }
@@ -6502,66 +6472,66 @@ pub trait Interconnects: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::interconnects::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::interconnects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Interconnect>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Interconnect>>;
 
     async fn get_diagnostics(
         &self,
         req: crate::model::interconnects::GetDiagnosticsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectsGetDiagnosticsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectsGetDiagnosticsResponse>>;
 
     async fn get_macsec_config(
         &self,
         req: crate::model::interconnects::GetMacsecConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectsGetMacsecConfigResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectsGetMacsecConfigResponse>>;
 
     async fn insert(
         &self,
         req: crate::model::interconnects::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::interconnects::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectList>>;
 
     async fn patch(
         &self,
         req: crate::model::interconnects::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::interconnects::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Interconnects] also implement [Interconnects].
@@ -6572,8 +6542,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn delete(
         &self,
         req: crate::model::interconnects::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -6581,8 +6551,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn get(
         &self,
         req: crate::model::interconnects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Interconnect>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Interconnect>> {
         T::get(self, req, options).await
     }
 
@@ -6590,9 +6560,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn get_diagnostics(
         &self,
         req: crate::model::interconnects::GetDiagnosticsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectsGetDiagnosticsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectsGetDiagnosticsResponse>> {
         T::get_diagnostics(self, req, options).await
     }
 
@@ -6600,9 +6569,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn get_macsec_config(
         &self,
         req: crate::model::interconnects::GetMacsecConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectsGetMacsecConfigResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectsGetMacsecConfigResponse>> {
         T::get_macsec_config(self, req, options).await
     }
 
@@ -6610,8 +6578,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn insert(
         &self,
         req: crate::model::interconnects::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -6619,8 +6587,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn list(
         &self,
         req: crate::model::interconnects::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectList>> {
         T::list(self, req, options).await
     }
 
@@ -6628,8 +6596,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn patch(
         &self,
         req: crate::model::interconnects::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -6637,8 +6605,8 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn set_labels(
         &self,
         req: crate::model::interconnects::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -6646,22 +6614,22 @@ impl<T: super::Interconnects> Interconnects for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6673,14 +6641,14 @@ pub trait LicenseCodes: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::license_codes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicenseCode>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicenseCode>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::license_codes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 }
 
 /// All implementations of [super::LicenseCodes] also implement [LicenseCodes].
@@ -6691,8 +6659,8 @@ impl<T: super::LicenseCodes> LicenseCodes for T {
     async fn get(
         &self,
         req: crate::model::license_codes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicenseCode>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicenseCode>> {
         T::get(self, req, options).await
     }
 
@@ -6700,8 +6668,8 @@ impl<T: super::LicenseCodes> LicenseCodes for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::license_codes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 }
@@ -6713,66 +6681,66 @@ pub trait Licenses: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::licenses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::licenses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::License>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::License>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::licenses::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::licenses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::licenses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicensesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicensesListResponse>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::licenses::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::licenses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::licenses::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Licenses] also implement [Licenses].
@@ -6783,8 +6751,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn delete(
         &self,
         req: crate::model::licenses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -6792,8 +6760,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn get(
         &self,
         req: crate::model::licenses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::License>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::License>> {
         T::get(self, req, options).await
     }
 
@@ -6801,8 +6769,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::licenses::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6810,8 +6778,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn insert(
         &self,
         req: crate::model::licenses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -6819,8 +6787,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn list(
         &self,
         req: crate::model::licenses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LicensesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LicensesListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -6828,8 +6796,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::licenses::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -6837,8 +6805,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::licenses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -6846,8 +6814,8 @@ impl<T: super::Licenses> Licenses for T {
     async fn update(
         &self,
         req: crate::model::licenses::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -6855,22 +6823,22 @@ impl<T: super::Licenses> Licenses for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -6882,66 +6850,66 @@ pub trait MachineImages: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::machine_images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::machine_images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineImage>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineImage>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::machine_images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::machine_images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::machine_images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineImageList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineImageList>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::machine_images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::machine_images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::machine_images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::MachineImages] also implement [MachineImages].
@@ -6952,8 +6920,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn delete(
         &self,
         req: crate::model::machine_images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -6961,8 +6929,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn get(
         &self,
         req: crate::model::machine_images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineImage>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineImage>> {
         T::get(self, req, options).await
     }
 
@@ -6970,8 +6938,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::machine_images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -6979,8 +6947,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn insert(
         &self,
         req: crate::model::machine_images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -6988,8 +6956,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn list(
         &self,
         req: crate::model::machine_images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineImageList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineImageList>> {
         T::list(self, req, options).await
     }
 
@@ -6997,8 +6965,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::machine_images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -7006,8 +6974,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn set_labels(
         &self,
         req: crate::model::machine_images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -7015,8 +6983,8 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::machine_images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -7024,22 +6992,22 @@ impl<T: super::MachineImages> MachineImages for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7051,20 +7019,20 @@ pub trait MachineTypes: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::machine_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineTypeAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineTypeAggregatedList>>;
 
     async fn get(
         &self,
         req: crate::model::machine_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineType>>;
 
     async fn list(
         &self,
         req: crate::model::machine_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineTypeList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineTypeList>>;
 }
 
 /// All implementations of [super::MachineTypes] also implement [MachineTypes].
@@ -7075,8 +7043,8 @@ impl<T: super::MachineTypes> MachineTypes for T {
     async fn aggregated_list(
         &self,
         req: crate::model::machine_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineTypeAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -7084,8 +7052,8 @@ impl<T: super::MachineTypes> MachineTypes for T {
     async fn get(
         &self,
         req: crate::model::machine_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineType>> {
         T::get(self, req, options).await
     }
 
@@ -7093,8 +7061,8 @@ impl<T: super::MachineTypes> MachineTypes for T {
     async fn list(
         &self,
         req: crate::model::machine_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MachineTypeList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MachineTypeList>> {
         T::list(self, req, options).await
     }
 }
@@ -7106,72 +7074,72 @@ pub trait NetworkAttachments: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::network_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkAttachmentAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkAttachmentAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::network_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::network_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkAttachment>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::network_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::network_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::network_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkAttachmentList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkAttachmentList>>;
 
     async fn patch(
         &self,
         req: crate::model::network_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::network_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NetworkAttachments] also implement [NetworkAttachments].
@@ -7182,8 +7150,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn aggregated_list(
         &self,
         req: crate::model::network_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkAttachmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkAttachmentAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -7191,8 +7159,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn delete(
         &self,
         req: crate::model::network_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -7200,8 +7168,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn get(
         &self,
         req: crate::model::network_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkAttachment>> {
         T::get(self, req, options).await
     }
 
@@ -7209,8 +7177,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::network_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -7218,8 +7186,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn insert(
         &self,
         req: crate::model::network_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -7227,8 +7195,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn list(
         &self,
         req: crate::model::network_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkAttachmentList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkAttachmentList>> {
         T::list(self, req, options).await
     }
 
@@ -7236,8 +7204,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn patch(
         &self,
         req: crate::model::network_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -7245,8 +7213,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::network_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -7254,8 +7222,8 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -7263,22 +7231,22 @@ impl<T: super::NetworkAttachments> NetworkAttachments for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7290,50 +7258,48 @@ pub trait NetworkEdgeSecurityServices: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::network_edge_security_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::network_edge_security_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::network_edge_security_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEdgeSecurityService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEdgeSecurityService>>;
 
     async fn insert(
         &self,
         req: crate::model::network_edge_security_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch(
         &self,
         req: crate::model::network_edge_security_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NetworkEdgeSecurityServices] also implement [NetworkEdgeSecurityServices].
@@ -7344,10 +7310,9 @@ impl<T: super::NetworkEdgeSecurityServices> NetworkEdgeSecurityServices for T {
     async fn aggregated_list(
         &self,
         req: crate::model::network_edge_security_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>>
+    {
         T::aggregated_list(self, req, options).await
     }
 
@@ -7355,8 +7320,8 @@ impl<T: super::NetworkEdgeSecurityServices> NetworkEdgeSecurityServices for T {
     async fn delete(
         &self,
         req: crate::model::network_edge_security_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -7364,8 +7329,8 @@ impl<T: super::NetworkEdgeSecurityServices> NetworkEdgeSecurityServices for T {
     async fn get(
         &self,
         req: crate::model::network_edge_security_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEdgeSecurityService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEdgeSecurityService>> {
         T::get(self, req, options).await
     }
 
@@ -7373,8 +7338,8 @@ impl<T: super::NetworkEdgeSecurityServices> NetworkEdgeSecurityServices for T {
     async fn insert(
         &self,
         req: crate::model::network_edge_security_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -7382,8 +7347,8 @@ impl<T: super::NetworkEdgeSecurityServices> NetworkEdgeSecurityServices for T {
     async fn patch(
         &self,
         req: crate::model::network_edge_security_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -7391,22 +7356,22 @@ impl<T: super::NetworkEdgeSecurityServices> NetworkEdgeSecurityServices for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7418,74 +7383,72 @@ pub trait NetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::network_endpoint_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupAggregatedList>>;
 
     async fn attach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn detach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroup>>;
 
     async fn insert(
         &self,
         req: crate::model::network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>>;
 
     async fn list_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_endpoint_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NetworkEndpointGroups] also implement [NetworkEndpointGroups].
@@ -7496,9 +7459,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn aggregated_list(
         &self,
         req: crate::model::network_endpoint_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupAggregatedList>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -7506,8 +7468,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::attach_network_endpoints(self, req, options).await
     }
 
@@ -7515,8 +7477,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn delete(
         &self,
         req: crate::model::network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -7524,8 +7486,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn detach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::detach_network_endpoints(self, req, options).await
     }
 
@@ -7533,8 +7495,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn get(
         &self,
         req: crate::model::network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         T::get(self, req, options).await
     }
 
@@ -7542,8 +7504,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn insert(
         &self,
         req: crate::model::network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -7551,8 +7513,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn list(
         &self,
         req: crate::model::network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -7560,10 +7522,9 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn list_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
+    {
         T::list_network_endpoints(self, req, options).await
     }
 
@@ -7571,8 +7532,8 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_endpoint_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -7580,22 +7541,22 @@ impl<T: super::NetworkEndpointGroups> NetworkEndpointGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7607,144 +7568,144 @@ pub trait NetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     async fn add_association(
         &self,
         req: crate::model::network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::AddPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_rule(
         &self,
         req: crate::model::network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::network_firewall_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkFirewallPolicyAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkFirewallPolicyAggregatedList>>;
 
     async fn clone_rules(
         &self,
         req: crate::model::network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicy>>;
 
     async fn get_association(
         &self,
         req: crate::model::network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn get_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::GetPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>>;
 
     async fn get_rule(
         &self,
         req: crate::model::network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>>;
 
     async fn insert(
         &self,
         req: crate::model::network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyList>>;
 
     async fn patch(
         &self,
         req: crate::model::network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_association(
         &self,
         req: crate::model::network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::RemovePacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_rule(
         &self,
         req: crate::model::network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NetworkFirewallPolicies] also implement [NetworkFirewallPolicies].
@@ -7755,8 +7716,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn add_association(
         &self,
         req: crate::model::network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_association(self, req, options).await
     }
 
@@ -7764,8 +7725,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn add_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::AddPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_packet_mirroring_rule(self, req, options).await
     }
 
@@ -7773,8 +7734,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn add_rule(
         &self,
         req: crate::model::network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_rule(self, req, options).await
     }
 
@@ -7782,9 +7743,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::network_firewall_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkFirewallPolicyAggregatedList>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkFirewallPolicyAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -7792,8 +7752,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn clone_rules(
         &self,
         req: crate::model::network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::clone_rules(self, req, options).await
     }
 
@@ -7801,8 +7761,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn delete(
         &self,
         req: crate::model::network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -7810,8 +7770,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn get(
         &self,
         req: crate::model::network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -7819,8 +7779,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn get_association(
         &self,
         req: crate::model::network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         T::get_association(self, req, options).await
     }
 
@@ -7828,8 +7788,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -7837,8 +7797,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn get_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::GetPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>> {
         T::get_packet_mirroring_rule(self, req, options).await
     }
 
@@ -7846,8 +7806,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn get_rule(
         &self,
         req: crate::model::network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -7855,8 +7815,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn insert(
         &self,
         req: crate::model::network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -7864,8 +7824,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn list(
         &self,
         req: crate::model::network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -7873,8 +7833,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn patch(
         &self,
         req: crate::model::network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -7882,8 +7842,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn patch_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_packet_mirroring_rule(self, req, options).await
     }
 
@@ -7891,8 +7851,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn patch_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_rule(self, req, options).await
     }
 
@@ -7900,8 +7860,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn remove_association(
         &self,
         req: crate::model::network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_association(self, req, options).await
     }
 
@@ -7909,8 +7869,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn remove_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::RemovePacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_packet_mirroring_rule(self, req, options).await
     }
 
@@ -7918,8 +7878,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn remove_rule(
         &self,
         req: crate::model::network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_rule(self, req, options).await
     }
 
@@ -7927,8 +7887,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -7936,8 +7896,8 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -7945,22 +7905,22 @@ impl<T: super::NetworkFirewallPolicies> NetworkFirewallPolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -7972,14 +7932,14 @@ pub trait NetworkProfiles: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::network_profiles::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkProfile>>;
 
     async fn list(
         &self,
         req: crate::model::network_profiles::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkProfilesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkProfilesListResponse>>;
 }
 
 /// All implementations of [super::NetworkProfiles] also implement [NetworkProfiles].
@@ -7990,8 +7950,8 @@ impl<T: super::NetworkProfiles> NetworkProfiles for T {
     async fn get(
         &self,
         req: crate::model::network_profiles::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkProfile>> {
         T::get(self, req, options).await
     }
 
@@ -7999,8 +7959,8 @@ impl<T: super::NetworkProfiles> NetworkProfiles for T {
     async fn list(
         &self,
         req: crate::model::network_profiles::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkProfilesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkProfilesListResponse>> {
         T::list(self, req, options).await
     }
 }
@@ -8012,90 +7972,90 @@ pub trait Networks: std::fmt::Debug + Send + Sync {
     async fn add_peering(
         &self,
         req: crate::model::networks::AddPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>>;
 
     async fn get_effective_firewalls(
         &self,
         req: crate::model::networks::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworksGetEffectiveFirewallsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworksGetEffectiveFirewallsResponse>>;
 
     async fn insert(
         &self,
         req: crate::model::networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkList>>;
 
     async fn list_peering_routes(
         &self,
         req: crate::model::networks::ListPeeringRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExchangedPeeringRoutesList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExchangedPeeringRoutesList>>;
 
     async fn patch(
         &self,
         req: crate::model::networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_peering(
         &self,
         req: crate::model::networks::RemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn request_remove_peering(
         &self,
         req: crate::model::networks::RequestRemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn switch_to_custom_mode(
         &self,
         req: crate::model::networks::SwitchToCustomModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_peering(
         &self,
         req: crate::model::networks::UpdatePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Networks] also implement [Networks].
@@ -8106,8 +8066,8 @@ impl<T: super::Networks> Networks for T {
     async fn add_peering(
         &self,
         req: crate::model::networks::AddPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_peering(self, req, options).await
     }
 
@@ -8115,8 +8075,8 @@ impl<T: super::Networks> Networks for T {
     async fn delete(
         &self,
         req: crate::model::networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -8124,8 +8084,8 @@ impl<T: super::Networks> Networks for T {
     async fn get(
         &self,
         req: crate::model::networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>> {
         T::get(self, req, options).await
     }
 
@@ -8133,9 +8093,8 @@ impl<T: super::Networks> Networks for T {
     async fn get_effective_firewalls(
         &self,
         req: crate::model::networks::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworksGetEffectiveFirewallsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworksGetEffectiveFirewallsResponse>> {
         T::get_effective_firewalls(self, req, options).await
     }
 
@@ -8143,8 +8102,8 @@ impl<T: super::Networks> Networks for T {
     async fn insert(
         &self,
         req: crate::model::networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -8152,8 +8111,8 @@ impl<T: super::Networks> Networks for T {
     async fn list(
         &self,
         req: crate::model::networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkList>> {
         T::list(self, req, options).await
     }
 
@@ -8161,8 +8120,8 @@ impl<T: super::Networks> Networks for T {
     async fn list_peering_routes(
         &self,
         req: crate::model::networks::ListPeeringRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExchangedPeeringRoutesList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExchangedPeeringRoutesList>> {
         T::list_peering_routes(self, req, options).await
     }
 
@@ -8170,8 +8129,8 @@ impl<T: super::Networks> Networks for T {
     async fn patch(
         &self,
         req: crate::model::networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -8179,8 +8138,8 @@ impl<T: super::Networks> Networks for T {
     async fn remove_peering(
         &self,
         req: crate::model::networks::RemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_peering(self, req, options).await
     }
 
@@ -8188,8 +8147,8 @@ impl<T: super::Networks> Networks for T {
     async fn request_remove_peering(
         &self,
         req: crate::model::networks::RequestRemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::request_remove_peering(self, req, options).await
     }
 
@@ -8197,8 +8156,8 @@ impl<T: super::Networks> Networks for T {
     async fn switch_to_custom_mode(
         &self,
         req: crate::model::networks::SwitchToCustomModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::switch_to_custom_mode(self, req, options).await
     }
 
@@ -8206,8 +8165,8 @@ impl<T: super::Networks> Networks for T {
     async fn update_peering(
         &self,
         req: crate::model::networks::UpdatePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_peering(self, req, options).await
     }
 
@@ -8215,22 +8174,22 @@ impl<T: super::Networks> Networks for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -8242,108 +8201,108 @@ pub trait NodeGroups: std::fmt::Debug + Send + Sync {
     async fn add_nodes(
         &self,
         req: crate::model::node_groups::AddNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::node_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroupAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroupAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::node_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_nodes(
         &self,
         req: crate::model::node_groups::DeleteNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::node_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroup>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::node_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::node_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::node_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroupList>>;
 
     async fn list_nodes(
         &self,
         req: crate::model::node_groups::ListNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroupsListNodes>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroupsListNodes>>;
 
     async fn patch(
         &self,
         req: crate::model::node_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn perform_maintenance(
         &self,
         req: crate::model::node_groups::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::node_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_node_template(
         &self,
         req: crate::model::node_groups::SetNodeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::node_groups::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NodeGroups] also implement [NodeGroups].
@@ -8354,8 +8313,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn add_nodes(
         &self,
         req: crate::model::node_groups::AddNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_nodes(self, req, options).await
     }
 
@@ -8363,8 +8322,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn aggregated_list(
         &self,
         req: crate::model::node_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroupAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroupAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -8372,8 +8331,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn delete(
         &self,
         req: crate::model::node_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -8381,8 +8340,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn delete_nodes(
         &self,
         req: crate::model::node_groups::DeleteNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_nodes(self, req, options).await
     }
 
@@ -8390,8 +8349,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn get(
         &self,
         req: crate::model::node_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroup>> {
         T::get(self, req, options).await
     }
 
@@ -8399,8 +8358,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::node_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -8408,8 +8367,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn insert(
         &self,
         req: crate::model::node_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -8417,8 +8376,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn list(
         &self,
         req: crate::model::node_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -8426,8 +8385,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn list_nodes(
         &self,
         req: crate::model::node_groups::ListNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroupsListNodes>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroupsListNodes>> {
         T::list_nodes(self, req, options).await
     }
 
@@ -8435,8 +8394,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn patch(
         &self,
         req: crate::model::node_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -8444,8 +8403,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn perform_maintenance(
         &self,
         req: crate::model::node_groups::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::perform_maintenance(self, req, options).await
     }
 
@@ -8453,8 +8412,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::node_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -8462,8 +8421,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn set_node_template(
         &self,
         req: crate::model::node_groups::SetNodeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_node_template(self, req, options).await
     }
 
@@ -8471,8 +8430,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::node_groups::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::simulate_maintenance_event(self, req, options).await
     }
 
@@ -8480,8 +8439,8 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -8489,22 +8448,22 @@ impl<T: super::NodeGroups> NodeGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -8516,66 +8475,66 @@ pub trait NodeTemplates: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::node_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTemplateAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTemplateAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::node_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::node_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTemplate>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::node_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::node_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::node_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTemplateList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTemplateList>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::node_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NodeTemplates] also implement [NodeTemplates].
@@ -8586,8 +8545,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn aggregated_list(
         &self,
         req: crate::model::node_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTemplateAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTemplateAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -8595,8 +8554,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn delete(
         &self,
         req: crate::model::node_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -8604,8 +8563,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn get(
         &self,
         req: crate::model::node_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTemplate>> {
         T::get(self, req, options).await
     }
 
@@ -8613,8 +8572,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::node_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -8622,8 +8581,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn insert(
         &self,
         req: crate::model::node_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -8631,8 +8590,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn list(
         &self,
         req: crate::model::node_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTemplateList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTemplateList>> {
         T::list(self, req, options).await
     }
 
@@ -8640,8 +8599,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::node_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -8649,8 +8608,8 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -8658,22 +8617,22 @@ impl<T: super::NodeTemplates> NodeTemplates for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -8685,20 +8644,20 @@ pub trait NodeTypes: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::node_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTypeAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTypeAggregatedList>>;
 
     async fn get(
         &self,
         req: crate::model::node_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeType>>;
 
     async fn list(
         &self,
         req: crate::model::node_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTypeList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTypeList>>;
 }
 
 /// All implementations of [super::NodeTypes] also implement [NodeTypes].
@@ -8709,8 +8668,8 @@ impl<T: super::NodeTypes> NodeTypes for T {
     async fn aggregated_list(
         &self,
         req: crate::model::node_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTypeAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -8718,8 +8677,8 @@ impl<T: super::NodeTypes> NodeTypes for T {
     async fn get(
         &self,
         req: crate::model::node_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeType>> {
         T::get(self, req, options).await
     }
 
@@ -8727,8 +8686,8 @@ impl<T: super::NodeTypes> NodeTypes for T {
     async fn list(
         &self,
         req: crate::model::node_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeTypeList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeTypeList>> {
         T::list(self, req, options).await
     }
 }
@@ -8740,120 +8699,118 @@ pub trait OrganizationSecurityPolicies: std::fmt::Debug + Send + Sync {
     async fn add_association(
         &self,
         req: crate::model::organization_security_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_rule(
         &self,
         req: crate::model::organization_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn copy_rules(
         &self,
         req: crate::model::organization_security_policies::CopyRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::organization_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::organization_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicy>>;
 
     async fn get_association(
         &self,
         req: crate::model::organization_security_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyAssociation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyAssociation>>;
 
     async fn get_rule(
         &self,
         req: crate::model::organization_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyRule>>;
 
     async fn insert(
         &self,
         req: crate::model::organization_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::organization_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyList>>;
 
     async fn list_associations(
         &self,
         req: crate::model::organization_security_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
+        crate::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
     >;
 
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::organization_security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     >;
 
     async fn r#move(
         &self,
         req: crate::model::organization_security_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch(
         &self,
         req: crate::model::organization_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_rule(
         &self,
         req: crate::model::organization_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_association(
         &self,
         req: crate::model::organization_security_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_rule(
         &self,
         req: crate::model::organization_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::OrganizationSecurityPolicies] also implement [OrganizationSecurityPolicies].
@@ -8864,8 +8821,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn add_association(
         &self,
         req: crate::model::organization_security_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_association(self, req, options).await
     }
 
@@ -8873,8 +8830,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn add_rule(
         &self,
         req: crate::model::organization_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_rule(self, req, options).await
     }
 
@@ -8882,8 +8839,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn copy_rules(
         &self,
         req: crate::model::organization_security_policies::CopyRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::copy_rules(self, req, options).await
     }
 
@@ -8891,8 +8848,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn delete(
         &self,
         req: crate::model::organization_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -8900,8 +8857,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn get(
         &self,
         req: crate::model::organization_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -8909,8 +8866,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn get_association(
         &self,
         req: crate::model::organization_security_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyAssociation>> {
         T::get_association(self, req, options).await
     }
 
@@ -8918,8 +8875,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn get_rule(
         &self,
         req: crate::model::organization_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyRule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -8927,8 +8884,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn insert(
         &self,
         req: crate::model::organization_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -8936,8 +8893,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn list(
         &self,
         req: crate::model::organization_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -8945,9 +8902,9 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn list_associations(
         &self,
         req: crate::model::organization_security_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
+        crate::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
     > {
         T::list_associations(self, req, options).await
     }
@@ -8956,11 +8913,9 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::organization_security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     > {
         T::list_preconfigured_expression_sets(self, req, options).await
     }
@@ -8969,8 +8924,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn r#move(
         &self,
         req: crate::model::organization_security_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::r#move(self, req, options).await
     }
 
@@ -8978,8 +8933,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn patch(
         &self,
         req: crate::model::organization_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -8987,8 +8942,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn patch_rule(
         &self,
         req: crate::model::organization_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_rule(self, req, options).await
     }
 
@@ -8996,8 +8951,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn remove_association(
         &self,
         req: crate::model::organization_security_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_association(self, req, options).await
     }
 
@@ -9005,8 +8960,8 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn remove_rule(
         &self,
         req: crate::model::organization_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_rule(self, req, options).await
     }
 
@@ -9014,22 +8969,22 @@ impl<T: super::OrganizationSecurityPolicies> OrganizationSecurityPolicies for T
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9041,60 +8996,60 @@ pub trait PacketMirrorings: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::packet_mirrorings::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PacketMirroringAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PacketMirroringAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::packet_mirrorings::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::packet_mirrorings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PacketMirroring>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PacketMirroring>>;
 
     async fn insert(
         &self,
         req: crate::model::packet_mirrorings::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::packet_mirrorings::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PacketMirroringList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PacketMirroringList>>;
 
     async fn patch(
         &self,
         req: crate::model::packet_mirrorings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::packet_mirrorings::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PacketMirrorings] also implement [PacketMirrorings].
@@ -9105,8 +9060,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn aggregated_list(
         &self,
         req: crate::model::packet_mirrorings::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PacketMirroringAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PacketMirroringAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -9114,8 +9069,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn delete(
         &self,
         req: crate::model::packet_mirrorings::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -9123,8 +9078,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn get(
         &self,
         req: crate::model::packet_mirrorings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PacketMirroring>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PacketMirroring>> {
         T::get(self, req, options).await
     }
 
@@ -9132,8 +9087,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn insert(
         &self,
         req: crate::model::packet_mirrorings::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -9141,8 +9096,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn list(
         &self,
         req: crate::model::packet_mirrorings::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PacketMirroringList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PacketMirroringList>> {
         T::list(self, req, options).await
     }
 
@@ -9150,8 +9105,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn patch(
         &self,
         req: crate::model::packet_mirrorings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -9159,8 +9114,8 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::packet_mirrorings::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -9168,22 +9123,22 @@ impl<T: super::PacketMirrorings> PacketMirrorings for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9195,36 +9150,36 @@ pub trait PreviewFeatures: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::preview_features::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PreviewFeature>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PreviewFeature>>;
 
     async fn list(
         &self,
         req: crate::model::preview_features::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PreviewFeatureList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PreviewFeatureList>>;
 
     async fn update(
         &self,
         req: crate::model::preview_features::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PreviewFeatures] also implement [PreviewFeatures].
@@ -9235,8 +9190,8 @@ impl<T: super::PreviewFeatures> PreviewFeatures for T {
     async fn get(
         &self,
         req: crate::model::preview_features::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PreviewFeature>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PreviewFeature>> {
         T::get(self, req, options).await
     }
 
@@ -9244,8 +9199,8 @@ impl<T: super::PreviewFeatures> PreviewFeatures for T {
     async fn list(
         &self,
         req: crate::model::preview_features::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PreviewFeatureList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PreviewFeatureList>> {
         T::list(self, req, options).await
     }
 
@@ -9253,8 +9208,8 @@ impl<T: super::PreviewFeatures> PreviewFeatures for T {
     async fn update(
         &self,
         req: crate::model::preview_features::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -9262,22 +9217,22 @@ impl<T: super::PreviewFeatures> PreviewFeatures for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9289,102 +9244,102 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     async fn disable_xpn_host(
         &self,
         req: crate::model::projects::DisableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn disable_xpn_resource(
         &self,
         req: crate::model::projects::DisableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn enable_xpn_host(
         &self,
         req: crate::model::projects::EnableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn enable_xpn_resource(
         &self,
         req: crate::model::projects::EnableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Project>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Project>>;
 
     async fn get_xpn_host(
         &self,
         req: crate::model::projects::GetXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Project>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Project>>;
 
     async fn get_xpn_resources(
         &self,
         req: crate::model::projects::GetXpnResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProjectsGetXpnResources>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProjectsGetXpnResources>>;
 
     async fn list_xpn_hosts(
         &self,
         req: crate::model::projects::ListXpnHostsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::XpnHostList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::XpnHostList>>;
 
     async fn move_disk(
         &self,
         req: crate::model::projects::MoveDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn move_instance(
         &self,
         req: crate::model::projects::MoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_cloud_armor_tier(
         &self,
         req: crate::model::projects::SetCloudArmorTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_common_instance_metadata(
         &self,
         req: crate::model::projects::SetCommonInstanceMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_default_network_tier(
         &self,
         req: crate::model::projects::SetDefaultNetworkTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_usage_export_bucket(
         &self,
         req: crate::model::projects::SetUsageExportBucketRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Projects] also implement [Projects].
@@ -9395,8 +9350,8 @@ impl<T: super::Projects> Projects for T {
     async fn disable_xpn_host(
         &self,
         req: crate::model::projects::DisableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::disable_xpn_host(self, req, options).await
     }
 
@@ -9404,8 +9359,8 @@ impl<T: super::Projects> Projects for T {
     async fn disable_xpn_resource(
         &self,
         req: crate::model::projects::DisableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::disable_xpn_resource(self, req, options).await
     }
 
@@ -9413,8 +9368,8 @@ impl<T: super::Projects> Projects for T {
     async fn enable_xpn_host(
         &self,
         req: crate::model::projects::EnableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::enable_xpn_host(self, req, options).await
     }
 
@@ -9422,8 +9377,8 @@ impl<T: super::Projects> Projects for T {
     async fn enable_xpn_resource(
         &self,
         req: crate::model::projects::EnableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::enable_xpn_resource(self, req, options).await
     }
 
@@ -9431,8 +9386,8 @@ impl<T: super::Projects> Projects for T {
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Project>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Project>> {
         T::get(self, req, options).await
     }
 
@@ -9440,8 +9395,8 @@ impl<T: super::Projects> Projects for T {
     async fn get_xpn_host(
         &self,
         req: crate::model::projects::GetXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Project>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Project>> {
         T::get_xpn_host(self, req, options).await
     }
 
@@ -9449,8 +9404,8 @@ impl<T: super::Projects> Projects for T {
     async fn get_xpn_resources(
         &self,
         req: crate::model::projects::GetXpnResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProjectsGetXpnResources>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProjectsGetXpnResources>> {
         T::get_xpn_resources(self, req, options).await
     }
 
@@ -9458,8 +9413,8 @@ impl<T: super::Projects> Projects for T {
     async fn list_xpn_hosts(
         &self,
         req: crate::model::projects::ListXpnHostsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::XpnHostList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::XpnHostList>> {
         T::list_xpn_hosts(self, req, options).await
     }
 
@@ -9467,8 +9422,8 @@ impl<T: super::Projects> Projects for T {
     async fn move_disk(
         &self,
         req: crate::model::projects::MoveDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::move_disk(self, req, options).await
     }
 
@@ -9476,8 +9431,8 @@ impl<T: super::Projects> Projects for T {
     async fn move_instance(
         &self,
         req: crate::model::projects::MoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::move_instance(self, req, options).await
     }
 
@@ -9485,8 +9440,8 @@ impl<T: super::Projects> Projects for T {
     async fn set_cloud_armor_tier(
         &self,
         req: crate::model::projects::SetCloudArmorTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_cloud_armor_tier(self, req, options).await
     }
 
@@ -9494,8 +9449,8 @@ impl<T: super::Projects> Projects for T {
     async fn set_common_instance_metadata(
         &self,
         req: crate::model::projects::SetCommonInstanceMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_common_instance_metadata(self, req, options).await
     }
 
@@ -9503,8 +9458,8 @@ impl<T: super::Projects> Projects for T {
     async fn set_default_network_tier(
         &self,
         req: crate::model::projects::SetDefaultNetworkTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_default_network_tier(self, req, options).await
     }
 
@@ -9512,8 +9467,8 @@ impl<T: super::Projects> Projects for T {
     async fn set_usage_export_bucket(
         &self,
         req: crate::model::projects::SetUsageExportBucketRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_usage_export_bucket(self, req, options).await
     }
 
@@ -9521,22 +9476,22 @@ impl<T: super::Projects> Projects for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9548,60 +9503,60 @@ pub trait PublicAdvertisedPrefixes: std::fmt::Debug + Send + Sync {
     async fn announce(
         &self,
         req: crate::model::public_advertised_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::public_advertised_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::public_advertised_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicAdvertisedPrefix>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicAdvertisedPrefix>>;
 
     async fn insert(
         &self,
         req: crate::model::public_advertised_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::public_advertised_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicAdvertisedPrefixList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicAdvertisedPrefixList>>;
 
     async fn patch(
         &self,
         req: crate::model::public_advertised_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn withdraw(
         &self,
         req: crate::model::public_advertised_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PublicAdvertisedPrefixes] also implement [PublicAdvertisedPrefixes].
@@ -9612,8 +9567,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn announce(
         &self,
         req: crate::model::public_advertised_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::announce(self, req, options).await
     }
 
@@ -9621,8 +9576,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn delete(
         &self,
         req: crate::model::public_advertised_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -9630,8 +9585,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn get(
         &self,
         req: crate::model::public_advertised_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicAdvertisedPrefix>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicAdvertisedPrefix>> {
         T::get(self, req, options).await
     }
 
@@ -9639,8 +9594,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn insert(
         &self,
         req: crate::model::public_advertised_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -9648,8 +9603,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn list(
         &self,
         req: crate::model::public_advertised_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicAdvertisedPrefixList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicAdvertisedPrefixList>> {
         T::list(self, req, options).await
     }
 
@@ -9657,8 +9612,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn patch(
         &self,
         req: crate::model::public_advertised_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -9666,8 +9621,8 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn withdraw(
         &self,
         req: crate::model::public_advertised_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::withdraw(self, req, options).await
     }
 
@@ -9675,22 +9630,22 @@ impl<T: super::PublicAdvertisedPrefixes> PublicAdvertisedPrefixes for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9702,66 +9657,66 @@ pub trait PublicDelegatedPrefixes: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::public_delegated_prefixes::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefixAggregatedList>>;
 
     async fn announce(
         &self,
         req: crate::model::public_delegated_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefix>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefix>>;
 
     async fn insert(
         &self,
         req: crate::model::public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefixList>>;
 
     async fn patch(
         &self,
         req: crate::model::public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn withdraw(
         &self,
         req: crate::model::public_delegated_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PublicDelegatedPrefixes] also implement [PublicDelegatedPrefixes].
@@ -9772,9 +9727,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn aggregated_list(
         &self,
         req: crate::model::public_delegated_prefixes::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixAggregatedList>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefixAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -9782,8 +9736,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn announce(
         &self,
         req: crate::model::public_delegated_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::announce(self, req, options).await
     }
 
@@ -9791,8 +9745,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn delete(
         &self,
         req: crate::model::public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -9800,8 +9754,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn get(
         &self,
         req: crate::model::public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefix>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefix>> {
         T::get(self, req, options).await
     }
 
@@ -9809,8 +9763,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn insert(
         &self,
         req: crate::model::public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -9818,8 +9772,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn list(
         &self,
         req: crate::model::public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicDelegatedPrefixList>> {
         T::list(self, req, options).await
     }
 
@@ -9827,8 +9781,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn patch(
         &self,
         req: crate::model::public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -9836,8 +9790,8 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn withdraw(
         &self,
         req: crate::model::public_delegated_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::withdraw(self, req, options).await
     }
 
@@ -9845,22 +9799,22 @@ impl<T: super::PublicDelegatedPrefixes> PublicDelegatedPrefixes for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -9872,60 +9826,60 @@ pub trait RegionAutoscalers: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Autoscaler>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Autoscaler>>;
 
     async fn insert(
         &self,
         req: crate::model::region_autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionAutoscalerList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionAutoscalerList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::region_autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionAutoscalers] also implement [RegionAutoscalers].
@@ -9936,8 +9890,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn delete(
         &self,
         req: crate::model::region_autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -9945,8 +9899,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn get(
         &self,
         req: crate::model::region_autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Autoscaler>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Autoscaler>> {
         T::get(self, req, options).await
     }
 
@@ -9954,8 +9908,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn insert(
         &self,
         req: crate::model::region_autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -9963,8 +9917,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn list(
         &self,
         req: crate::model::region_autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionAutoscalerList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionAutoscalerList>> {
         T::list(self, req, options).await
     }
 
@@ -9972,8 +9926,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn patch(
         &self,
         req: crate::model::region_autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -9981,8 +9935,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -9990,8 +9944,8 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn update(
         &self,
         req: crate::model::region_autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -9999,22 +9953,22 @@ impl<T: super::RegionAutoscalers> RegionAutoscalers for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10026,90 +9980,90 @@ pub trait RegionBackendServices: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendService>>;
 
     async fn get_health(
         &self,
         req: crate::model::region_backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceGroupHealth>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceGroupHealth>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::region_backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceList>>;
 
     async fn list_usable(
         &self,
         req: crate::model::region_backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceListUsable>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceListUsable>>;
 
     async fn patch(
         &self,
         req: crate::model::region_backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::region_backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_security_policy(
         &self,
         req: crate::model::region_backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::region_backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionBackendServices] also implement [RegionBackendServices].
@@ -10120,8 +10074,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn delete(
         &self,
         req: crate::model::region_backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -10129,8 +10083,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn get(
         &self,
         req: crate::model::region_backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendService>> {
         T::get(self, req, options).await
     }
 
@@ -10138,8 +10092,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn get_health(
         &self,
         req: crate::model::region_backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceGroupHealth>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceGroupHealth>> {
         T::get_health(self, req, options).await
     }
 
@@ -10147,8 +10101,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::region_backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -10156,8 +10110,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn insert(
         &self,
         req: crate::model::region_backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -10165,8 +10119,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn list(
         &self,
         req: crate::model::region_backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceList>> {
         T::list(self, req, options).await
     }
 
@@ -10174,8 +10128,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn list_usable(
         &self,
         req: crate::model::region_backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackendServiceListUsable>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackendServiceListUsable>> {
         T::list_usable(self, req, options).await
     }
 
@@ -10183,8 +10137,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn patch(
         &self,
         req: crate::model::region_backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -10192,8 +10146,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::region_backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -10201,8 +10155,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn set_security_policy(
         &self,
         req: crate::model::region_backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_security_policy(self, req, options).await
     }
 
@@ -10210,8 +10164,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10219,8 +10173,8 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn update(
         &self,
         req: crate::model::region_backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -10228,22 +10182,22 @@ impl<T: super::RegionBackendServices> RegionBackendServices for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10255,48 +10209,48 @@ pub trait RegionCommitments: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::region_commitments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitmentAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitmentAggregatedList>>;
 
     async fn get(
         &self,
         req: crate::model::region_commitments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Commitment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Commitment>>;
 
     async fn insert(
         &self,
         req: crate::model::region_commitments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_commitments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitmentList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitmentList>>;
 
     async fn update(
         &self,
         req: crate::model::region_commitments::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionCommitments] also implement [RegionCommitments].
@@ -10307,8 +10261,8 @@ impl<T: super::RegionCommitments> RegionCommitments for T {
     async fn aggregated_list(
         &self,
         req: crate::model::region_commitments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitmentAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -10316,8 +10270,8 @@ impl<T: super::RegionCommitments> RegionCommitments for T {
     async fn get(
         &self,
         req: crate::model::region_commitments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Commitment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Commitment>> {
         T::get(self, req, options).await
     }
 
@@ -10325,8 +10279,8 @@ impl<T: super::RegionCommitments> RegionCommitments for T {
     async fn insert(
         &self,
         req: crate::model::region_commitments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -10334,8 +10288,8 @@ impl<T: super::RegionCommitments> RegionCommitments for T {
     async fn list(
         &self,
         req: crate::model::region_commitments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitmentList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitmentList>> {
         T::list(self, req, options).await
     }
 
@@ -10343,8 +10297,8 @@ impl<T: super::RegionCommitments> RegionCommitments for T {
     async fn update(
         &self,
         req: crate::model::region_commitments::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -10352,22 +10306,22 @@ impl<T: super::RegionCommitments> RegionCommitments for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10379,14 +10333,14 @@ pub trait RegionDiskTypes: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::region_disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskType>>;
 
     async fn list(
         &self,
         req: crate::model::region_disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionDiskTypeList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionDiskTypeList>>;
 }
 
 /// All implementations of [super::RegionDiskTypes] also implement [RegionDiskTypes].
@@ -10397,8 +10351,8 @@ impl<T: super::RegionDiskTypes> RegionDiskTypes for T {
     async fn get(
         &self,
         req: crate::model::region_disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskType>> {
         T::get(self, req, options).await
     }
 
@@ -10406,8 +10360,8 @@ impl<T: super::RegionDiskTypes> RegionDiskTypes for T {
     async fn list(
         &self,
         req: crate::model::region_disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionDiskTypeList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionDiskTypeList>> {
         T::list(self, req, options).await
     }
 }
@@ -10419,120 +10373,120 @@ pub trait RegionDisks: std::fmt::Debug + Send + Sync {
     async fn add_resource_policies(
         &self,
         req: crate::model::region_disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn bulk_insert(
         &self,
         req: crate::model::region_disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn create_snapshot(
         &self,
         req: crate::model::region_disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::region_disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Disk>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Disk>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::region_disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskList>>;
 
     async fn remove_resource_policies(
         &self,
         req: crate::model::region_disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resize(
         &self,
         req: crate::model::region_disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::region_disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::region_disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn start_async_replication(
         &self,
         req: crate::model::region_disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop_async_replication(
         &self,
         req: crate::model::region_disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop_group_async_replication(
         &self,
         req: crate::model::region_disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::region_disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionDisks] also implement [RegionDisks].
@@ -10543,8 +10497,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn add_resource_policies(
         &self,
         req: crate::model::region_disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_resource_policies(self, req, options).await
     }
 
@@ -10552,8 +10506,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn bulk_insert(
         &self,
         req: crate::model::region_disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::bulk_insert(self, req, options).await
     }
 
@@ -10561,8 +10515,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn create_snapshot(
         &self,
         req: crate::model::region_disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::create_snapshot(self, req, options).await
     }
 
@@ -10570,8 +10524,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn delete(
         &self,
         req: crate::model::region_disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -10579,8 +10533,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn get(
         &self,
         req: crate::model::region_disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Disk>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Disk>> {
         T::get(self, req, options).await
     }
 
@@ -10588,8 +10542,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::region_disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -10597,8 +10551,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn insert(
         &self,
         req: crate::model::region_disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -10606,8 +10560,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn list(
         &self,
         req: crate::model::region_disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiskList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiskList>> {
         T::list(self, req, options).await
     }
 
@@ -10615,8 +10569,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn remove_resource_policies(
         &self,
         req: crate::model::region_disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_resource_policies(self, req, options).await
     }
 
@@ -10624,8 +10578,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn resize(
         &self,
         req: crate::model::region_disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resize(self, req, options).await
     }
 
@@ -10633,8 +10587,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::region_disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -10642,8 +10596,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn set_labels(
         &self,
         req: crate::model::region_disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -10651,8 +10605,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn start_async_replication(
         &self,
         req: crate::model::region_disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::start_async_replication(self, req, options).await
     }
 
@@ -10660,8 +10614,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn stop_async_replication(
         &self,
         req: crate::model::region_disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop_async_replication(self, req, options).await
     }
 
@@ -10669,8 +10623,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn stop_group_async_replication(
         &self,
         req: crate::model::region_disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop_group_async_replication(self, req, options).await
     }
 
@@ -10678,8 +10632,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10687,8 +10641,8 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn update(
         &self,
         req: crate::model::region_disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -10696,22 +10650,22 @@ impl<T: super::RegionDisks> RegionDisks for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10723,54 +10677,54 @@ pub trait RegionHealthCheckServices: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_health_check_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_health_check_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckService>>;
 
     async fn insert(
         &self,
         req: crate::model::region_health_check_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_health_check_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckServicesList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckServicesList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_health_check_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_check_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionHealthCheckServices] also implement [RegionHealthCheckServices].
@@ -10781,8 +10735,8 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn delete(
         &self,
         req: crate::model::region_health_check_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -10790,8 +10744,8 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn get(
         &self,
         req: crate::model::region_health_check_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckService>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckService>> {
         T::get(self, req, options).await
     }
 
@@ -10799,8 +10753,8 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn insert(
         &self,
         req: crate::model::region_health_check_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -10808,8 +10762,8 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn list(
         &self,
         req: crate::model::region_health_check_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckServicesList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckServicesList>> {
         T::list(self, req, options).await
     }
 
@@ -10817,8 +10771,8 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn patch(
         &self,
         req: crate::model::region_health_check_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -10826,8 +10780,8 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_check_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10835,22 +10789,22 @@ impl<T: super::RegionHealthCheckServices> RegionHealthCheckServices for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -10862,60 +10816,60 @@ pub trait RegionHealthChecks: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheck>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheck>>;
 
     async fn insert(
         &self,
         req: crate::model::region_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::region_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionHealthChecks] also implement [RegionHealthChecks].
@@ -10926,8 +10880,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn delete(
         &self,
         req: crate::model::region_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -10935,8 +10889,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn get(
         &self,
         req: crate::model::region_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheck>> {
         T::get(self, req, options).await
     }
 
@@ -10944,8 +10898,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn insert(
         &self,
         req: crate::model::region_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -10953,8 +10907,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn list(
         &self,
         req: crate::model::region_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HealthCheckList>> {
         T::list(self, req, options).await
     }
 
@@ -10962,8 +10916,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn patch(
         &self,
         req: crate::model::region_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -10971,8 +10925,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -10980,8 +10934,8 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn update(
         &self,
         req: crate::model::region_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -10989,22 +10943,22 @@ impl<T: super::RegionHealthChecks> RegionHealthChecks for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -11016,162 +10970,160 @@ pub trait RegionInstanceGroupManagers: std::fmt::Debug + Send + Sync {
     async fn abandon_instances(
         &self,
         req: crate::model::region_instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::region_instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn create_instances(
         &self,
         req: crate::model::region_instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::region_instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_instances(
         &self,
         req: crate::model::region_instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManager>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManager>>;
 
     async fn insert(
         &self,
         req: crate::model::region_instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionInstanceGroupManagerList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupManagerList>>;
 
     async fn list_errors(
         &self,
         req: crate::model::region_instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>>;
 
     async fn list_managed_instances(
         &self,
         req: crate::model::region_instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
+        crate::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
     >;
 
     async fn list_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
+        crate::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
     >;
 
     async fn patch(
         &self,
         req: crate::model::region_instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn recreate_instances(
         &self,
         req: crate::model::region_instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resize(
         &self,
         req: crate::model::region_instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resume_instances(
         &self,
         req: crate::model::region_instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_instance_template(
         &self,
         req: crate::model::region_instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_target_pools(
         &self,
         req: crate::model::region_instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn start_instances(
         &self,
         req: crate::model::region_instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn stop_instances(
         &self,
         req: crate::model::region_instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn suspend_instances(
         &self,
         req: crate::model::region_instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionInstanceGroupManagers] also implement [RegionInstanceGroupManagers].
@@ -11182,8 +11134,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn abandon_instances(
         &self,
         req: crate::model::region_instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::abandon_instances(self, req, options).await
     }
 
@@ -11191,8 +11143,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::region_instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::apply_updates_to_instances(self, req, options).await
     }
 
@@ -11200,8 +11152,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn create_instances(
         &self,
         req: crate::model::region_instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::create_instances(self, req, options).await
     }
 
@@ -11209,8 +11161,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn delete(
         &self,
         req: crate::model::region_instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -11218,8 +11170,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn delete_instances(
         &self,
         req: crate::model::region_instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_instances(self, req, options).await
     }
 
@@ -11227,8 +11179,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_per_instance_configs(self, req, options).await
     }
 
@@ -11236,8 +11188,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn get(
         &self,
         req: crate::model::region_instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroupManager>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroupManager>> {
         T::get(self, req, options).await
     }
 
@@ -11245,8 +11197,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn insert(
         &self,
         req: crate::model::region_instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -11254,8 +11206,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn list(
         &self,
         req: crate::model::region_instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionInstanceGroupManagerList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupManagerList>> {
         T::list(self, req, options).await
     }
 
@@ -11263,10 +11215,9 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn list_errors(
         &self,
         req: crate::model::region_instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>>
+    {
         T::list_errors(self, req, options).await
     }
 
@@ -11274,9 +11225,9 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn list_managed_instances(
         &self,
         req: crate::model::region_instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
+        crate::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
     > {
         T::list_managed_instances(self, req, options).await
     }
@@ -11285,9 +11236,9 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn list_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
+        crate::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
     > {
         T::list_per_instance_configs(self, req, options).await
     }
@@ -11296,8 +11247,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn patch(
         &self,
         req: crate::model::region_instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -11305,8 +11256,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_per_instance_configs(self, req, options).await
     }
 
@@ -11314,8 +11265,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn recreate_instances(
         &self,
         req: crate::model::region_instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::recreate_instances(self, req, options).await
     }
 
@@ -11323,8 +11274,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn resize(
         &self,
         req: crate::model::region_instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resize(self, req, options).await
     }
 
@@ -11332,8 +11283,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn resume_instances(
         &self,
         req: crate::model::region_instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resume_instances(self, req, options).await
     }
 
@@ -11341,8 +11292,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn set_instance_template(
         &self,
         req: crate::model::region_instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_instance_template(self, req, options).await
     }
 
@@ -11350,8 +11301,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn set_target_pools(
         &self,
         req: crate::model::region_instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_target_pools(self, req, options).await
     }
 
@@ -11359,8 +11310,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn start_instances(
         &self,
         req: crate::model::region_instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::start_instances(self, req, options).await
     }
 
@@ -11368,8 +11319,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn stop_instances(
         &self,
         req: crate::model::region_instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::stop_instances(self, req, options).await
     }
 
@@ -11377,8 +11328,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn suspend_instances(
         &self,
         req: crate::model::region_instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::suspend_instances(self, req, options).await
     }
 
@@ -11386,8 +11337,8 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn update_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_per_instance_configs(self, req, options).await
     }
 
@@ -11395,22 +11346,22 @@ impl<T: super::RegionInstanceGroupManagers> RegionInstanceGroupManagers for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -11422,48 +11373,48 @@ pub trait RegionInstanceGroups: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::region_instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroup>>;
 
     async fn list(
         &self,
         req: crate::model::region_instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionInstanceGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupList>>;
 
     async fn list_instances(
         &self,
         req: crate::model::region_instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionInstanceGroupsListInstances>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupsListInstances>>;
 
     async fn set_named_ports(
         &self,
         req: crate::model::region_instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionInstanceGroups] also implement [RegionInstanceGroups].
@@ -11474,8 +11425,8 @@ impl<T: super::RegionInstanceGroups> RegionInstanceGroups for T {
     async fn get(
         &self,
         req: crate::model::region_instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceGroup>> {
         T::get(self, req, options).await
     }
 
@@ -11483,8 +11434,8 @@ impl<T: super::RegionInstanceGroups> RegionInstanceGroups for T {
     async fn list(
         &self,
         req: crate::model::region_instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionInstanceGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -11492,9 +11443,8 @@ impl<T: super::RegionInstanceGroups> RegionInstanceGroups for T {
     async fn list_instances(
         &self,
         req: crate::model::region_instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionInstanceGroupsListInstances>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionInstanceGroupsListInstances>> {
         T::list_instances(self, req, options).await
     }
 
@@ -11502,8 +11452,8 @@ impl<T: super::RegionInstanceGroups> RegionInstanceGroups for T {
     async fn set_named_ports(
         &self,
         req: crate::model::region_instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_named_ports(self, req, options).await
     }
 
@@ -11511,8 +11461,8 @@ impl<T: super::RegionInstanceGroups> RegionInstanceGroups for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -11520,22 +11470,22 @@ impl<T: super::RegionInstanceGroups> RegionInstanceGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -11547,42 +11497,42 @@ pub trait RegionInstanceTemplates: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplate>>;
 
     async fn insert(
         &self,
         req: crate::model::region_instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplateList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplateList>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionInstanceTemplates] also implement [RegionInstanceTemplates].
@@ -11593,8 +11543,8 @@ impl<T: super::RegionInstanceTemplates> RegionInstanceTemplates for T {
     async fn delete(
         &self,
         req: crate::model::region_instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -11602,8 +11552,8 @@ impl<T: super::RegionInstanceTemplates> RegionInstanceTemplates for T {
     async fn get(
         &self,
         req: crate::model::region_instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplate>> {
         T::get(self, req, options).await
     }
 
@@ -11611,8 +11561,8 @@ impl<T: super::RegionInstanceTemplates> RegionInstanceTemplates for T {
     async fn insert(
         &self,
         req: crate::model::region_instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -11620,8 +11570,8 @@ impl<T: super::RegionInstanceTemplates> RegionInstanceTemplates for T {
     async fn list(
         &self,
         req: crate::model::region_instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstanceTemplateList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstanceTemplateList>> {
         T::list(self, req, options).await
     }
 
@@ -11629,22 +11579,22 @@ impl<T: super::RegionInstanceTemplates> RegionInstanceTemplates for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -11656,24 +11606,24 @@ pub trait RegionInstances: std::fmt::Debug + Send + Sync {
     async fn bulk_insert(
         &self,
         req: crate::model::region_instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionInstances] also implement [RegionInstances].
@@ -11684,8 +11634,8 @@ impl<T: super::RegionInstances> RegionInstances for T {
     async fn bulk_insert(
         &self,
         req: crate::model::region_instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::bulk_insert(self, req, options).await
     }
 
@@ -11693,22 +11643,22 @@ impl<T: super::RegionInstances> RegionInstances for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -11720,66 +11670,66 @@ pub trait RegionInstantSnapshots: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshot>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshotList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshotList>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::region_instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionInstantSnapshots] also implement [RegionInstantSnapshots].
@@ -11790,8 +11740,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn delete(
         &self,
         req: crate::model::region_instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -11799,8 +11749,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn get(
         &self,
         req: crate::model::region_instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshot>> {
         T::get(self, req, options).await
     }
 
@@ -11808,8 +11758,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -11817,8 +11767,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn insert(
         &self,
         req: crate::model::region_instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -11826,8 +11776,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn list(
         &self,
         req: crate::model::region_instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstantSnapshotList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstantSnapshotList>> {
         T::list(self, req, options).await
     }
 
@@ -11835,8 +11785,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -11844,8 +11794,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn set_labels(
         &self,
         req: crate::model::region_instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -11853,8 +11803,8 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -11862,22 +11812,22 @@ impl<T: super::RegionInstantSnapshots> RegionInstantSnapshots for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -11889,62 +11839,60 @@ pub trait RegionNetworkEndpointGroups: std::fmt::Debug + Send + Sync {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::region_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn detach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroup>>;
 
     async fn insert(
         &self,
         req: crate::model::region_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>>;
 
     async fn list_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionNetworkEndpointGroups] also implement [RegionNetworkEndpointGroups].
@@ -11955,8 +11903,8 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::attach_network_endpoints(self, req, options).await
     }
 
@@ -11964,8 +11912,8 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn delete(
         &self,
         req: crate::model::region_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -11973,8 +11921,8 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn detach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::detach_network_endpoints(self, req, options).await
     }
 
@@ -11982,8 +11930,8 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn get(
         &self,
         req: crate::model::region_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         T::get(self, req, options).await
     }
 
@@ -11991,8 +11939,8 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn insert(
         &self,
         req: crate::model::region_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -12000,8 +11948,8 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn list(
         &self,
         req: crate::model::region_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -12009,10 +11957,9 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn list_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
+    {
         T::list_network_endpoints(self, req, options).await
     }
 
@@ -12020,22 +11967,22 @@ impl<T: super::RegionNetworkEndpointGroups> RegionNetworkEndpointGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -12047,124 +11994,122 @@ pub trait RegionNetworkFirewallPolicies: std::fmt::Debug + Send + Sync {
     async fn add_association(
         &self,
         req: crate::model::region_network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_rule(
         &self,
         req: crate::model::region_network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn clone_rules(
         &self,
         req: crate::model::region_network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::region_network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicy>>;
 
     async fn get_association(
         &self,
         req: crate::model::region_network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>>;
 
     async fn get_effective_firewalls(
         &self,
         req: crate::model::region_network_firewall_policies::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse,
-        >,
+        crate::Response<crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse>,
     >;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn get_rule(
         &self,
         req: crate::model::region_network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>>;
 
     async fn insert(
         &self,
         req: crate::model::region_network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_rule(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_association(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_rule(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionNetworkFirewallPolicies] also implement [RegionNetworkFirewallPolicies].
@@ -12175,8 +12120,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn add_association(
         &self,
         req: crate::model::region_network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_association(self, req, options).await
     }
 
@@ -12184,8 +12129,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn add_rule(
         &self,
         req: crate::model::region_network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_rule(self, req, options).await
     }
 
@@ -12193,8 +12138,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn clone_rules(
         &self,
         req: crate::model::region_network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::clone_rules(self, req, options).await
     }
 
@@ -12202,8 +12147,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn delete(
         &self,
         req: crate::model::region_network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -12211,8 +12156,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn get(
         &self,
         req: crate::model::region_network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -12220,8 +12165,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn get_association(
         &self,
         req: crate::model::region_network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         T::get_association(self, req, options).await
     }
 
@@ -12229,11 +12174,9 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn get_effective_firewalls(
         &self,
         req: crate::model::region_network_firewall_policies::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse,
-        >,
+        crate::Response<crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse>,
     > {
         T::get_effective_firewalls(self, req, options).await
     }
@@ -12242,8 +12185,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn get_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -12251,8 +12194,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn get_rule(
         &self,
         req: crate::model::region_network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyRule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -12260,8 +12203,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn insert(
         &self,
         req: crate::model::region_network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -12269,8 +12212,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn list(
         &self,
         req: crate::model::region_network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FirewallPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FirewallPolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -12278,8 +12221,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn patch(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -12287,8 +12230,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn patch_rule(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_rule(self, req, options).await
     }
 
@@ -12296,8 +12239,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn remove_association(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_association(self, req, options).await
     }
 
@@ -12305,8 +12248,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn remove_rule(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_rule(self, req, options).await
     }
 
@@ -12314,8 +12257,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn set_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -12323,8 +12266,8 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -12332,22 +12275,22 @@ impl<T: super::RegionNetworkFirewallPolicies> RegionNetworkFirewallPolicies for
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -12359,48 +12302,48 @@ pub trait RegionNotificationEndpoints: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_notification_endpoints::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_notification_endpoints::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotificationEndpoint>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotificationEndpoint>>;
 
     async fn insert(
         &self,
         req: crate::model::region_notification_endpoints::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_notification_endpoints::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotificationEndpointList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotificationEndpointList>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_notification_endpoints::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionNotificationEndpoints] also implement [RegionNotificationEndpoints].
@@ -12411,8 +12354,8 @@ impl<T: super::RegionNotificationEndpoints> RegionNotificationEndpoints for T {
     async fn delete(
         &self,
         req: crate::model::region_notification_endpoints::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -12420,8 +12363,8 @@ impl<T: super::RegionNotificationEndpoints> RegionNotificationEndpoints for T {
     async fn get(
         &self,
         req: crate::model::region_notification_endpoints::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotificationEndpoint>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotificationEndpoint>> {
         T::get(self, req, options).await
     }
 
@@ -12429,8 +12372,8 @@ impl<T: super::RegionNotificationEndpoints> RegionNotificationEndpoints for T {
     async fn insert(
         &self,
         req: crate::model::region_notification_endpoints::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -12438,8 +12381,8 @@ impl<T: super::RegionNotificationEndpoints> RegionNotificationEndpoints for T {
     async fn list(
         &self,
         req: crate::model::region_notification_endpoints::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NotificationEndpointList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NotificationEndpointList>> {
         T::list(self, req, options).await
     }
 
@@ -12447,8 +12390,8 @@ impl<T: super::RegionNotificationEndpoints> RegionNotificationEndpoints for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_notification_endpoints::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -12456,22 +12399,22 @@ impl<T: super::RegionNotificationEndpoints> RegionNotificationEndpoints for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -12483,26 +12426,26 @@ pub trait RegionOperations: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>>;
 
     async fn wait(
         &self,
         req: crate::model::region_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 }
 
 /// All implementations of [super::RegionOperations] also implement [RegionOperations].
@@ -12513,8 +12456,8 @@ impl<T: super::RegionOperations> RegionOperations for T {
     async fn delete(
         &self,
         req: crate::model::region_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -12522,8 +12465,8 @@ impl<T: super::RegionOperations> RegionOperations for T {
     async fn get(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get(self, req, options).await
     }
 
@@ -12531,8 +12474,8 @@ impl<T: super::RegionOperations> RegionOperations for T {
     async fn list(
         &self,
         req: crate::model::region_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>> {
         T::list(self, req, options).await
     }
 
@@ -12540,8 +12483,8 @@ impl<T: super::RegionOperations> RegionOperations for T {
     async fn wait(
         &self,
         req: crate::model::region_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::wait(self, req, options).await
     }
 }
@@ -12553,78 +12496,78 @@ pub trait RegionSecurityPolicies: std::fmt::Debug + Send + Sync {
     async fn add_rule(
         &self,
         req: crate::model::region_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete(
         &self,
         req: crate::model::region_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicy>>;
 
     async fn get_rule(
         &self,
         req: crate::model::region_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyRule>>;
 
     async fn insert(
         &self,
         req: crate::model::region_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_rule(
         &self,
         req: crate::model::region_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_rule(
         &self,
         req: crate::model::region_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::region_security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionSecurityPolicies] also implement [RegionSecurityPolicies].
@@ -12635,8 +12578,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn add_rule(
         &self,
         req: crate::model::region_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_rule(self, req, options).await
     }
 
@@ -12644,8 +12587,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn delete(
         &self,
         req: crate::model::region_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -12653,8 +12596,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn get(
         &self,
         req: crate::model::region_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -12662,8 +12605,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn get_rule(
         &self,
         req: crate::model::region_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyRule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -12671,8 +12614,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn insert(
         &self,
         req: crate::model::region_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -12680,8 +12623,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn list(
         &self,
         req: crate::model::region_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -12689,8 +12632,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn patch(
         &self,
         req: crate::model::region_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -12698,8 +12641,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn patch_rule(
         &self,
         req: crate::model::region_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_rule(self, req, options).await
     }
 
@@ -12707,8 +12650,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn remove_rule(
         &self,
         req: crate::model::region_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_rule(self, req, options).await
     }
 
@@ -12716,8 +12659,8 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn set_labels(
         &self,
         req: crate::model::region_security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -12725,22 +12668,22 @@ impl<T: super::RegionSecurityPolicies> RegionSecurityPolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -12752,42 +12695,42 @@ pub trait RegionSslCertificates: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificate>>;
 
     async fn insert(
         &self,
         req: crate::model::region_ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificateList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificateList>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionSslCertificates] also implement [RegionSslCertificates].
@@ -12798,8 +12741,8 @@ impl<T: super::RegionSslCertificates> RegionSslCertificates for T {
     async fn delete(
         &self,
         req: crate::model::region_ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -12807,8 +12750,8 @@ impl<T: super::RegionSslCertificates> RegionSslCertificates for T {
     async fn get(
         &self,
         req: crate::model::region_ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificate>> {
         T::get(self, req, options).await
     }
 
@@ -12816,8 +12759,8 @@ impl<T: super::RegionSslCertificates> RegionSslCertificates for T {
     async fn insert(
         &self,
         req: crate::model::region_ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -12825,8 +12768,8 @@ impl<T: super::RegionSslCertificates> RegionSslCertificates for T {
     async fn list(
         &self,
         req: crate::model::region_ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificateList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificateList>> {
         T::list(self, req, options).await
     }
 
@@ -12834,22 +12777,22 @@ impl<T: super::RegionSslCertificates> RegionSslCertificates for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -12861,56 +12804,54 @@ pub trait RegionSslPolicies: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPolicy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPoliciesList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesList>>;
 
     async fn list_available_features(
         &self,
         req: crate::model::region_ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::region_ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionSslPolicies] also implement [RegionSslPolicies].
@@ -12921,8 +12862,8 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn delete(
         &self,
         req: crate::model::region_ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -12930,8 +12871,8 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn get(
         &self,
         req: crate::model::region_ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -12939,8 +12880,8 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn insert(
         &self,
         req: crate::model::region_ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -12948,8 +12889,8 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn list(
         &self,
         req: crate::model::region_ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPoliciesList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesList>> {
         T::list(self, req, options).await
     }
 
@@ -12957,10 +12898,9 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn list_available_features(
         &self,
         req: crate::model::region_ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>
+    {
         T::list_available_features(self, req, options).await
     }
 
@@ -12968,8 +12908,8 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn patch(
         &self,
         req: crate::model::region_ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -12977,22 +12917,22 @@ impl<T: super::RegionSslPolicies> RegionSslPolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13004,48 +12944,48 @@ pub trait RegionTargetHttpProxies: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxyList>>;
 
     async fn set_url_map(
         &self,
         req: crate::model::region_target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionTargetHttpProxies] also implement [RegionTargetHttpProxies].
@@ -13056,8 +12996,8 @@ impl<T: super::RegionTargetHttpProxies> RegionTargetHttpProxies for T {
     async fn delete(
         &self,
         req: crate::model::region_target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -13065,8 +13005,8 @@ impl<T: super::RegionTargetHttpProxies> RegionTargetHttpProxies for T {
     async fn get(
         &self,
         req: crate::model::region_target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxy>> {
         T::get(self, req, options).await
     }
 
@@ -13074,8 +13014,8 @@ impl<T: super::RegionTargetHttpProxies> RegionTargetHttpProxies for T {
     async fn insert(
         &self,
         req: crate::model::region_target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -13083,8 +13023,8 @@ impl<T: super::RegionTargetHttpProxies> RegionTargetHttpProxies for T {
     async fn list(
         &self,
         req: crate::model::region_target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -13092,8 +13032,8 @@ impl<T: super::RegionTargetHttpProxies> RegionTargetHttpProxies for T {
     async fn set_url_map(
         &self,
         req: crate::model::region_target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_url_map(self, req, options).await
     }
 
@@ -13101,22 +13041,22 @@ impl<T: super::RegionTargetHttpProxies> RegionTargetHttpProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13128,60 +13068,60 @@ pub trait RegionTargetHttpsProxies: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxyList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_ssl_certificates(
         &self,
         req: crate::model::region_target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_url_map(
         &self,
         req: crate::model::region_target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionTargetHttpsProxies] also implement [RegionTargetHttpsProxies].
@@ -13192,8 +13132,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn delete(
         &self,
         req: crate::model::region_target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -13201,8 +13141,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn get(
         &self,
         req: crate::model::region_target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxy>> {
         T::get(self, req, options).await
     }
 
@@ -13210,8 +13150,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn insert(
         &self,
         req: crate::model::region_target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -13219,8 +13159,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn list(
         &self,
         req: crate::model::region_target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -13228,8 +13168,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn patch(
         &self,
         req: crate::model::region_target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -13237,8 +13177,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn set_ssl_certificates(
         &self,
         req: crate::model::region_target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_ssl_certificates(self, req, options).await
     }
 
@@ -13246,8 +13186,8 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn set_url_map(
         &self,
         req: crate::model::region_target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_url_map(self, req, options).await
     }
 
@@ -13255,22 +13195,22 @@ impl<T: super::RegionTargetHttpsProxies> RegionTargetHttpsProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13282,42 +13222,42 @@ pub trait RegionTargetTcpProxies: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::region_target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxyList>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionTargetTcpProxies] also implement [RegionTargetTcpProxies].
@@ -13328,8 +13268,8 @@ impl<T: super::RegionTargetTcpProxies> RegionTargetTcpProxies for T {
     async fn delete(
         &self,
         req: crate::model::region_target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -13337,8 +13277,8 @@ impl<T: super::RegionTargetTcpProxies> RegionTargetTcpProxies for T {
     async fn get(
         &self,
         req: crate::model::region_target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxy>> {
         T::get(self, req, options).await
     }
 
@@ -13346,8 +13286,8 @@ impl<T: super::RegionTargetTcpProxies> RegionTargetTcpProxies for T {
     async fn insert(
         &self,
         req: crate::model::region_target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -13355,8 +13295,8 @@ impl<T: super::RegionTargetTcpProxies> RegionTargetTcpProxies for T {
     async fn list(
         &self,
         req: crate::model::region_target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -13364,22 +13304,22 @@ impl<T: super::RegionTargetTcpProxies> RegionTargetTcpProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13391,60 +13331,60 @@ pub trait RegionUrlMaps: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::region_url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::region_url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMap>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMap>>;
 
     async fn insert(
         &self,
         req: crate::model::region_url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::region_url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapList>>;
 
     async fn patch(
         &self,
         req: crate::model::region_url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update(
         &self,
         req: crate::model::region_url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn validate(
         &self,
         req: crate::model::region_url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapsValidateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapsValidateResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::RegionUrlMaps] also implement [RegionUrlMaps].
@@ -13455,8 +13395,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn delete(
         &self,
         req: crate::model::region_url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -13464,8 +13404,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn get(
         &self,
         req: crate::model::region_url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMap>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMap>> {
         T::get(self, req, options).await
     }
 
@@ -13473,8 +13413,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn insert(
         &self,
         req: crate::model::region_url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -13482,8 +13422,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn list(
         &self,
         req: crate::model::region_url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapList>> {
         T::list(self, req, options).await
     }
 
@@ -13491,8 +13431,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn patch(
         &self,
         req: crate::model::region_url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -13500,8 +13440,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn update(
         &self,
         req: crate::model::region_url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -13509,8 +13449,8 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn validate(
         &self,
         req: crate::model::region_url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapsValidateResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapsValidateResponse>> {
         T::validate(self, req, options).await
     }
 
@@ -13518,22 +13458,22 @@ impl<T: super::RegionUrlMaps> RegionUrlMaps for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13545,8 +13485,8 @@ pub trait RegionZones: std::fmt::Debug + Send + Sync {
     async fn list(
         &self,
         req: crate::model::region_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ZoneList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ZoneList>>;
 }
 
 /// All implementations of [super::RegionZones] also implement [RegionZones].
@@ -13557,8 +13497,8 @@ impl<T: super::RegionZones> RegionZones for T {
     async fn list(
         &self,
         req: crate::model::region_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ZoneList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ZoneList>> {
         T::list(self, req, options).await
     }
 }
@@ -13570,14 +13510,14 @@ pub trait Regions: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::regions::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Region>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Region>>;
 
     async fn list(
         &self,
         req: crate::model::regions::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionList>>;
 }
 
 /// All implementations of [super::Regions] also implement [Regions].
@@ -13588,8 +13528,8 @@ impl<T: super::Regions> Regions for T {
     async fn get(
         &self,
         req: crate::model::regions::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Region>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Region>> {
         T::get(self, req, options).await
     }
 
@@ -13597,8 +13537,8 @@ impl<T: super::Regions> Regions for T {
     async fn list(
         &self,
         req: crate::model::regions::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RegionList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RegionList>> {
         T::list(self, req, options).await
     }
 }
@@ -13610,54 +13550,54 @@ pub trait ReservationBlocks: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::reservation_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationBlocksGetResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationBlocksGetResponse>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn list(
         &self,
         req: crate::model::reservation_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationBlocksListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationBlocksListResponse>>;
 
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ReservationBlocks] also implement [ReservationBlocks].
@@ -13668,8 +13608,8 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn get(
         &self,
         req: crate::model::reservation_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationBlocksGetResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationBlocksGetResponse>> {
         T::get(self, req, options).await
     }
 
@@ -13677,8 +13617,8 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -13686,8 +13626,8 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn list(
         &self,
         req: crate::model::reservation_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationBlocksListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationBlocksListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -13695,8 +13635,8 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::perform_maintenance(self, req, options).await
     }
 
@@ -13704,8 +13644,8 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -13713,8 +13653,8 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -13722,22 +13662,22 @@ impl<T: super::ReservationBlocks> ReservationBlocks for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13749,36 +13689,36 @@ pub trait ReservationSlots: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::reservation_slots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSlotsGetResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSlotsGetResponse>>;
 
     async fn list(
         &self,
         req: crate::model::reservation_slots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSlotsListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSlotsListResponse>>;
 
     async fn update(
         &self,
         req: crate::model::reservation_slots::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ReservationSlots] also implement [ReservationSlots].
@@ -13789,8 +13729,8 @@ impl<T: super::ReservationSlots> ReservationSlots for T {
     async fn get(
         &self,
         req: crate::model::reservation_slots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSlotsGetResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSlotsGetResponse>> {
         T::get(self, req, options).await
     }
 
@@ -13798,8 +13738,8 @@ impl<T: super::ReservationSlots> ReservationSlots for T {
     async fn list(
         &self,
         req: crate::model::reservation_slots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSlotsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSlotsListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -13807,8 +13747,8 @@ impl<T: super::ReservationSlots> ReservationSlots for T {
     async fn update(
         &self,
         req: crate::model::reservation_slots::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -13816,22 +13756,22 @@ impl<T: super::ReservationSlots> ReservationSlots for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13843,60 +13783,60 @@ pub trait ReservationSubBlocks: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::reservation_sub_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSubBlocksGetResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSubBlocksGetResponse>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn list(
         &self,
         req: crate::model::reservation_sub_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSubBlocksListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSubBlocksListResponse>>;
 
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_sub_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn report_faulty(
         &self,
         req: crate::model::reservation_sub_blocks::ReportFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_sub_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ReservationSubBlocks] also implement [ReservationSubBlocks].
@@ -13907,8 +13847,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn get(
         &self,
         req: crate::model::reservation_sub_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSubBlocksGetResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSubBlocksGetResponse>> {
         T::get(self, req, options).await
     }
 
@@ -13916,8 +13856,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -13925,9 +13865,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn list(
         &self,
         req: crate::model::reservation_sub_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationSubBlocksListResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationSubBlocksListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -13935,8 +13874,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_sub_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::perform_maintenance(self, req, options).await
     }
 
@@ -13944,8 +13883,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn report_faulty(
         &self,
         req: crate::model::reservation_sub_blocks::ReportFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::report_faulty(self, req, options).await
     }
 
@@ -13953,8 +13892,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -13962,8 +13901,8 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_sub_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -13971,22 +13910,22 @@ impl<T: super::ReservationSubBlocks> ReservationSubBlocks for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -13998,84 +13937,84 @@ pub trait Reservations: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::reservations::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationList>>;
 
     async fn perform_maintenance(
         &self,
         req: crate::model::reservations::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn resize(
         &self,
         req: crate::model::reservations::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::reservations::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservations::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Reservations] also implement [Reservations].
@@ -14086,8 +14025,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn aggregated_list(
         &self,
         req: crate::model::reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -14095,8 +14034,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn delete(
         &self,
         req: crate::model::reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -14104,8 +14043,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn get(
         &self,
         req: crate::model::reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Reservation>> {
         T::get(self, req, options).await
     }
 
@@ -14113,8 +14052,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::reservations::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -14122,8 +14061,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn insert(
         &self,
         req: crate::model::reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -14131,8 +14070,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn list(
         &self,
         req: crate::model::reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReservationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReservationList>> {
         T::list(self, req, options).await
     }
 
@@ -14140,8 +14079,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn perform_maintenance(
         &self,
         req: crate::model::reservations::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::perform_maintenance(self, req, options).await
     }
 
@@ -14149,8 +14088,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn resize(
         &self,
         req: crate::model::reservations::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::resize(self, req, options).await
     }
 
@@ -14158,8 +14097,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::reservations::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -14167,8 +14106,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservations::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -14176,8 +14115,8 @@ impl<T: super::Reservations> Reservations for T {
     async fn update(
         &self,
         req: crate::model::reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -14185,22 +14124,22 @@ impl<T: super::Reservations> Reservations for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -14212,72 +14151,72 @@ pub trait ResourcePolicies: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::resource_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourcePolicyAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourcePolicyAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::resource_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::resource_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourcePolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourcePolicy>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::resource_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::resource_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::resource_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourcePolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourcePolicyList>>;
 
     async fn patch(
         &self,
         req: crate::model::resource_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::resource_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::resource_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ResourcePolicies] also implement [ResourcePolicies].
@@ -14288,8 +14227,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::resource_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourcePolicyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourcePolicyAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -14297,8 +14236,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn delete(
         &self,
         req: crate::model::resource_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -14306,8 +14245,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn get(
         &self,
         req: crate::model::resource_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourcePolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourcePolicy>> {
         T::get(self, req, options).await
     }
 
@@ -14315,8 +14254,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::resource_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -14324,8 +14263,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn insert(
         &self,
         req: crate::model::resource_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -14333,8 +14272,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn list(
         &self,
         req: crate::model::resource_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourcePolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourcePolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -14342,8 +14281,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn patch(
         &self,
         req: crate::model::resource_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -14351,8 +14290,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::resource_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -14360,8 +14299,8 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::resource_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -14369,22 +14308,22 @@ impl<T: super::ResourcePolicies> ResourcePolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -14396,120 +14335,120 @@ pub trait Routers: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::routers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouterAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouterAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::routers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn delete_route_policy(
         &self,
         req: crate::model::routers::DeleteRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::routers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Router>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Router>>;
 
     async fn get_nat_ip_info(
         &self,
         req: crate::model::routers::GetNatIpInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NatIpInfoResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NatIpInfoResponse>>;
 
     async fn get_nat_mapping_info(
         &self,
         req: crate::model::routers::GetNatMappingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VmEndpointNatMappingsList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VmEndpointNatMappingsList>>;
 
     async fn get_route_policy(
         &self,
         req: crate::model::routers::GetRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersGetRoutePolicyResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersGetRoutePolicyResponse>>;
 
     async fn get_router_status(
         &self,
         req: crate::model::routers::GetRouterStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouterStatusResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouterStatusResponse>>;
 
     async fn insert(
         &self,
         req: crate::model::routers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::routers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouterList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouterList>>;
 
     async fn list_bgp_routes(
         &self,
         req: crate::model::routers::ListBgpRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersListBgpRoutes>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersListBgpRoutes>>;
 
     async fn list_route_policies(
         &self,
         req: crate::model::routers::ListRoutePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersListRoutePolicies>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersListRoutePolicies>>;
 
     async fn patch(
         &self,
         req: crate::model::routers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_route_policy(
         &self,
         req: crate::model::routers::PatchRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn preview(
         &self,
         req: crate::model::routers::PreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersPreviewResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersPreviewResponse>>;
 
     async fn update(
         &self,
         req: crate::model::routers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn update_route_policy(
         &self,
         req: crate::model::routers::UpdateRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Routers] also implement [Routers].
@@ -14520,8 +14459,8 @@ impl<T: super::Routers> Routers for T {
     async fn aggregated_list(
         &self,
         req: crate::model::routers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouterAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouterAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -14529,8 +14468,8 @@ impl<T: super::Routers> Routers for T {
     async fn delete(
         &self,
         req: crate::model::routers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -14538,8 +14477,8 @@ impl<T: super::Routers> Routers for T {
     async fn delete_route_policy(
         &self,
         req: crate::model::routers::DeleteRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete_route_policy(self, req, options).await
     }
 
@@ -14547,8 +14486,8 @@ impl<T: super::Routers> Routers for T {
     async fn get(
         &self,
         req: crate::model::routers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Router>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Router>> {
         T::get(self, req, options).await
     }
 
@@ -14556,8 +14495,8 @@ impl<T: super::Routers> Routers for T {
     async fn get_nat_ip_info(
         &self,
         req: crate::model::routers::GetNatIpInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NatIpInfoResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NatIpInfoResponse>> {
         T::get_nat_ip_info(self, req, options).await
     }
 
@@ -14565,8 +14504,8 @@ impl<T: super::Routers> Routers for T {
     async fn get_nat_mapping_info(
         &self,
         req: crate::model::routers::GetNatMappingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VmEndpointNatMappingsList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VmEndpointNatMappingsList>> {
         T::get_nat_mapping_info(self, req, options).await
     }
 
@@ -14574,8 +14513,8 @@ impl<T: super::Routers> Routers for T {
     async fn get_route_policy(
         &self,
         req: crate::model::routers::GetRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersGetRoutePolicyResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersGetRoutePolicyResponse>> {
         T::get_route_policy(self, req, options).await
     }
 
@@ -14583,8 +14522,8 @@ impl<T: super::Routers> Routers for T {
     async fn get_router_status(
         &self,
         req: crate::model::routers::GetRouterStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouterStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouterStatusResponse>> {
         T::get_router_status(self, req, options).await
     }
 
@@ -14592,8 +14531,8 @@ impl<T: super::Routers> Routers for T {
     async fn insert(
         &self,
         req: crate::model::routers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -14601,8 +14540,8 @@ impl<T: super::Routers> Routers for T {
     async fn list(
         &self,
         req: crate::model::routers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouterList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouterList>> {
         T::list(self, req, options).await
     }
 
@@ -14610,8 +14549,8 @@ impl<T: super::Routers> Routers for T {
     async fn list_bgp_routes(
         &self,
         req: crate::model::routers::ListBgpRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersListBgpRoutes>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersListBgpRoutes>> {
         T::list_bgp_routes(self, req, options).await
     }
 
@@ -14619,8 +14558,8 @@ impl<T: super::Routers> Routers for T {
     async fn list_route_policies(
         &self,
         req: crate::model::routers::ListRoutePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersListRoutePolicies>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersListRoutePolicies>> {
         T::list_route_policies(self, req, options).await
     }
 
@@ -14628,8 +14567,8 @@ impl<T: super::Routers> Routers for T {
     async fn patch(
         &self,
         req: crate::model::routers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -14637,8 +14576,8 @@ impl<T: super::Routers> Routers for T {
     async fn patch_route_policy(
         &self,
         req: crate::model::routers::PatchRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_route_policy(self, req, options).await
     }
 
@@ -14646,8 +14585,8 @@ impl<T: super::Routers> Routers for T {
     async fn preview(
         &self,
         req: crate::model::routers::PreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RoutersPreviewResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RoutersPreviewResponse>> {
         T::preview(self, req, options).await
     }
 
@@ -14655,8 +14594,8 @@ impl<T: super::Routers> Routers for T {
     async fn update(
         &self,
         req: crate::model::routers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -14664,8 +14603,8 @@ impl<T: super::Routers> Routers for T {
     async fn update_route_policy(
         &self,
         req: crate::model::routers::UpdateRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update_route_policy(self, req, options).await
     }
 
@@ -14673,22 +14612,22 @@ impl<T: super::Routers> Routers for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -14700,48 +14639,48 @@ pub trait Routes: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::routes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::routes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Route>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Route>>;
 
     async fn insert(
         &self,
         req: crate::model::routes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::routes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouteList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouteList>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::routes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Routes] also implement [Routes].
@@ -14752,8 +14691,8 @@ impl<T: super::Routes> Routes for T {
     async fn delete(
         &self,
         req: crate::model::routes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -14761,8 +14700,8 @@ impl<T: super::Routes> Routes for T {
     async fn get(
         &self,
         req: crate::model::routes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Route>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Route>> {
         T::get(self, req, options).await
     }
 
@@ -14770,8 +14709,8 @@ impl<T: super::Routes> Routes for T {
     async fn insert(
         &self,
         req: crate::model::routes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -14779,8 +14718,8 @@ impl<T: super::Routes> Routes for T {
     async fn list(
         &self,
         req: crate::model::routes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouteList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouteList>> {
         T::list(self, req, options).await
     }
 
@@ -14788,8 +14727,8 @@ impl<T: super::Routes> Routes for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::routes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -14797,22 +14736,22 @@ impl<T: super::Routes> Routes for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -14824,94 +14763,92 @@ pub trait SecurityPolicies: std::fmt::Debug + Send + Sync {
     async fn add_rule(
         &self,
         req: crate::model::security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::security_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPoliciesAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPoliciesAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicy>>;
 
     async fn get_rule(
         &self,
         req: crate::model::security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyRule>>;
 
     async fn insert(
         &self,
         req: crate::model::security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyList>>;
 
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     >;
 
     async fn patch(
         &self,
         req: crate::model::security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn patch_rule(
         &self,
         req: crate::model::security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_rule(
         &self,
         req: crate::model::security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_labels(
         &self,
         req: crate::model::security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SecurityPolicies] also implement [SecurityPolicies].
@@ -14922,8 +14859,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn add_rule(
         &self,
         req: crate::model::security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_rule(self, req, options).await
     }
 
@@ -14931,8 +14868,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::security_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPoliciesAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPoliciesAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -14940,8 +14877,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn delete(
         &self,
         req: crate::model::security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -14949,8 +14886,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn get(
         &self,
         req: crate::model::security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -14958,8 +14895,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn get_rule(
         &self,
         req: crate::model::security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyRule>> {
         T::get_rule(self, req, options).await
     }
 
@@ -14967,8 +14904,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn insert(
         &self,
         req: crate::model::security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -14976,8 +14913,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn list(
         &self,
         req: crate::model::security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecurityPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecurityPolicyList>> {
         T::list(self, req, options).await
     }
 
@@ -14985,11 +14922,9 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     > {
         T::list_preconfigured_expression_sets(self, req, options).await
     }
@@ -14998,8 +14933,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn patch(
         &self,
         req: crate::model::security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -15007,8 +14942,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn patch_rule(
         &self,
         req: crate::model::security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch_rule(self, req, options).await
     }
 
@@ -15016,8 +14951,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn remove_rule(
         &self,
         req: crate::model::security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_rule(self, req, options).await
     }
 
@@ -15025,8 +14960,8 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn set_labels(
         &self,
         req: crate::model::security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -15034,22 +14969,22 @@ impl<T: super::SecurityPolicies> SecurityPolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -15061,72 +14996,72 @@ pub trait ServiceAttachments: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::service_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceAttachmentAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceAttachmentAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::service_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::service_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceAttachment>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::service_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::service_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::service_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceAttachmentList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceAttachmentList>>;
 
     async fn patch(
         &self,
         req: crate::model::service_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::service_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::service_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ServiceAttachments] also implement [ServiceAttachments].
@@ -15137,8 +15072,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn aggregated_list(
         &self,
         req: crate::model::service_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceAttachmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceAttachmentAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -15146,8 +15081,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn delete(
         &self,
         req: crate::model::service_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -15155,8 +15090,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn get(
         &self,
         req: crate::model::service_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceAttachment>> {
         T::get(self, req, options).await
     }
 
@@ -15164,8 +15099,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::service_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -15173,8 +15108,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn insert(
         &self,
         req: crate::model::service_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -15182,8 +15117,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn list(
         &self,
         req: crate::model::service_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceAttachmentList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceAttachmentList>> {
         T::list(self, req, options).await
     }
 
@@ -15191,8 +15126,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn patch(
         &self,
         req: crate::model::service_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -15200,8 +15135,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::service_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -15209,8 +15144,8 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::service_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -15218,22 +15153,22 @@ impl<T: super::ServiceAttachments> ServiceAttachments for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -15245,30 +15180,30 @@ pub trait SnapshotSettings: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::snapshot_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SnapshotSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SnapshotSettings>>;
 
     async fn patch(
         &self,
         req: crate::model::snapshot_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SnapshotSettings] also implement [SnapshotSettings].
@@ -15279,8 +15214,8 @@ impl<T: super::SnapshotSettings> SnapshotSettings for T {
     async fn get(
         &self,
         req: crate::model::snapshot_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SnapshotSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SnapshotSettings>> {
         T::get(self, req, options).await
     }
 
@@ -15288,8 +15223,8 @@ impl<T: super::SnapshotSettings> SnapshotSettings for T {
     async fn patch(
         &self,
         req: crate::model::snapshot_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -15297,22 +15232,22 @@ impl<T: super::SnapshotSettings> SnapshotSettings for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -15324,66 +15259,66 @@ pub trait Snapshots: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SnapshotList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SnapshotList>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_labels(
         &self,
         req: crate::model::snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Snapshots] also implement [Snapshots].
@@ -15394,8 +15329,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn delete(
         &self,
         req: crate::model::snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -15403,8 +15338,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn get(
         &self,
         req: crate::model::snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>> {
         T::get(self, req, options).await
     }
 
@@ -15412,8 +15347,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -15421,8 +15356,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn insert(
         &self,
         req: crate::model::snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -15430,8 +15365,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn list(
         &self,
         req: crate::model::snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SnapshotList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SnapshotList>> {
         T::list(self, req, options).await
     }
 
@@ -15439,8 +15374,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -15448,8 +15383,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn set_labels(
         &self,
         req: crate::model::snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -15457,8 +15392,8 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -15466,22 +15401,22 @@ impl<T: super::Snapshots> Snapshots for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -15493,48 +15428,48 @@ pub trait SslCertificates: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_certificates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificateAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificateAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificate>>;
 
     async fn insert(
         &self,
         req: crate::model::ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificateList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificateList>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SslCertificates] also implement [SslCertificates].
@@ -15545,8 +15480,8 @@ impl<T: super::SslCertificates> SslCertificates for T {
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_certificates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificateAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificateAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -15554,8 +15489,8 @@ impl<T: super::SslCertificates> SslCertificates for T {
     async fn delete(
         &self,
         req: crate::model::ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -15563,8 +15498,8 @@ impl<T: super::SslCertificates> SslCertificates for T {
     async fn get(
         &self,
         req: crate::model::ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificate>> {
         T::get(self, req, options).await
     }
 
@@ -15572,8 +15507,8 @@ impl<T: super::SslCertificates> SslCertificates for T {
     async fn insert(
         &self,
         req: crate::model::ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -15581,8 +15516,8 @@ impl<T: super::SslCertificates> SslCertificates for T {
     async fn list(
         &self,
         req: crate::model::ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslCertificateList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslCertificateList>> {
         T::list(self, req, options).await
     }
 
@@ -15590,22 +15525,22 @@ impl<T: super::SslCertificates> SslCertificates for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -15617,62 +15552,60 @@ pub trait SslPolicies: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPoliciesAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPolicy>>;
 
     async fn insert(
         &self,
         req: crate::model::ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPoliciesList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesList>>;
 
     async fn list_available_features(
         &self,
         req: crate::model::ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SslPolicies] also implement [SslPolicies].
@@ -15683,8 +15616,8 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPoliciesAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -15692,8 +15625,8 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn delete(
         &self,
         req: crate::model::ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -15701,8 +15634,8 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn get(
         &self,
         req: crate::model::ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPolicy>> {
         T::get(self, req, options).await
     }
 
@@ -15710,8 +15643,8 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn insert(
         &self,
         req: crate::model::ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -15719,8 +15652,8 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn list(
         &self,
         req: crate::model::ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SslPoliciesList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesList>> {
         T::list(self, req, options).await
     }
 
@@ -15728,10 +15661,9 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn list_available_features(
         &self,
         req: crate::model::ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>
+    {
         T::list_available_features(self, req, options).await
     }
 
@@ -15739,8 +15671,8 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn patch(
         &self,
         req: crate::model::ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -15748,22 +15680,22 @@ impl<T: super::SslPolicies> SslPolicies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -15775,20 +15707,20 @@ pub trait StoragePoolTypes: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pool_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolTypeAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolTypeAggregatedList>>;
 
     async fn get(
         &self,
         req: crate::model::storage_pool_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolType>>;
 
     async fn list(
         &self,
         req: crate::model::storage_pool_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolTypeList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolTypeList>>;
 }
 
 /// All implementations of [super::StoragePoolTypes] also implement [StoragePoolTypes].
@@ -15799,8 +15731,8 @@ impl<T: super::StoragePoolTypes> StoragePoolTypes for T {
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pool_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolTypeAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -15808,8 +15740,8 @@ impl<T: super::StoragePoolTypes> StoragePoolTypes for T {
     async fn get(
         &self,
         req: crate::model::storage_pool_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolType>> {
         T::get(self, req, options).await
     }
 
@@ -15817,8 +15749,8 @@ impl<T: super::StoragePoolTypes> StoragePoolTypes for T {
     async fn list(
         &self,
         req: crate::model::storage_pool_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolTypeList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolTypeList>> {
         T::list(self, req, options).await
     }
 }
@@ -15830,78 +15762,78 @@ pub trait StoragePools: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::storage_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::storage_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePool>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::storage_pools::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::storage_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::storage_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolList>>;
 
     async fn list_disks(
         &self,
         req: crate::model::storage_pools::ListDisksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolListDisks>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolListDisks>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::storage_pools::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::storage_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::storage_pools::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::StoragePools] also implement [StoragePools].
@@ -15912,8 +15844,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -15921,8 +15853,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn delete(
         &self,
         req: crate::model::storage_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -15930,8 +15862,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn get(
         &self,
         req: crate::model::storage_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePool>> {
         T::get(self, req, options).await
     }
 
@@ -15939,8 +15871,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::storage_pools::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -15948,8 +15880,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn insert(
         &self,
         req: crate::model::storage_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -15957,8 +15889,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn list(
         &self,
         req: crate::model::storage_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolList>> {
         T::list(self, req, options).await
     }
 
@@ -15966,8 +15898,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn list_disks(
         &self,
         req: crate::model::storage_pools::ListDisksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePoolListDisks>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePoolListDisks>> {
         T::list_disks(self, req, options).await
     }
 
@@ -15975,8 +15907,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::storage_pools::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -15984,8 +15916,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::storage_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -15993,8 +15925,8 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn update(
         &self,
         req: crate::model::storage_pools::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -16002,22 +15934,22 @@ impl<T: super::StoragePools> StoragePools for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -16029,90 +15961,90 @@ pub trait Subnetworks: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::subnetworks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubnetworkAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubnetworkAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::subnetworks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn expand_ip_cidr_range(
         &self,
         req: crate::model::subnetworks::ExpandIpCidrRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::subnetworks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Subnetwork>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Subnetwork>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::subnetworks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn insert(
         &self,
         req: crate::model::subnetworks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::subnetworks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubnetworkList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubnetworkList>>;
 
     async fn list_usable(
         &self,
         req: crate::model::subnetworks::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UsableSubnetworksAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UsableSubnetworksAggregatedList>>;
 
     async fn patch(
         &self,
         req: crate::model::subnetworks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::subnetworks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn set_private_ip_google_access(
         &self,
         req: crate::model::subnetworks::SetPrivateIpGoogleAccessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::subnetworks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Subnetworks] also implement [Subnetworks].
@@ -16123,8 +16055,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn aggregated_list(
         &self,
         req: crate::model::subnetworks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubnetworkAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubnetworkAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -16132,8 +16064,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn delete(
         &self,
         req: crate::model::subnetworks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -16141,8 +16073,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn expand_ip_cidr_range(
         &self,
         req: crate::model::subnetworks::ExpandIpCidrRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::expand_ip_cidr_range(self, req, options).await
     }
 
@@ -16150,8 +16082,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn get(
         &self,
         req: crate::model::subnetworks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Subnetwork>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Subnetwork>> {
         T::get(self, req, options).await
     }
 
@@ -16159,8 +16091,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::subnetworks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -16168,8 +16100,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn insert(
         &self,
         req: crate::model::subnetworks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -16177,8 +16109,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn list(
         &self,
         req: crate::model::subnetworks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SubnetworkList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SubnetworkList>> {
         T::list(self, req, options).await
     }
 
@@ -16186,8 +16118,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn list_usable(
         &self,
         req: crate::model::subnetworks::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UsableSubnetworksAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UsableSubnetworksAggregatedList>> {
         T::list_usable(self, req, options).await
     }
 
@@ -16195,8 +16127,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn patch(
         &self,
         req: crate::model::subnetworks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -16204,8 +16136,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::subnetworks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -16213,8 +16145,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn set_private_ip_google_access(
         &self,
         req: crate::model::subnetworks::SetPrivateIpGoogleAccessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_private_ip_google_access(self, req, options).await
     }
 
@@ -16222,8 +16154,8 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::subnetworks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -16231,22 +16163,22 @@ impl<T: super::Subnetworks> Subnetworks for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -16258,48 +16190,48 @@ pub trait TargetGrpcProxies: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::target_grpc_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_grpc_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetGrpcProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetGrpcProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::target_grpc_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_grpc_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetGrpcProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetGrpcProxyList>>;
 
     async fn patch(
         &self,
         req: crate::model::target_grpc_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetGrpcProxies] also implement [TargetGrpcProxies].
@@ -16310,8 +16242,8 @@ impl<T: super::TargetGrpcProxies> TargetGrpcProxies for T {
     async fn delete(
         &self,
         req: crate::model::target_grpc_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -16319,8 +16251,8 @@ impl<T: super::TargetGrpcProxies> TargetGrpcProxies for T {
     async fn get(
         &self,
         req: crate::model::target_grpc_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetGrpcProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetGrpcProxy>> {
         T::get(self, req, options).await
     }
 
@@ -16328,8 +16260,8 @@ impl<T: super::TargetGrpcProxies> TargetGrpcProxies for T {
     async fn insert(
         &self,
         req: crate::model::target_grpc_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -16337,8 +16269,8 @@ impl<T: super::TargetGrpcProxies> TargetGrpcProxies for T {
     async fn list(
         &self,
         req: crate::model::target_grpc_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetGrpcProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetGrpcProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -16346,8 +16278,8 @@ impl<T: super::TargetGrpcProxies> TargetGrpcProxies for T {
     async fn patch(
         &self,
         req: crate::model::target_grpc_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -16355,22 +16287,22 @@ impl<T: super::TargetGrpcProxies> TargetGrpcProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -16382,60 +16314,60 @@ pub trait TargetHttpProxies: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::target_http_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxyAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxyAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxyList>>;
 
     async fn patch(
         &self,
         req: crate::model::target_http_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_url_map(
         &self,
         req: crate::model::target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetHttpProxies] also implement [TargetHttpProxies].
@@ -16446,8 +16378,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::target_http_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxyAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -16455,8 +16387,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn delete(
         &self,
         req: crate::model::target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -16464,8 +16396,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn get(
         &self,
         req: crate::model::target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxy>> {
         T::get(self, req, options).await
     }
 
@@ -16473,8 +16405,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn insert(
         &self,
         req: crate::model::target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -16482,8 +16414,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn list(
         &self,
         req: crate::model::target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -16491,8 +16423,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn patch(
         &self,
         req: crate::model::target_http_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -16500,8 +16432,8 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn set_url_map(
         &self,
         req: crate::model::target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_url_map(self, req, options).await
     }
 
@@ -16509,22 +16441,22 @@ impl<T: super::TargetHttpProxies> TargetHttpProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -16536,84 +16468,84 @@ pub trait TargetHttpsProxies: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::target_https_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxyAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxyAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxyList>>;
 
     async fn patch(
         &self,
         req: crate::model::target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_certificate_map(
         &self,
         req: crate::model::target_https_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_quic_override(
         &self,
         req: crate::model::target_https_proxies::SetQuicOverrideRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_https_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_url_map(
         &self,
         req: crate::model::target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetHttpsProxies] also implement [TargetHttpsProxies].
@@ -16624,8 +16556,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::target_https_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxyAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -16633,8 +16565,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn delete(
         &self,
         req: crate::model::target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -16642,8 +16574,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn get(
         &self,
         req: crate::model::target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxy>> {
         T::get(self, req, options).await
     }
 
@@ -16651,8 +16583,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn insert(
         &self,
         req: crate::model::target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -16660,8 +16592,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn list(
         &self,
         req: crate::model::target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetHttpsProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetHttpsProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -16669,8 +16601,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn patch(
         &self,
         req: crate::model::target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -16678,8 +16610,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn set_certificate_map(
         &self,
         req: crate::model::target_https_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_certificate_map(self, req, options).await
     }
 
@@ -16687,8 +16619,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn set_quic_override(
         &self,
         req: crate::model::target_https_proxies::SetQuicOverrideRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_quic_override(self, req, options).await
     }
 
@@ -16696,8 +16628,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_ssl_certificates(self, req, options).await
     }
 
@@ -16705,8 +16637,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_https_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_ssl_policy(self, req, options).await
     }
 
@@ -16714,8 +16646,8 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn set_url_map(
         &self,
         req: crate::model::target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_url_map(self, req, options).await
     }
 
@@ -16723,22 +16655,22 @@ impl<T: super::TargetHttpsProxies> TargetHttpsProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -16750,60 +16682,60 @@ pub trait TargetInstances: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::target_instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetInstanceAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetInstanceAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::target_instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetInstance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetInstance>>;
 
     async fn insert(
         &self,
         req: crate::model::target_instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetInstanceList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetInstanceList>>;
 
     async fn set_security_policy(
         &self,
         req: crate::model::target_instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetInstances] also implement [TargetInstances].
@@ -16814,8 +16746,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn aggregated_list(
         &self,
         req: crate::model::target_instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetInstanceAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetInstanceAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -16823,8 +16755,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn delete(
         &self,
         req: crate::model::target_instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -16832,8 +16764,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn get(
         &self,
         req: crate::model::target_instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetInstance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetInstance>> {
         T::get(self, req, options).await
     }
 
@@ -16841,8 +16773,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn insert(
         &self,
         req: crate::model::target_instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -16850,8 +16782,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn list(
         &self,
         req: crate::model::target_instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetInstanceList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetInstanceList>> {
         T::list(self, req, options).await
     }
 
@@ -16859,8 +16791,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn set_security_policy(
         &self,
         req: crate::model::target_instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_security_policy(self, req, options).await
     }
 
@@ -16868,8 +16800,8 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -16877,22 +16809,22 @@ impl<T: super::TargetInstances> TargetInstances for T {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -16904,96 +16836,96 @@ pub trait TargetPools: std::fmt::Debug + Send + Sync {
     async fn add_health_check(
         &self,
         req: crate::model::target_pools::AddHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn add_instance(
         &self,
         req: crate::model::target_pools::AddInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn aggregated_list(
         &self,
         req: crate::model::target_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPoolAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPoolAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::target_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPool>>;
 
     async fn get_health(
         &self,
         req: crate::model::target_pools::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPoolInstanceHealth>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPoolInstanceHealth>>;
 
     async fn insert(
         &self,
         req: crate::model::target_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPoolList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPoolList>>;
 
     async fn remove_health_check(
         &self,
         req: crate::model::target_pools::RemoveHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn remove_instance(
         &self,
         req: crate::model::target_pools::RemoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_backup(
         &self,
         req: crate::model::target_pools::SetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_security_policy(
         &self,
         req: crate::model::target_pools::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetPools] also implement [TargetPools].
@@ -17004,8 +16936,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn add_health_check(
         &self,
         req: crate::model::target_pools::AddHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_health_check(self, req, options).await
     }
 
@@ -17013,8 +16945,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn add_instance(
         &self,
         req: crate::model::target_pools::AddInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::add_instance(self, req, options).await
     }
 
@@ -17022,8 +16954,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn aggregated_list(
         &self,
         req: crate::model::target_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPoolAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPoolAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -17031,8 +16963,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn delete(
         &self,
         req: crate::model::target_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -17040,8 +16972,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn get(
         &self,
         req: crate::model::target_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPool>> {
         T::get(self, req, options).await
     }
 
@@ -17049,8 +16981,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn get_health(
         &self,
         req: crate::model::target_pools::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPoolInstanceHealth>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPoolInstanceHealth>> {
         T::get_health(self, req, options).await
     }
 
@@ -17058,8 +16990,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn insert(
         &self,
         req: crate::model::target_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -17067,8 +16999,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn list(
         &self,
         req: crate::model::target_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetPoolList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetPoolList>> {
         T::list(self, req, options).await
     }
 
@@ -17076,8 +17008,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn remove_health_check(
         &self,
         req: crate::model::target_pools::RemoveHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_health_check(self, req, options).await
     }
 
@@ -17085,8 +17017,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn remove_instance(
         &self,
         req: crate::model::target_pools::RemoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::remove_instance(self, req, options).await
     }
 
@@ -17094,8 +17026,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn set_backup(
         &self,
         req: crate::model::target_pools::SetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_backup(self, req, options).await
     }
 
@@ -17103,8 +17035,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn set_security_policy(
         &self,
         req: crate::model::target_pools::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_security_policy(self, req, options).await
     }
 
@@ -17112,8 +17044,8 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -17121,22 +17053,22 @@ impl<T: super::TargetPools> TargetPools for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -17148,78 +17080,78 @@ pub trait TargetSslProxies: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::target_ssl_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_ssl_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetSslProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetSslProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::target_ssl_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_ssl_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetSslProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetSslProxyList>>;
 
     async fn set_backend_service(
         &self,
         req: crate::model::target_ssl_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_certificate_map(
         &self,
         req: crate::model::target_ssl_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_proxy_header(
         &self,
         req: crate::model::target_ssl_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_ssl_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_ssl_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_ssl_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetSslProxies] also implement [TargetSslProxies].
@@ -17230,8 +17162,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn delete(
         &self,
         req: crate::model::target_ssl_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -17239,8 +17171,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn get(
         &self,
         req: crate::model::target_ssl_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetSslProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetSslProxy>> {
         T::get(self, req, options).await
     }
 
@@ -17248,8 +17180,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn insert(
         &self,
         req: crate::model::target_ssl_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -17257,8 +17189,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn list(
         &self,
         req: crate::model::target_ssl_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetSslProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetSslProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -17266,8 +17198,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn set_backend_service(
         &self,
         req: crate::model::target_ssl_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_backend_service(self, req, options).await
     }
 
@@ -17275,8 +17207,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn set_certificate_map(
         &self,
         req: crate::model::target_ssl_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_certificate_map(self, req, options).await
     }
 
@@ -17284,8 +17216,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn set_proxy_header(
         &self,
         req: crate::model::target_ssl_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_proxy_header(self, req, options).await
     }
 
@@ -17293,8 +17225,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_ssl_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_ssl_certificates(self, req, options).await
     }
 
@@ -17302,8 +17234,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_ssl_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_ssl_policy(self, req, options).await
     }
 
@@ -17311,8 +17243,8 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_ssl_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -17320,22 +17252,22 @@ impl<T: super::TargetSslProxies> TargetSslProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -17347,66 +17279,66 @@ pub trait TargetTcpProxies: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::target_tcp_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxyAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxyAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxy>>;
 
     async fn insert(
         &self,
         req: crate::model::target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxyList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxyList>>;
 
     async fn set_backend_service(
         &self,
         req: crate::model::target_tcp_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_proxy_header(
         &self,
         req: crate::model::target_tcp_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_tcp_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetTcpProxies] also implement [TargetTcpProxies].
@@ -17417,8 +17349,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn aggregated_list(
         &self,
         req: crate::model::target_tcp_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxyAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -17426,8 +17358,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn delete(
         &self,
         req: crate::model::target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -17435,8 +17367,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn get(
         &self,
         req: crate::model::target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxy>> {
         T::get(self, req, options).await
     }
 
@@ -17444,8 +17376,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn insert(
         &self,
         req: crate::model::target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -17453,8 +17385,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn list(
         &self,
         req: crate::model::target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetTcpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetTcpProxyList>> {
         T::list(self, req, options).await
     }
 
@@ -17462,8 +17394,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn set_backend_service(
         &self,
         req: crate::model::target_tcp_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_backend_service(self, req, options).await
     }
 
@@ -17471,8 +17403,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn set_proxy_header(
         &self,
         req: crate::model::target_tcp_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_proxy_header(self, req, options).await
     }
 
@@ -17480,8 +17412,8 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_tcp_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -17489,22 +17421,22 @@ impl<T: super::TargetTcpProxies> TargetTcpProxies for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -17516,54 +17448,54 @@ pub trait TargetVpnGateways: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::target_vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetVpnGatewayAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetVpnGatewayAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::target_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::target_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetVpnGateway>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetVpnGateway>>;
 
     async fn insert(
         &self,
         req: crate::model::target_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::target_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetVpnGatewayList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetVpnGatewayList>>;
 
     async fn set_labels(
         &self,
         req: crate::model::target_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TargetVpnGateways] also implement [TargetVpnGateways].
@@ -17574,8 +17506,8 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn aggregated_list(
         &self,
         req: crate::model::target_vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetVpnGatewayAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetVpnGatewayAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -17583,8 +17515,8 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn delete(
         &self,
         req: crate::model::target_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -17592,8 +17524,8 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn get(
         &self,
         req: crate::model::target_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetVpnGateway>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetVpnGateway>> {
         T::get(self, req, options).await
     }
 
@@ -17601,8 +17533,8 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn insert(
         &self,
         req: crate::model::target_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -17610,8 +17542,8 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn list(
         &self,
         req: crate::model::target_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetVpnGatewayList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetVpnGatewayList>> {
         T::list(self, req, options).await
     }
 
@@ -17619,8 +17551,8 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn set_labels(
         &self,
         req: crate::model::target_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -17628,22 +17560,22 @@ impl<T: super::TargetVpnGateways> TargetVpnGateways for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -17655,78 +17587,78 @@ pub trait UrlMaps: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::url_maps::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapsAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapsAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMap>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMap>>;
 
     async fn insert(
         &self,
         req: crate::model::url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn invalidate_cache(
         &self,
         req: crate::model::url_maps::InvalidateCacheRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapList>>;
 
     async fn patch(
         &self,
         req: crate::model::url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::url_maps::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn validate(
         &self,
         req: crate::model::url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapsValidateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapsValidateResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::UrlMaps] also implement [UrlMaps].
@@ -17737,8 +17669,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn aggregated_list(
         &self,
         req: crate::model::url_maps::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapsAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapsAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -17746,8 +17678,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn delete(
         &self,
         req: crate::model::url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -17755,8 +17687,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn get(
         &self,
         req: crate::model::url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMap>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMap>> {
         T::get(self, req, options).await
     }
 
@@ -17764,8 +17696,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn insert(
         &self,
         req: crate::model::url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -17773,8 +17705,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn invalidate_cache(
         &self,
         req: crate::model::url_maps::InvalidateCacheRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::invalidate_cache(self, req, options).await
     }
 
@@ -17782,8 +17714,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn list(
         &self,
         req: crate::model::url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapList>> {
         T::list(self, req, options).await
     }
 
@@ -17791,8 +17723,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn patch(
         &self,
         req: crate::model::url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -17800,8 +17732,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::url_maps::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -17809,8 +17741,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn update(
         &self,
         req: crate::model::url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -17818,8 +17750,8 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn validate(
         &self,
         req: crate::model::url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UrlMapsValidateResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UrlMapsValidateResponse>> {
         T::validate(self, req, options).await
     }
 
@@ -17827,22 +17759,22 @@ impl<T: super::UrlMaps> UrlMaps for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -17854,66 +17786,66 @@ pub trait VpnGateways: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGatewayAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGatewayAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGateway>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGateway>>;
 
     async fn get_status(
         &self,
         req: crate::model::vpn_gateways::GetStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGatewaysGetStatusResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGatewaysGetStatusResponse>>;
 
     async fn insert(
         &self,
         req: crate::model::vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGatewayList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGatewayList>>;
 
     async fn set_labels(
         &self,
         req: crate::model::vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::VpnGateways] also implement [VpnGateways].
@@ -17924,8 +17856,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGatewayAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGatewayAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -17933,8 +17865,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn delete(
         &self,
         req: crate::model::vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -17942,8 +17874,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn get(
         &self,
         req: crate::model::vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGateway>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGateway>> {
         T::get(self, req, options).await
     }
 
@@ -17951,8 +17883,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn get_status(
         &self,
         req: crate::model::vpn_gateways::GetStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGatewaysGetStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGatewaysGetStatusResponse>> {
         T::get_status(self, req, options).await
     }
 
@@ -17960,8 +17892,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn insert(
         &self,
         req: crate::model::vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -17969,8 +17901,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn list(
         &self,
         req: crate::model::vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnGatewayList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnGatewayList>> {
         T::list(self, req, options).await
     }
 
@@ -17978,8 +17910,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn set_labels(
         &self,
         req: crate::model::vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -17987,8 +17919,8 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -17996,22 +17928,22 @@ impl<T: super::VpnGateways> VpnGateways for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -18023,54 +17955,54 @@ pub trait VpnTunnels: std::fmt::Debug + Send + Sync {
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_tunnels::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnTunnelAggregatedList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnTunnelAggregatedList>>;
 
     async fn delete(
         &self,
         req: crate::model::vpn_tunnels::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::vpn_tunnels::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnTunnel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnTunnel>>;
 
     async fn insert(
         &self,
         req: crate::model::vpn_tunnels::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::vpn_tunnels::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnTunnelList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnTunnelList>>;
 
     async fn set_labels(
         &self,
         req: crate::model::vpn_tunnels::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::VpnTunnels] also implement [VpnTunnels].
@@ -18081,8 +18013,8 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_tunnels::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnTunnelAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnTunnelAggregatedList>> {
         T::aggregated_list(self, req, options).await
     }
 
@@ -18090,8 +18022,8 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn delete(
         &self,
         req: crate::model::vpn_tunnels::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -18099,8 +18031,8 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn get(
         &self,
         req: crate::model::vpn_tunnels::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnTunnel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnTunnel>> {
         T::get(self, req, options).await
     }
 
@@ -18108,8 +18040,8 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn insert(
         &self,
         req: crate::model::vpn_tunnels::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -18117,8 +18049,8 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn list(
         &self,
         req: crate::model::vpn_tunnels::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnTunnelList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnTunnelList>> {
         T::list(self, req, options).await
     }
 
@@ -18126,8 +18058,8 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn set_labels(
         &self,
         req: crate::model::vpn_tunnels::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::set_labels(self, req, options).await
     }
 
@@ -18135,22 +18067,22 @@ impl<T: super::VpnTunnels> VpnTunnels for T {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -18162,48 +18094,48 @@ pub trait WireGroups: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::wire_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get(
         &self,
         req: crate::model::wire_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WireGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WireGroup>>;
 
     async fn insert(
         &self,
         req: crate::model::wire_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::wire_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WireGroupList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WireGroupList>>;
 
     async fn patch(
         &self,
         req: crate::model::wire_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::WireGroups] also implement [WireGroups].
@@ -18214,8 +18146,8 @@ impl<T: super::WireGroups> WireGroups for T {
     async fn delete(
         &self,
         req: crate::model::wire_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::delete(self, req, options).await
     }
 
@@ -18223,8 +18155,8 @@ impl<T: super::WireGroups> WireGroups for T {
     async fn get(
         &self,
         req: crate::model::wire_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WireGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WireGroup>> {
         T::get(self, req, options).await
     }
 
@@ -18232,8 +18164,8 @@ impl<T: super::WireGroups> WireGroups for T {
     async fn insert(
         &self,
         req: crate::model::wire_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::insert(self, req, options).await
     }
 
@@ -18241,8 +18173,8 @@ impl<T: super::WireGroups> WireGroups for T {
     async fn list(
         &self,
         req: crate::model::wire_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WireGroupList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WireGroupList>> {
         T::list(self, req, options).await
     }
 
@@ -18250,8 +18182,8 @@ impl<T: super::WireGroups> WireGroups for T {
     async fn patch(
         &self,
         req: crate::model::wire_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -18259,22 +18191,22 @@ impl<T: super::WireGroups> WireGroups for T {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -18286,26 +18218,26 @@ pub trait ZoneOperations: std::fmt::Debug + Send + Sync {
     async fn delete(
         &self,
         req: crate::model::zone_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>>;
 
     async fn wait(
         &self,
         req: crate::model::zone_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 }
 
 /// All implementations of [super::ZoneOperations] also implement [ZoneOperations].
@@ -18316,8 +18248,8 @@ impl<T: super::ZoneOperations> ZoneOperations for T {
     async fn delete(
         &self,
         req: crate::model::zone_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -18325,8 +18257,8 @@ impl<T: super::ZoneOperations> ZoneOperations for T {
     async fn get(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get(self, req, options).await
     }
 
@@ -18334,8 +18266,8 @@ impl<T: super::ZoneOperations> ZoneOperations for T {
     async fn list(
         &self,
         req: crate::model::zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OperationList>> {
         T::list(self, req, options).await
     }
 
@@ -18343,8 +18275,8 @@ impl<T: super::ZoneOperations> ZoneOperations for T {
     async fn wait(
         &self,
         req: crate::model::zone_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::wait(self, req, options).await
     }
 }
@@ -18356,14 +18288,14 @@ pub trait Zones: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Zone>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Zone>>;
 
     async fn list(
         &self,
         req: crate::model::zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ZoneList>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ZoneList>>;
 }
 
 /// All implementations of [super::Zones] also implement [Zones].
@@ -18374,8 +18306,8 @@ impl<T: super::Zones> Zones for T {
     async fn get(
         &self,
         req: crate::model::zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Zone>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Zone>> {
         T::get(self, req, options).await
     }
 
@@ -18383,8 +18315,8 @@ impl<T: super::Zones> Zones for T {
     async fn list(
         &self,
         req: crate::model::zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ZoneList>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ZoneList>> {
         T::list(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/compute/v1/src/tracing.rs b/src/generated/cloud/compute/v1/src/tracing.rs
index 1da0ba8cb7..3c3e849042 100644
--- a/src/generated/cloud/compute/v1/src/tracing.rs
+++ b/src/generated/cloud/compute/v1/src/tracing.rs
@@ -158,8 +158,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::accelerator_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AcceleratorTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AcceleratorTypeAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get(
         &self,
         req: crate::model::accelerator_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AcceleratorType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AcceleratorType>> {
         self.inner.get(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn list(
         &self,
         req: crate::model::accelerator_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AcceleratorTypeList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AcceleratorTypeList>> {
         self.inner.list(req, options).await
     }
 }
@@ -211,8 +211,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::addresses::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddressAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddressAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -220,8 +220,8 @@ where
     async fn delete(
         &self,
         req: crate::model::addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -229,8 +229,8 @@ where
     async fn get(
         &self,
         req: crate::model::addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Address>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Address>> {
         self.inner.get(req, options).await
     }
 
@@ -238,8 +238,8 @@ where
     async fn insert(
         &self,
         req: crate::model::addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -247,8 +247,8 @@ where
     async fn list(
         &self,
         req: crate::model::addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddressList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddressList>> {
         self.inner.list(req, options).await
     }
 
@@ -256,8 +256,8 @@ where
     async fn r#move(
         &self,
         req: crate::model::addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.r#move(req, options).await
     }
 
@@ -265,8 +265,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -274,8 +274,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -283,22 +283,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -332,8 +332,8 @@ where
     async fn calendar_mode(
         &self,
         req: crate::model::advice::CalendarModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalendarModeAdviceResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalendarModeAdviceResponse>> {
         self.inner.calendar_mode(req, options).await
     }
 }
@@ -367,8 +367,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::autoscalers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalerAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalerAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -376,8 +376,8 @@ where
     async fn delete(
         &self,
         req: crate::model::autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -385,8 +385,8 @@ where
     async fn get(
         &self,
         req: crate::model::autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Autoscaler>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Autoscaler>> {
         self.inner.get(req, options).await
     }
 
@@ -394,8 +394,8 @@ where
     async fn insert(
         &self,
         req: crate::model::autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -403,8 +403,8 @@ where
     async fn list(
         &self,
         req: crate::model::autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalerList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalerList>> {
         self.inner.list(req, options).await
     }
 
@@ -412,8 +412,8 @@ where
     async fn patch(
         &self,
         req: crate::model::autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -421,8 +421,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -430,8 +430,8 @@ where
     async fn update(
         &self,
         req: crate::model::autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -439,22 +439,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -488,8 +488,8 @@ where
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_buckets::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_signed_url_key(req, options).await
     }
 
@@ -497,8 +497,8 @@ where
     async fn delete(
         &self,
         req: crate::model::backend_buckets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -506,8 +506,8 @@ where
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_buckets::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_signed_url_key(req, options).await
     }
 
@@ -515,8 +515,8 @@ where
     async fn get(
         &self,
         req: crate::model::backend_buckets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendBucket>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendBucket>> {
         self.inner.get(req, options).await
     }
 
@@ -524,8 +524,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_buckets::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -533,8 +533,8 @@ where
     async fn insert(
         &self,
         req: crate::model::backend_buckets::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -542,8 +542,8 @@ where
     async fn list(
         &self,
         req: crate::model::backend_buckets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendBucketList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendBucketList>> {
         self.inner.list(req, options).await
     }
 
@@ -551,8 +551,8 @@ where
     async fn patch(
         &self,
         req: crate::model::backend_buckets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -560,8 +560,8 @@ where
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_buckets::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_edge_security_policy(req, options).await
     }
 
@@ -569,8 +569,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_buckets::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -578,8 +578,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_buckets::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -587,8 +587,8 @@ where
     async fn update(
         &self,
         req: crate::model::backend_buckets::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -596,22 +596,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -645,8 +645,8 @@ where
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_services::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_signed_url_key(req, options).await
     }
 
@@ -654,8 +654,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::backend_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -663,8 +663,8 @@ where
     async fn delete(
         &self,
         req: crate::model::backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -672,8 +672,8 @@ where
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_services::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_signed_url_key(req, options).await
     }
 
@@ -681,8 +681,8 @@ where
     async fn get(
         &self,
         req: crate::model::backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendService>> {
         self.inner.get(req, options).await
     }
 
@@ -690,8 +690,8 @@ where
     async fn get_effective_security_policies(
         &self,
         req: crate::model::backend_services::GetEffectiveSecurityPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .get_effective_security_policies(req, options)
             .await
@@ -701,8 +701,8 @@ where
     async fn get_health(
         &self,
         req: crate::model::backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceGroupHealth>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceGroupHealth>> {
         self.inner.get_health(req, options).await
     }
 
@@ -710,8 +710,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -719,8 +719,8 @@ where
     async fn insert(
         &self,
         req: crate::model::backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -728,8 +728,8 @@ where
     async fn list(
         &self,
         req: crate::model::backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceList>> {
         self.inner.list(req, options).await
     }
 
@@ -737,8 +737,8 @@ where
     async fn list_usable(
         &self,
         req: crate::model::backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceListUsable>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceListUsable>> {
         self.inner.list_usable(req, options).await
     }
 
@@ -746,8 +746,8 @@ where
     async fn patch(
         &self,
         req: crate::model::backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -755,8 +755,8 @@ where
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_services::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_edge_security_policy(req, options).await
     }
 
@@ -764,8 +764,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -773,8 +773,8 @@ where
     async fn set_security_policy(
         &self,
         req: crate::model::backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_security_policy(req, options).await
     }
 
@@ -782,8 +782,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -791,8 +791,8 @@ where
     async fn update(
         &self,
         req: crate::model::backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -800,22 +800,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -849,8 +849,8 @@ where
     async fn delete(
         &self,
         req: crate::model::cross_site_networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -858,8 +858,8 @@ where
     async fn get(
         &self,
         req: crate::model::cross_site_networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CrossSiteNetwork>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CrossSiteNetwork>> {
         self.inner.get(req, options).await
     }
 
@@ -867,8 +867,8 @@ where
     async fn insert(
         &self,
         req: crate::model::cross_site_networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -876,8 +876,8 @@ where
     async fn list(
         &self,
         req: crate::model::cross_site_networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CrossSiteNetworkList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CrossSiteNetworkList>> {
         self.inner.list(req, options).await
     }
 
@@ -885,8 +885,8 @@ where
     async fn patch(
         &self,
         req: crate::model::cross_site_networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -894,22 +894,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -943,8 +943,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::disk_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskTypeAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -952,8 +952,8 @@ where
     async fn get(
         &self,
         req: crate::model::disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskType>> {
         self.inner.get(req, options).await
     }
 
@@ -961,8 +961,8 @@ where
     async fn list(
         &self,
         req: crate::model::disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskTypeList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskTypeList>> {
         self.inner.list(req, options).await
     }
 }
@@ -996,8 +996,8 @@ where
     async fn add_resource_policies(
         &self,
         req: crate::model::disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_resource_policies(req, options).await
     }
 
@@ -1005,8 +1005,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::disks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -1014,8 +1014,8 @@ where
     async fn bulk_insert(
         &self,
         req: crate::model::disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.bulk_insert(req, options).await
     }
 
@@ -1023,8 +1023,8 @@ where
     async fn bulk_set_labels(
         &self,
         req: crate::model::disks::BulkSetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.bulk_set_labels(req, options).await
     }
 
@@ -1032,8 +1032,8 @@ where
     async fn create_snapshot(
         &self,
         req: crate::model::disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.create_snapshot(req, options).await
     }
 
@@ -1041,8 +1041,8 @@ where
     async fn delete(
         &self,
         req: crate::model::disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1050,8 +1050,8 @@ where
     async fn get(
         &self,
         req: crate::model::disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Disk>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Disk>> {
         self.inner.get(req, options).await
     }
 
@@ -1059,8 +1059,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1068,8 +1068,8 @@ where
     async fn insert(
         &self,
         req: crate::model::disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1077,8 +1077,8 @@ where
     async fn list(
         &self,
         req: crate::model::disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskList>> {
         self.inner.list(req, options).await
     }
 
@@ -1086,8 +1086,8 @@ where
     async fn remove_resource_policies(
         &self,
         req: crate::model::disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_resource_policies(req, options).await
     }
 
@@ -1095,8 +1095,8 @@ where
     async fn resize(
         &self,
         req: crate::model::disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resize(req, options).await
     }
 
@@ -1104,8 +1104,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1113,8 +1113,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -1122,8 +1122,8 @@ where
     async fn start_async_replication(
         &self,
         req: crate::model::disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.start_async_replication(req, options).await
     }
 
@@ -1131,8 +1131,8 @@ where
     async fn stop_async_replication(
         &self,
         req: crate::model::disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop_async_replication(req, options).await
     }
 
@@ -1140,8 +1140,8 @@ where
     async fn stop_group_async_replication(
         &self,
         req: crate::model::disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop_group_async_replication(req, options).await
     }
 
@@ -1149,8 +1149,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1158,8 +1158,8 @@ where
     async fn update(
         &self,
         req: crate::model::disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -1167,22 +1167,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1216,8 +1216,8 @@ where
     async fn delete(
         &self,
         req: crate::model::external_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1225,8 +1225,8 @@ where
     async fn get(
         &self,
         req: crate::model::external_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalVpnGateway>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalVpnGateway>> {
         self.inner.get(req, options).await
     }
 
@@ -1234,8 +1234,8 @@ where
     async fn insert(
         &self,
         req: crate::model::external_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1243,8 +1243,8 @@ where
     async fn list(
         &self,
         req: crate::model::external_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalVpnGatewayList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalVpnGatewayList>> {
         self.inner.list(req, options).await
     }
 
@@ -1252,8 +1252,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::external_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -1261,8 +1261,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::external_vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1270,22 +1270,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1319,8 +1319,8 @@ where
     async fn add_association(
         &self,
         req: crate::model::firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_association(req, options).await
     }
 
@@ -1328,8 +1328,8 @@ where
     async fn add_rule(
         &self,
         req: crate::model::firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_rule(req, options).await
     }
 
@@ -1337,8 +1337,8 @@ where
     async fn clone_rules(
         &self,
         req: crate::model::firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.clone_rules(req, options).await
     }
 
@@ -1346,8 +1346,8 @@ where
     async fn delete(
         &self,
         req: crate::model::firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1355,8 +1355,8 @@ where
     async fn get(
         &self,
         req: crate::model::firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -1364,8 +1364,8 @@ where
     async fn get_association(
         &self,
         req: crate::model::firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         self.inner.get_association(req, options).await
     }
 
@@ -1373,8 +1373,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1382,8 +1382,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -1391,8 +1391,8 @@ where
     async fn insert(
         &self,
         req: crate::model::firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1400,8 +1400,8 @@ where
     async fn list(
         &self,
         req: crate::model::firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -1409,9 +1409,8 @@ where
     async fn list_associations(
         &self,
         req: crate::model::firewall_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPoliciesListAssociationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPoliciesListAssociationsResponse>> {
         self.inner.list_associations(req, options).await
     }
 
@@ -1419,8 +1418,8 @@ where
     async fn r#move(
         &self,
         req: crate::model::firewall_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.r#move(req, options).await
     }
 
@@ -1428,8 +1427,8 @@ where
     async fn patch(
         &self,
         req: crate::model::firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -1437,8 +1436,8 @@ where
     async fn patch_rule(
         &self,
         req: crate::model::firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_rule(req, options).await
     }
 
@@ -1446,8 +1445,8 @@ where
     async fn remove_association(
         &self,
         req: crate::model::firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_association(req, options).await
     }
 
@@ -1455,8 +1454,8 @@ where
     async fn remove_rule(
         &self,
         req: crate::model::firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_rule(req, options).await
     }
 
@@ -1464,8 +1463,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1473,8 +1472,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1482,22 +1481,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1531,8 +1530,8 @@ where
     async fn delete(
         &self,
         req: crate::model::firewalls::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1540,8 +1539,8 @@ where
     async fn get(
         &self,
         req: crate::model::firewalls::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Firewall>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Firewall>> {
         self.inner.get(req, options).await
     }
 
@@ -1549,8 +1548,8 @@ where
     async fn insert(
         &self,
         req: crate::model::firewalls::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1558,8 +1557,8 @@ where
     async fn list(
         &self,
         req: crate::model::firewalls::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallList>> {
         self.inner.list(req, options).await
     }
 
@@ -1567,8 +1566,8 @@ where
     async fn patch(
         &self,
         req: crate::model::firewalls::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -1576,8 +1575,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewalls::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1585,8 +1584,8 @@ where
     async fn update(
         &self,
         req: crate::model::firewalls::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -1594,22 +1593,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1643,8 +1642,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::forwarding_rules::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRuleAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRuleAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -1652,8 +1651,8 @@ where
     async fn delete(
         &self,
         req: crate::model::forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1661,8 +1660,8 @@ where
     async fn get(
         &self,
         req: crate::model::forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRule>> {
         self.inner.get(req, options).await
     }
 
@@ -1670,8 +1669,8 @@ where
     async fn insert(
         &self,
         req: crate::model::forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1679,8 +1678,8 @@ where
     async fn list(
         &self,
         req: crate::model::forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRuleList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRuleList>> {
         self.inner.list(req, options).await
     }
 
@@ -1688,8 +1687,8 @@ where
     async fn patch(
         &self,
         req: crate::model::forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -1697,8 +1696,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -1706,8 +1705,8 @@ where
     async fn set_target(
         &self,
         req: crate::model::forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_target(req, options).await
     }
 
@@ -1715,22 +1714,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1764,9 +1763,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::future_reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FutureReservationsAggregatedListResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FutureReservationsAggregatedListResponse>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -1774,8 +1772,8 @@ where
     async fn cancel(
         &self,
         req: crate::model::future_reservations::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.cancel(req, options).await
     }
 
@@ -1783,8 +1781,8 @@ where
     async fn delete(
         &self,
         req: crate::model::future_reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1792,8 +1790,8 @@ where
     async fn get(
         &self,
         req: crate::model::future_reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FutureReservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FutureReservation>> {
         self.inner.get(req, options).await
     }
 
@@ -1801,8 +1799,8 @@ where
     async fn insert(
         &self,
         req: crate::model::future_reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1810,8 +1808,8 @@ where
     async fn list(
         &self,
         req: crate::model::future_reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FutureReservationsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FutureReservationsListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -1819,8 +1817,8 @@ where
     async fn update(
         &self,
         req: crate::model::future_reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -1828,22 +1826,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1877,8 +1875,8 @@ where
     async fn delete(
         &self,
         req: crate::model::global_addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1886,8 +1884,8 @@ where
     async fn get(
         &self,
         req: crate::model::global_addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Address>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Address>> {
         self.inner.get(req, options).await
     }
 
@@ -1895,8 +1893,8 @@ where
     async fn insert(
         &self,
         req: crate::model::global_addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -1904,8 +1902,8 @@ where
     async fn list(
         &self,
         req: crate::model::global_addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddressList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddressList>> {
         self.inner.list(req, options).await
     }
 
@@ -1913,8 +1911,8 @@ where
     async fn r#move(
         &self,
         req: crate::model::global_addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.r#move(req, options).await
     }
 
@@ -1922,8 +1920,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::global_addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -1931,8 +1929,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::global_addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1940,22 +1938,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1989,8 +1987,8 @@ where
     async fn delete(
         &self,
         req: crate::model::global_forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -1998,8 +1996,8 @@ where
     async fn get(
         &self,
         req: crate::model::global_forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRule>> {
         self.inner.get(req, options).await
     }
 
@@ -2007,8 +2005,8 @@ where
     async fn insert(
         &self,
         req: crate::model::global_forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2016,8 +2014,8 @@ where
     async fn list(
         &self,
         req: crate::model::global_forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRuleList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRuleList>> {
         self.inner.list(req, options).await
     }
 
@@ -2025,8 +2023,8 @@ where
     async fn patch(
         &self,
         req: crate::model::global_forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -2034,8 +2032,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::global_forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -2043,8 +2041,8 @@ where
     async fn set_target(
         &self,
         req: crate::model::global_forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_target(req, options).await
     }
 
@@ -2052,22 +2050,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2101,8 +2099,8 @@ where
     async fn attach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.attach_network_endpoints(req, options).await
     }
 
@@ -2110,8 +2108,8 @@ where
     async fn delete(
         &self,
         req: crate::model::global_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2119,8 +2117,8 @@ where
     async fn detach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.detach_network_endpoints(req, options).await
     }
 
@@ -2128,8 +2126,8 @@ where
     async fn get(
         &self,
         req: crate::model::global_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -2137,8 +2135,8 @@ where
     async fn insert(
         &self,
         req: crate::model::global_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2146,8 +2144,8 @@ where
     async fn list(
         &self,
         req: crate::model::global_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -2155,9 +2153,8 @@ where
     async fn list_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>> {
         self.inner.list_network_endpoints(req, options).await
     }
 
@@ -2165,22 +2162,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2214,8 +2211,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::global_operations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -2223,8 +2220,8 @@ where
     async fn delete(
         &self,
         req: crate::model::global_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -2232,8 +2229,8 @@ where
     async fn get(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get(req, options).await
     }
 
@@ -2241,8 +2238,8 @@ where
     async fn list(
         &self,
         req: crate::model::global_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         self.inner.list(req, options).await
     }
 
@@ -2250,8 +2247,8 @@ where
     async fn wait(
         &self,
         req: crate::model::global_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.wait(req, options).await
     }
 }
@@ -2285,8 +2282,8 @@ where
     async fn delete(
         &self,
         req: crate::model::global_organization_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -2294,8 +2291,8 @@ where
     async fn get(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get(req, options).await
     }
 
@@ -2303,8 +2300,8 @@ where
     async fn list(
         &self,
         req: crate::model::global_organization_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         self.inner.list(req, options).await
     }
 }
@@ -2338,8 +2335,8 @@ where
     async fn delete(
         &self,
         req: crate::model::global_public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2347,8 +2344,8 @@ where
     async fn get(
         &self,
         req: crate::model::global_public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefix>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefix>> {
         self.inner.get(req, options).await
     }
 
@@ -2356,8 +2353,8 @@ where
     async fn insert(
         &self,
         req: crate::model::global_public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2365,8 +2362,8 @@ where
     async fn list(
         &self,
         req: crate::model::global_public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefixList>> {
         self.inner.list(req, options).await
     }
 
@@ -2374,8 +2371,8 @@ where
     async fn patch(
         &self,
         req: crate::model::global_public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -2383,22 +2380,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2432,8 +2429,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::health_checks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthChecksAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthChecksAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -2441,8 +2438,8 @@ where
     async fn delete(
         &self,
         req: crate::model::health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2450,8 +2447,8 @@ where
     async fn get(
         &self,
         req: crate::model::health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheck>> {
         self.inner.get(req, options).await
     }
 
@@ -2459,8 +2456,8 @@ where
     async fn insert(
         &self,
         req: crate::model::health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2468,8 +2465,8 @@ where
     async fn list(
         &self,
         req: crate::model::health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckList>> {
         self.inner.list(req, options).await
     }
 
@@ -2477,8 +2474,8 @@ where
     async fn patch(
         &self,
         req: crate::model::health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -2486,8 +2483,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2495,8 +2492,8 @@ where
     async fn update(
         &self,
         req: crate::model::health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -2504,22 +2501,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2553,8 +2550,8 @@ where
     async fn delete(
         &self,
         req: crate::model::http_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2562,8 +2559,8 @@ where
     async fn get(
         &self,
         req: crate::model::http_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpHealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpHealthCheck>> {
         self.inner.get(req, options).await
     }
 
@@ -2571,8 +2568,8 @@ where
     async fn insert(
         &self,
         req: crate::model::http_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2580,8 +2577,8 @@ where
     async fn list(
         &self,
         req: crate::model::http_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpHealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpHealthCheckList>> {
         self.inner.list(req, options).await
     }
 
@@ -2589,8 +2586,8 @@ where
     async fn patch(
         &self,
         req: crate::model::http_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -2598,8 +2595,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::http_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2607,8 +2604,8 @@ where
     async fn update(
         &self,
         req: crate::model::http_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -2616,22 +2613,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2665,8 +2662,8 @@ where
     async fn delete(
         &self,
         req: crate::model::https_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2674,8 +2671,8 @@ where
     async fn get(
         &self,
         req: crate::model::https_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpsHealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpsHealthCheck>> {
         self.inner.get(req, options).await
     }
 
@@ -2683,8 +2680,8 @@ where
     async fn insert(
         &self,
         req: crate::model::https_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2692,8 +2689,8 @@ where
     async fn list(
         &self,
         req: crate::model::https_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpsHealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpsHealthCheckList>> {
         self.inner.list(req, options).await
     }
 
@@ -2701,8 +2698,8 @@ where
     async fn patch(
         &self,
         req: crate::model::https_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -2710,8 +2707,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::https_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2719,8 +2716,8 @@ where
     async fn update(
         &self,
         req: crate::model::https_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -2728,22 +2725,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2777,8 +2774,8 @@ where
     async fn get(
         &self,
         req: crate::model::image_family_views::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImageFamilyView>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImageFamilyView>> {
         self.inner.get(req, options).await
     }
 }
@@ -2812,8 +2809,8 @@ where
     async fn delete(
         &self,
         req: crate::model::images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2821,8 +2818,8 @@ where
     async fn deprecate(
         &self,
         req: crate::model::images::DeprecateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.deprecate(req, options).await
     }
 
@@ -2830,8 +2827,8 @@ where
     async fn get(
         &self,
         req: crate::model::images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Image>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Image>> {
         self.inner.get(req, options).await
     }
 
@@ -2839,8 +2836,8 @@ where
     async fn get_from_family(
         &self,
         req: crate::model::images::GetFromFamilyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Image>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Image>> {
         self.inner.get_from_family(req, options).await
     }
 
@@ -2848,8 +2845,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -2857,8 +2854,8 @@ where
     async fn insert(
         &self,
         req: crate::model::images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2866,8 +2863,8 @@ where
     async fn list(
         &self,
         req: crate::model::images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImageList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImageList>> {
         self.inner.list(req, options).await
     }
 
@@ -2875,8 +2872,8 @@ where
     async fn patch(
         &self,
         req: crate::model::images::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -2884,8 +2881,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -2893,8 +2890,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -2902,8 +2899,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -2911,22 +2908,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2960,8 +2957,8 @@ where
     async fn cancel(
         &self,
         req: crate::model::instance_group_manager_resize_requests::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.cancel(req, options).await
     }
 
@@ -2969,8 +2966,8 @@ where
     async fn delete(
         &self,
         req: crate::model::instance_group_manager_resize_requests::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -2978,8 +2975,8 @@ where
     async fn get(
         &self,
         req: crate::model::instance_group_manager_resize_requests::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerResizeRequest>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerResizeRequest>> {
         self.inner.get(req, options).await
     }
 
@@ -2987,8 +2984,8 @@ where
     async fn insert(
         &self,
         req: crate::model::instance_group_manager_resize_requests::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -2996,9 +2993,8 @@ where
     async fn list(
         &self,
         req: crate::model::instance_group_manager_resize_requests::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -3006,22 +3002,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3055,8 +3051,8 @@ where
     async fn abandon_instances(
         &self,
         req: crate::model::instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.abandon_instances(req, options).await
     }
 
@@ -3064,8 +3060,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::instance_group_managers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -3073,8 +3069,8 @@ where
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.apply_updates_to_instances(req, options).await
     }
 
@@ -3082,8 +3078,8 @@ where
     async fn create_instances(
         &self,
         req: crate::model::instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.create_instances(req, options).await
     }
 
@@ -3091,8 +3087,8 @@ where
     async fn delete(
         &self,
         req: crate::model::instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -3100,8 +3096,8 @@ where
     async fn delete_instances(
         &self,
         req: crate::model::instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_instances(req, options).await
     }
 
@@ -3109,8 +3105,8 @@ where
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_per_instance_configs(req, options).await
     }
 
@@ -3118,8 +3114,8 @@ where
     async fn get(
         &self,
         req: crate::model::instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManager>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManager>> {
         self.inner.get(req, options).await
     }
 
@@ -3127,8 +3123,8 @@ where
     async fn insert(
         &self,
         req: crate::model::instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -3136,8 +3132,8 @@ where
     async fn list(
         &self,
         req: crate::model::instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerList>> {
         self.inner.list(req, options).await
     }
 
@@ -3145,9 +3141,8 @@ where
     async fn list_errors(
         &self,
         req: crate::model::instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagersListErrorsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagersListErrorsResponse>> {
         self.inner.list_errors(req, options).await
     }
 
@@ -3155,10 +3150,9 @@ where
     async fn list_managed_instances(
         &self,
         req: crate::model::instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>>
+    {
         self.inner.list_managed_instances(req, options).await
     }
 
@@ -3166,10 +3160,9 @@ where
     async fn list_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>>
+    {
         self.inner.list_per_instance_configs(req, options).await
     }
 
@@ -3177,8 +3170,8 @@ where
     async fn patch(
         &self,
         req: crate::model::instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -3186,8 +3179,8 @@ where
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_per_instance_configs(req, options).await
     }
 
@@ -3195,8 +3188,8 @@ where
     async fn recreate_instances(
         &self,
         req: crate::model::instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.recreate_instances(req, options).await
     }
 
@@ -3204,8 +3197,8 @@ where
     async fn resize(
         &self,
         req: crate::model::instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resize(req, options).await
     }
 
@@ -3213,8 +3206,8 @@ where
     async fn resume_instances(
         &self,
         req: crate::model::instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resume_instances(req, options).await
     }
 
@@ -3222,8 +3215,8 @@ where
     async fn set_instance_template(
         &self,
         req: crate::model::instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_instance_template(req, options).await
     }
 
@@ -3231,8 +3224,8 @@ where
     async fn set_target_pools(
         &self,
         req: crate::model::instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_target_pools(req, options).await
     }
 
@@ -3240,8 +3233,8 @@ where
     async fn start_instances(
         &self,
         req: crate::model::instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.start_instances(req, options).await
     }
 
@@ -3249,8 +3242,8 @@ where
     async fn stop_instances(
         &self,
         req: crate::model::instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop_instances(req, options).await
     }
 
@@ -3258,8 +3251,8 @@ where
     async fn suspend_instances(
         &self,
         req: crate::model::instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.suspend_instances(req, options).await
     }
 
@@ -3267,8 +3260,8 @@ where
     async fn update_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_per_instance_configs(req, options).await
     }
 
@@ -3276,22 +3269,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3325,8 +3318,8 @@ where
     async fn add_instances(
         &self,
         req: crate::model::instance_groups::AddInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_instances(req, options).await
     }
 
@@ -3334,8 +3327,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::instance_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -3343,8 +3336,8 @@ where
     async fn delete(
         &self,
         req: crate::model::instance_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -3352,8 +3345,8 @@ where
     async fn get(
         &self,
         req: crate::model::instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -3361,8 +3354,8 @@ where
     async fn insert(
         &self,
         req: crate::model::instance_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -3370,8 +3363,8 @@ where
     async fn list(
         &self,
         req: crate::model::instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -3379,8 +3372,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupsListInstances>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupsListInstances>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -3388,8 +3381,8 @@ where
     async fn remove_instances(
         &self,
         req: crate::model::instance_groups::RemoveInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_instances(req, options).await
     }
 
@@ -3397,8 +3390,8 @@ where
     async fn set_named_ports(
         &self,
         req: crate::model::instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_named_ports(req, options).await
     }
 
@@ -3406,8 +3399,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -3415,22 +3408,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3464,8 +3457,8 @@ where
     async fn get(
         &self,
         req: crate::model::instance_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceSettings>> {
         self.inner.get(req, options).await
     }
 
@@ -3473,8 +3466,8 @@ where
     async fn patch(
         &self,
         req: crate::model::instance_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -3482,22 +3475,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3531,8 +3524,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::instance_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplateAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplateAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -3540,8 +3533,8 @@ where
     async fn delete(
         &self,
         req: crate::model::instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -3549,8 +3542,8 @@ where
     async fn get(
         &self,
         req: crate::model::instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplate>> {
         self.inner.get(req, options).await
     }
 
@@ -3558,8 +3551,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::instance_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -3567,8 +3560,8 @@ where
     async fn insert(
         &self,
         req: crate::model::instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -3576,8 +3569,8 @@ where
     async fn list(
         &self,
         req: crate::model::instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplateList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplateList>> {
         self.inner.list(req, options).await
     }
 
@@ -3585,8 +3578,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::instance_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -3594,8 +3587,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -3603,22 +3596,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3652,8 +3645,8 @@ where
     async fn add_access_config(
         &self,
         req: crate::model::instances::AddAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_access_config(req, options).await
     }
 
@@ -3661,8 +3654,8 @@ where
     async fn add_network_interface(
         &self,
         req: crate::model::instances::AddNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_network_interface(req, options).await
     }
 
@@ -3670,8 +3663,8 @@ where
     async fn add_resource_policies(
         &self,
         req: crate::model::instances::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_resource_policies(req, options).await
     }
 
@@ -3679,8 +3672,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -3688,8 +3681,8 @@ where
     async fn attach_disk(
         &self,
         req: crate::model::instances::AttachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.attach_disk(req, options).await
     }
 
@@ -3697,8 +3690,8 @@ where
     async fn bulk_insert(
         &self,
         req: crate::model::instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.bulk_insert(req, options).await
     }
 
@@ -3706,8 +3699,8 @@ where
     async fn delete(
         &self,
         req: crate::model::instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -3715,8 +3708,8 @@ where
     async fn delete_access_config(
         &self,
         req: crate::model::instances::DeleteAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_access_config(req, options).await
     }
 
@@ -3724,8 +3717,8 @@ where
     async fn delete_network_interface(
         &self,
         req: crate::model::instances::DeleteNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_network_interface(req, options).await
     }
 
@@ -3733,8 +3726,8 @@ where
     async fn detach_disk(
         &self,
         req: crate::model::instances::DetachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.detach_disk(req, options).await
     }
 
@@ -3742,8 +3735,8 @@ where
     async fn get(
         &self,
         req: crate::model::instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get(req, options).await
     }
 
@@ -3751,8 +3744,8 @@ where
     async fn get_effective_firewalls(
         &self,
         req: crate::model::instances::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstancesGetEffectiveFirewallsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstancesGetEffectiveFirewallsResponse>> {
         self.inner.get_effective_firewalls(req, options).await
     }
 
@@ -3760,8 +3753,8 @@ where
     async fn get_guest_attributes(
         &self,
         req: crate::model::instances::GetGuestAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GuestAttributes>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GuestAttributes>> {
         self.inner.get_guest_attributes(req, options).await
     }
 
@@ -3769,8 +3762,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::instances::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -3778,8 +3771,8 @@ where
     async fn get_screenshot(
         &self,
         req: crate::model::instances::GetScreenshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Screenshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Screenshot>> {
         self.inner.get_screenshot(req, options).await
     }
 
@@ -3787,8 +3780,8 @@ where
     async fn get_serial_port_output(
         &self,
         req: crate::model::instances::GetSerialPortOutputRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SerialPortOutput>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SerialPortOutput>> {
         self.inner.get_serial_port_output(req, options).await
     }
 
@@ -3796,8 +3789,8 @@ where
     async fn get_shielded_instance_identity(
         &self,
         req: crate::model::instances::GetShieldedInstanceIdentityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ShieldedInstanceIdentity>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ShieldedInstanceIdentity>> {
         self.inner
             .get_shielded_instance_identity(req, options)
             .await
@@ -3807,8 +3800,8 @@ where
     async fn insert(
         &self,
         req: crate::model::instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -3816,8 +3809,8 @@ where
     async fn list(
         &self,
         req: crate::model::instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceList>> {
         self.inner.list(req, options).await
     }
 
@@ -3825,8 +3818,8 @@ where
     async fn list_referrers(
         &self,
         req: crate::model::instances::ListReferrersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceListReferrers>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceListReferrers>> {
         self.inner.list_referrers(req, options).await
     }
 
@@ -3834,8 +3827,8 @@ where
     async fn perform_maintenance(
         &self,
         req: crate::model::instances::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.perform_maintenance(req, options).await
     }
 
@@ -3843,8 +3836,8 @@ where
     async fn remove_resource_policies(
         &self,
         req: crate::model::instances::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_resource_policies(req, options).await
     }
 
@@ -3852,8 +3845,8 @@ where
     async fn report_host_as_faulty(
         &self,
         req: crate::model::instances::ReportHostAsFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.report_host_as_faulty(req, options).await
     }
 
@@ -3861,8 +3854,8 @@ where
     async fn reset(
         &self,
         req: crate::model::instances::ResetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.reset(req, options).await
     }
 
@@ -3870,8 +3863,8 @@ where
     async fn resume(
         &self,
         req: crate::model::instances::ResumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resume(req, options).await
     }
 
@@ -3879,8 +3872,8 @@ where
     async fn send_diagnostic_interrupt(
         &self,
         req: crate::model::instances::SendDiagnosticInterruptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.send_diagnostic_interrupt(req, options).await
     }
 
@@ -3888,8 +3881,8 @@ where
     async fn set_deletion_protection(
         &self,
         req: crate::model::instances::SetDeletionProtectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_deletion_protection(req, options).await
     }
 
@@ -3897,8 +3890,8 @@ where
     async fn set_disk_auto_delete(
         &self,
         req: crate::model::instances::SetDiskAutoDeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_disk_auto_delete(req, options).await
     }
 
@@ -3906,8 +3899,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::instances::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -3915,8 +3908,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::instances::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -3924,8 +3917,8 @@ where
     async fn set_machine_resources(
         &self,
         req: crate::model::instances::SetMachineResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_machine_resources(req, options).await
     }
 
@@ -3933,8 +3926,8 @@ where
     async fn set_machine_type(
         &self,
         req: crate::model::instances::SetMachineTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_machine_type(req, options).await
     }
 
@@ -3942,8 +3935,8 @@ where
     async fn set_metadata(
         &self,
         req: crate::model::instances::SetMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_metadata(req, options).await
     }
 
@@ -3951,8 +3944,8 @@ where
     async fn set_min_cpu_platform(
         &self,
         req: crate::model::instances::SetMinCpuPlatformRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_min_cpu_platform(req, options).await
     }
 
@@ -3960,8 +3953,8 @@ where
     async fn set_name(
         &self,
         req: crate::model::instances::SetNameRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_name(req, options).await
     }
 
@@ -3969,8 +3962,8 @@ where
     async fn set_scheduling(
         &self,
         req: crate::model::instances::SetSchedulingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_scheduling(req, options).await
     }
 
@@ -3978,8 +3971,8 @@ where
     async fn set_security_policy(
         &self,
         req: crate::model::instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_security_policy(req, options).await
     }
 
@@ -3987,8 +3980,8 @@ where
     async fn set_service_account(
         &self,
         req: crate::model::instances::SetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_service_account(req, options).await
     }
 
@@ -3996,8 +3989,8 @@ where
     async fn set_shielded_instance_integrity_policy(
         &self,
         req: crate::model::instances::SetShieldedInstanceIntegrityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner
             .set_shielded_instance_integrity_policy(req, options)
             .await
@@ -4007,8 +4000,8 @@ where
     async fn set_tags(
         &self,
         req: crate::model::instances::SetTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_tags(req, options).await
     }
 
@@ -4016,8 +4009,8 @@ where
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::instances::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.simulate_maintenance_event(req, options).await
     }
 
@@ -4025,8 +4018,8 @@ where
     async fn start(
         &self,
         req: crate::model::instances::StartRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.start(req, options).await
     }
 
@@ -4034,8 +4027,8 @@ where
     async fn start_with_encryption_key(
         &self,
         req: crate::model::instances::StartWithEncryptionKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.start_with_encryption_key(req, options).await
     }
 
@@ -4043,8 +4036,8 @@ where
     async fn stop(
         &self,
         req: crate::model::instances::StopRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop(req, options).await
     }
 
@@ -4052,8 +4045,8 @@ where
     async fn suspend(
         &self,
         req: crate::model::instances::SuspendRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.suspend(req, options).await
     }
 
@@ -4061,8 +4054,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4070,8 +4063,8 @@ where
     async fn update(
         &self,
         req: crate::model::instances::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -4079,8 +4072,8 @@ where
     async fn update_access_config(
         &self,
         req: crate::model::instances::UpdateAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_access_config(req, options).await
     }
 
@@ -4088,8 +4081,8 @@ where
     async fn update_display_device(
         &self,
         req: crate::model::instances::UpdateDisplayDeviceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_display_device(req, options).await
     }
 
@@ -4097,8 +4090,8 @@ where
     async fn update_network_interface(
         &self,
         req: crate::model::instances::UpdateNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_network_interface(req, options).await
     }
 
@@ -4106,8 +4099,8 @@ where
     async fn update_shielded_instance_config(
         &self,
         req: crate::model::instances::UpdateShieldedInstanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner
             .update_shielded_instance_config(req, options)
             .await
@@ -4117,22 +4110,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4166,8 +4159,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::instant_snapshots::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshotAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshotAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -4175,8 +4168,8 @@ where
     async fn delete(
         &self,
         req: crate::model::instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -4184,8 +4177,8 @@ where
     async fn get(
         &self,
         req: crate::model::instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshot>> {
         self.inner.get(req, options).await
     }
 
@@ -4193,8 +4186,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4202,8 +4195,8 @@ where
     async fn insert(
         &self,
         req: crate::model::instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -4211,8 +4204,8 @@ where
     async fn list(
         &self,
         req: crate::model::instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshotList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshotList>> {
         self.inner.list(req, options).await
     }
 
@@ -4220,8 +4213,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4229,8 +4222,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -4238,8 +4231,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4247,22 +4240,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4296,8 +4289,8 @@ where
     async fn delete(
         &self,
         req: crate::model::interconnect_attachment_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -4305,8 +4298,8 @@ where
     async fn get(
         &self,
         req: crate::model::interconnect_attachment_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -4314,8 +4307,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4323,11 +4316,9 @@ where
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_attachment_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse,
-        >,
+        crate::Response<crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse>,
     > {
         self.inner.get_operational_status(req, options).await
     }
@@ -4336,8 +4327,8 @@ where
     async fn insert(
         &self,
         req: crate::model::interconnect_attachment_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -4345,9 +4336,8 @@ where
     async fn list(
         &self,
         req: crate::model::interconnect_attachment_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentGroupsListResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentGroupsListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -4355,8 +4345,8 @@ where
     async fn patch(
         &self,
         req: crate::model::interconnect_attachment_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -4364,8 +4354,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4373,8 +4363,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_attachment_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4382,22 +4372,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4431,8 +4421,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::interconnect_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -4440,8 +4430,8 @@ where
     async fn delete(
         &self,
         req: crate::model::interconnect_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -4449,8 +4439,8 @@ where
     async fn get(
         &self,
         req: crate::model::interconnect_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachment>> {
         self.inner.get(req, options).await
     }
 
@@ -4458,8 +4448,8 @@ where
     async fn insert(
         &self,
         req: crate::model::interconnect_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -4467,8 +4457,8 @@ where
     async fn list(
         &self,
         req: crate::model::interconnect_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentList>> {
         self.inner.list(req, options).await
     }
 
@@ -4476,8 +4466,8 @@ where
     async fn patch(
         &self,
         req: crate::model::interconnect_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -4485,8 +4475,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::interconnect_attachments::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -4494,22 +4484,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4543,8 +4533,8 @@ where
     async fn create_members(
         &self,
         req: crate::model::interconnect_groups::CreateMembersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.create_members(req, options).await
     }
 
@@ -4552,8 +4542,8 @@ where
     async fn delete(
         &self,
         req: crate::model::interconnect_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -4561,8 +4551,8 @@ where
     async fn get(
         &self,
         req: crate::model::interconnect_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -4570,8 +4560,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4579,9 +4569,8 @@ where
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>> {
         self.inner.get_operational_status(req, options).await
     }
 
@@ -4589,8 +4578,8 @@ where
     async fn insert(
         &self,
         req: crate::model::interconnect_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -4598,8 +4587,8 @@ where
     async fn list(
         &self,
         req: crate::model::interconnect_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectGroupsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectGroupsListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -4607,8 +4596,8 @@ where
     async fn patch(
         &self,
         req: crate::model::interconnect_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -4616,8 +4605,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4625,8 +4614,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4634,22 +4623,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4683,8 +4672,8 @@ where
     async fn get(
         &self,
         req: crate::model::interconnect_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectLocation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectLocation>> {
         self.inner.get(req, options).await
     }
 
@@ -4692,8 +4681,8 @@ where
     async fn list(
         &self,
         req: crate::model::interconnect_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectLocationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectLocationList>> {
         self.inner.list(req, options).await
     }
 }
@@ -4727,8 +4716,8 @@ where
     async fn get(
         &self,
         req: crate::model::interconnect_remote_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectRemoteLocation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectRemoteLocation>> {
         self.inner.get(req, options).await
     }
 
@@ -4736,8 +4725,8 @@ where
     async fn list(
         &self,
         req: crate::model::interconnect_remote_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectRemoteLocationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectRemoteLocationList>> {
         self.inner.list(req, options).await
     }
 }
@@ -4771,8 +4760,8 @@ where
     async fn delete(
         &self,
         req: crate::model::interconnects::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -4780,8 +4769,8 @@ where
     async fn get(
         &self,
         req: crate::model::interconnects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Interconnect>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Interconnect>> {
         self.inner.get(req, options).await
     }
 
@@ -4789,8 +4778,8 @@ where
     async fn get_diagnostics(
         &self,
         req: crate::model::interconnects::GetDiagnosticsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectsGetDiagnosticsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectsGetDiagnosticsResponse>> {
         self.inner.get_diagnostics(req, options).await
     }
 
@@ -4798,8 +4787,8 @@ where
     async fn get_macsec_config(
         &self,
         req: crate::model::interconnects::GetMacsecConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectsGetMacsecConfigResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectsGetMacsecConfigResponse>> {
         self.inner.get_macsec_config(req, options).await
     }
 
@@ -4807,8 +4796,8 @@ where
     async fn insert(
         &self,
         req: crate::model::interconnects::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -4816,8 +4805,8 @@ where
     async fn list(
         &self,
         req: crate::model::interconnects::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectList>> {
         self.inner.list(req, options).await
     }
 
@@ -4825,8 +4814,8 @@ where
     async fn patch(
         &self,
         req: crate::model::interconnects::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -4834,8 +4823,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::interconnects::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -4843,22 +4832,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4892,8 +4881,8 @@ where
     async fn get(
         &self,
         req: crate::model::license_codes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicenseCode>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicenseCode>> {
         self.inner.get(req, options).await
     }
 
@@ -4901,8 +4890,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::license_codes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 }
@@ -4936,8 +4925,8 @@ where
     async fn delete(
         &self,
         req: crate::model::licenses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -4945,8 +4934,8 @@ where
     async fn get(
         &self,
         req: crate::model::licenses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::License>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::License>> {
         self.inner.get(req, options).await
     }
 
@@ -4954,8 +4943,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::licenses::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -4963,8 +4952,8 @@ where
     async fn insert(
         &self,
         req: crate::model::licenses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -4972,8 +4961,8 @@ where
     async fn list(
         &self,
         req: crate::model::licenses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicensesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicensesListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -4981,8 +4970,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::licenses::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -4990,8 +4979,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::licenses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -4999,8 +4988,8 @@ where
     async fn update(
         &self,
         req: crate::model::licenses::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -5008,22 +4997,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5057,8 +5046,8 @@ where
     async fn delete(
         &self,
         req: crate::model::machine_images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -5066,8 +5055,8 @@ where
     async fn get(
         &self,
         req: crate::model::machine_images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineImage>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineImage>> {
         self.inner.get(req, options).await
     }
 
@@ -5075,8 +5064,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::machine_images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5084,8 +5073,8 @@ where
     async fn insert(
         &self,
         req: crate::model::machine_images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -5093,8 +5082,8 @@ where
     async fn list(
         &self,
         req: crate::model::machine_images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineImageList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineImageList>> {
         self.inner.list(req, options).await
     }
 
@@ -5102,8 +5091,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::machine_images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5111,8 +5100,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::machine_images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -5120,8 +5109,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::machine_images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5129,22 +5118,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5178,8 +5167,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::machine_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineTypeAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -5187,8 +5176,8 @@ where
     async fn get(
         &self,
         req: crate::model::machine_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineType>> {
         self.inner.get(req, options).await
     }
 
@@ -5196,8 +5185,8 @@ where
     async fn list(
         &self,
         req: crate::model::machine_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineTypeList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineTypeList>> {
         self.inner.list(req, options).await
     }
 }
@@ -5231,8 +5220,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::network_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkAttachmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkAttachmentAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -5240,8 +5229,8 @@ where
     async fn delete(
         &self,
         req: crate::model::network_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -5249,8 +5238,8 @@ where
     async fn get(
         &self,
         req: crate::model::network_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkAttachment>> {
         self.inner.get(req, options).await
     }
 
@@ -5258,8 +5247,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::network_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5267,8 +5256,8 @@ where
     async fn insert(
         &self,
         req: crate::model::network_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -5276,8 +5265,8 @@ where
     async fn list(
         &self,
         req: crate::model::network_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkAttachmentList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkAttachmentList>> {
         self.inner.list(req, options).await
     }
 
@@ -5285,8 +5274,8 @@ where
     async fn patch(
         &self,
         req: crate::model::network_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -5294,8 +5283,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::network_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5303,8 +5292,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5312,22 +5301,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5361,9 +5350,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::network_edge_security_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -5371,8 +5359,8 @@ where
     async fn delete(
         &self,
         req: crate::model::network_edge_security_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -5380,8 +5368,8 @@ where
     async fn get(
         &self,
         req: crate::model::network_edge_security_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEdgeSecurityService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEdgeSecurityService>> {
         self.inner.get(req, options).await
     }
 
@@ -5389,8 +5377,8 @@ where
     async fn insert(
         &self,
         req: crate::model::network_edge_security_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -5398,8 +5386,8 @@ where
     async fn patch(
         &self,
         req: crate::model::network_edge_security_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -5407,22 +5395,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5456,8 +5444,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::network_endpoint_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -5465,8 +5453,8 @@ where
     async fn attach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.attach_network_endpoints(req, options).await
     }
 
@@ -5474,8 +5462,8 @@ where
     async fn delete(
         &self,
         req: crate::model::network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -5483,8 +5471,8 @@ where
     async fn detach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.detach_network_endpoints(req, options).await
     }
 
@@ -5492,8 +5480,8 @@ where
     async fn get(
         &self,
         req: crate::model::network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -5501,8 +5489,8 @@ where
     async fn insert(
         &self,
         req: crate::model::network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -5510,8 +5498,8 @@ where
     async fn list(
         &self,
         req: crate::model::network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -5519,9 +5507,8 @@ where
     async fn list_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>> {
         self.inner.list_network_endpoints(req, options).await
     }
 
@@ -5529,8 +5516,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_endpoint_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5538,22 +5525,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5587,8 +5574,8 @@ where
     async fn add_association(
         &self,
         req: crate::model::network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_association(req, options).await
     }
 
@@ -5596,8 +5583,8 @@ where
     async fn add_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::AddPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_packet_mirroring_rule(req, options).await
     }
 
@@ -5605,8 +5592,8 @@ where
     async fn add_rule(
         &self,
         req: crate::model::network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_rule(req, options).await
     }
 
@@ -5614,8 +5601,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::network_firewall_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkFirewallPolicyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkFirewallPolicyAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -5623,8 +5610,8 @@ where
     async fn clone_rules(
         &self,
         req: crate::model::network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.clone_rules(req, options).await
     }
 
@@ -5632,8 +5619,8 @@ where
     async fn delete(
         &self,
         req: crate::model::network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -5641,8 +5628,8 @@ where
     async fn get(
         &self,
         req: crate::model::network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -5650,8 +5637,8 @@ where
     async fn get_association(
         &self,
         req: crate::model::network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         self.inner.get_association(req, options).await
     }
 
@@ -5659,8 +5646,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -5668,8 +5655,8 @@ where
     async fn get_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::GetPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         self.inner.get_packet_mirroring_rule(req, options).await
     }
 
@@ -5677,8 +5664,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -5686,8 +5673,8 @@ where
     async fn insert(
         &self,
         req: crate::model::network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -5695,8 +5682,8 @@ where
     async fn list(
         &self,
         req: crate::model::network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -5704,8 +5691,8 @@ where
     async fn patch(
         &self,
         req: crate::model::network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -5713,8 +5700,8 @@ where
     async fn patch_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_packet_mirroring_rule(req, options).await
     }
 
@@ -5722,8 +5709,8 @@ where
     async fn patch_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_rule(req, options).await
     }
 
@@ -5731,8 +5718,8 @@ where
     async fn remove_association(
         &self,
         req: crate::model::network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_association(req, options).await
     }
 
@@ -5740,8 +5727,8 @@ where
     async fn remove_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::RemovePacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_packet_mirroring_rule(req, options).await
     }
 
@@ -5749,8 +5736,8 @@ where
     async fn remove_rule(
         &self,
         req: crate::model::network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_rule(req, options).await
     }
 
@@ -5758,8 +5745,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -5767,8 +5754,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -5776,22 +5763,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5825,8 +5812,8 @@ where
     async fn get(
         &self,
         req: crate::model::network_profiles::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkProfile>> {
         self.inner.get(req, options).await
     }
 
@@ -5834,8 +5821,8 @@ where
     async fn list(
         &self,
         req: crate::model::network_profiles::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkProfilesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkProfilesListResponse>> {
         self.inner.list(req, options).await
     }
 }
@@ -5869,8 +5856,8 @@ where
     async fn add_peering(
         &self,
         req: crate::model::networks::AddPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_peering(req, options).await
     }
 
@@ -5878,8 +5865,8 @@ where
     async fn delete(
         &self,
         req: crate::model::networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -5887,8 +5874,8 @@ where
     async fn get(
         &self,
         req: crate::model::networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         self.inner.get(req, options).await
     }
 
@@ -5896,8 +5883,8 @@ where
     async fn get_effective_firewalls(
         &self,
         req: crate::model::networks::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworksGetEffectiveFirewallsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworksGetEffectiveFirewallsResponse>> {
         self.inner.get_effective_firewalls(req, options).await
     }
 
@@ -5905,8 +5892,8 @@ where
     async fn insert(
         &self,
         req: crate::model::networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -5914,8 +5901,8 @@ where
     async fn list(
         &self,
         req: crate::model::networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkList>> {
         self.inner.list(req, options).await
     }
 
@@ -5923,8 +5910,8 @@ where
     async fn list_peering_routes(
         &self,
         req: crate::model::networks::ListPeeringRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExchangedPeeringRoutesList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExchangedPeeringRoutesList>> {
         self.inner.list_peering_routes(req, options).await
     }
 
@@ -5932,8 +5919,8 @@ where
     async fn patch(
         &self,
         req: crate::model::networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -5941,8 +5928,8 @@ where
     async fn remove_peering(
         &self,
         req: crate::model::networks::RemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_peering(req, options).await
     }
 
@@ -5950,8 +5937,8 @@ where
     async fn request_remove_peering(
         &self,
         req: crate::model::networks::RequestRemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.request_remove_peering(req, options).await
     }
 
@@ -5959,8 +5946,8 @@ where
     async fn switch_to_custom_mode(
         &self,
         req: crate::model::networks::SwitchToCustomModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.switch_to_custom_mode(req, options).await
     }
 
@@ -5968,8 +5955,8 @@ where
     async fn update_peering(
         &self,
         req: crate::model::networks::UpdatePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_peering(req, options).await
     }
 
@@ -5977,22 +5964,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6026,8 +6013,8 @@ where
     async fn add_nodes(
         &self,
         req: crate::model::node_groups::AddNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_nodes(req, options).await
     }
 
@@ -6035,8 +6022,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::node_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroupAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroupAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -6044,8 +6031,8 @@ where
     async fn delete(
         &self,
         req: crate::model::node_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -6053,8 +6040,8 @@ where
     async fn delete_nodes(
         &self,
         req: crate::model::node_groups::DeleteNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_nodes(req, options).await
     }
 
@@ -6062,8 +6049,8 @@ where
     async fn get(
         &self,
         req: crate::model::node_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -6071,8 +6058,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::node_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -6080,8 +6067,8 @@ where
     async fn insert(
         &self,
         req: crate::model::node_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -6089,8 +6076,8 @@ where
     async fn list(
         &self,
         req: crate::model::node_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -6098,8 +6085,8 @@ where
     async fn list_nodes(
         &self,
         req: crate::model::node_groups::ListNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroupsListNodes>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroupsListNodes>> {
         self.inner.list_nodes(req, options).await
     }
 
@@ -6107,8 +6094,8 @@ where
     async fn patch(
         &self,
         req: crate::model::node_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -6116,8 +6103,8 @@ where
     async fn perform_maintenance(
         &self,
         req: crate::model::node_groups::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.perform_maintenance(req, options).await
     }
 
@@ -6125,8 +6112,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::node_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -6134,8 +6121,8 @@ where
     async fn set_node_template(
         &self,
         req: crate::model::node_groups::SetNodeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_node_template(req, options).await
     }
 
@@ -6143,8 +6130,8 @@ where
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::node_groups::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.simulate_maintenance_event(req, options).await
     }
 
@@ -6152,8 +6139,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6161,22 +6148,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6210,8 +6197,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::node_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTemplateAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTemplateAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -6219,8 +6206,8 @@ where
     async fn delete(
         &self,
         req: crate::model::node_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -6228,8 +6215,8 @@ where
     async fn get(
         &self,
         req: crate::model::node_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTemplate>> {
         self.inner.get(req, options).await
     }
 
@@ -6237,8 +6224,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::node_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -6246,8 +6233,8 @@ where
     async fn insert(
         &self,
         req: crate::model::node_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -6255,8 +6242,8 @@ where
     async fn list(
         &self,
         req: crate::model::node_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTemplateList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTemplateList>> {
         self.inner.list(req, options).await
     }
 
@@ -6264,8 +6251,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::node_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -6273,8 +6260,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6282,22 +6269,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6331,8 +6318,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::node_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTypeAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -6340,8 +6327,8 @@ where
     async fn get(
         &self,
         req: crate::model::node_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeType>> {
         self.inner.get(req, options).await
     }
 
@@ -6349,8 +6336,8 @@ where
     async fn list(
         &self,
         req: crate::model::node_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTypeList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTypeList>> {
         self.inner.list(req, options).await
     }
 }
@@ -6384,8 +6371,8 @@ where
     async fn add_association(
         &self,
         req: crate::model::organization_security_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_association(req, options).await
     }
 
@@ -6393,8 +6380,8 @@ where
     async fn add_rule(
         &self,
         req: crate::model::organization_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_rule(req, options).await
     }
 
@@ -6402,8 +6389,8 @@ where
     async fn copy_rules(
         &self,
         req: crate::model::organization_security_policies::CopyRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.copy_rules(req, options).await
     }
 
@@ -6411,8 +6398,8 @@ where
     async fn delete(
         &self,
         req: crate::model::organization_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -6420,8 +6407,8 @@ where
     async fn get(
         &self,
         req: crate::model::organization_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -6429,8 +6416,8 @@ where
     async fn get_association(
         &self,
         req: crate::model::organization_security_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyAssociation>> {
         self.inner.get_association(req, options).await
     }
 
@@ -6438,8 +6425,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::organization_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyRule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -6447,8 +6434,8 @@ where
     async fn insert(
         &self,
         req: crate::model::organization_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -6456,8 +6443,8 @@ where
     async fn list(
         &self,
         req: crate::model::organization_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -6465,10 +6452,9 @@ where
     async fn list_associations(
         &self,
         req: crate::model::organization_security_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>>
+    {
         self.inner.list_associations(req, options).await
     }
 
@@ -6476,11 +6462,9 @@ where
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::organization_security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     > {
         self.inner
             .list_preconfigured_expression_sets(req, options)
@@ -6491,8 +6475,8 @@ where
     async fn r#move(
         &self,
         req: crate::model::organization_security_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.r#move(req, options).await
     }
 
@@ -6500,8 +6484,8 @@ where
     async fn patch(
         &self,
         req: crate::model::organization_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -6509,8 +6493,8 @@ where
     async fn patch_rule(
         &self,
         req: crate::model::organization_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_rule(req, options).await
     }
 
@@ -6518,8 +6502,8 @@ where
     async fn remove_association(
         &self,
         req: crate::model::organization_security_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_association(req, options).await
     }
 
@@ -6527,8 +6511,8 @@ where
     async fn remove_rule(
         &self,
         req: crate::model::organization_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_rule(req, options).await
     }
 
@@ -6536,22 +6520,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6585,8 +6569,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::packet_mirrorings::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PacketMirroringAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PacketMirroringAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -6594,8 +6578,8 @@ where
     async fn delete(
         &self,
         req: crate::model::packet_mirrorings::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -6603,8 +6587,8 @@ where
     async fn get(
         &self,
         req: crate::model::packet_mirrorings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PacketMirroring>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PacketMirroring>> {
         self.inner.get(req, options).await
     }
 
@@ -6612,8 +6596,8 @@ where
     async fn insert(
         &self,
         req: crate::model::packet_mirrorings::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -6621,8 +6605,8 @@ where
     async fn list(
         &self,
         req: crate::model::packet_mirrorings::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PacketMirroringList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PacketMirroringList>> {
         self.inner.list(req, options).await
     }
 
@@ -6630,8 +6614,8 @@ where
     async fn patch(
         &self,
         req: crate::model::packet_mirrorings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -6639,8 +6623,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::packet_mirrorings::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -6648,22 +6632,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6697,8 +6681,8 @@ where
     async fn get(
         &self,
         req: crate::model::preview_features::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PreviewFeature>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PreviewFeature>> {
         self.inner.get(req, options).await
     }
 
@@ -6706,8 +6690,8 @@ where
     async fn list(
         &self,
         req: crate::model::preview_features::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PreviewFeatureList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PreviewFeatureList>> {
         self.inner.list(req, options).await
     }
 
@@ -6715,8 +6699,8 @@ where
     async fn update(
         &self,
         req: crate::model::preview_features::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -6724,22 +6708,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6773,8 +6757,8 @@ where
     async fn disable_xpn_host(
         &self,
         req: crate::model::projects::DisableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.disable_xpn_host(req, options).await
     }
 
@@ -6782,8 +6766,8 @@ where
     async fn disable_xpn_resource(
         &self,
         req: crate::model::projects::DisableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.disable_xpn_resource(req, options).await
     }
 
@@ -6791,8 +6775,8 @@ where
     async fn enable_xpn_host(
         &self,
         req: crate::model::projects::EnableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.enable_xpn_host(req, options).await
     }
 
@@ -6800,8 +6784,8 @@ where
     async fn enable_xpn_resource(
         &self,
         req: crate::model::projects::EnableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.enable_xpn_resource(req, options).await
     }
 
@@ -6809,8 +6793,8 @@ where
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Project>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Project>> {
         self.inner.get(req, options).await
     }
 
@@ -6818,8 +6802,8 @@ where
     async fn get_xpn_host(
         &self,
         req: crate::model::projects::GetXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Project>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Project>> {
         self.inner.get_xpn_host(req, options).await
     }
 
@@ -6827,8 +6811,8 @@ where
     async fn get_xpn_resources(
         &self,
         req: crate::model::projects::GetXpnResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProjectsGetXpnResources>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProjectsGetXpnResources>> {
         self.inner.get_xpn_resources(req, options).await
     }
 
@@ -6836,8 +6820,8 @@ where
     async fn list_xpn_hosts(
         &self,
         req: crate::model::projects::ListXpnHostsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::XpnHostList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::XpnHostList>> {
         self.inner.list_xpn_hosts(req, options).await
     }
 
@@ -6845,8 +6829,8 @@ where
     async fn move_disk(
         &self,
         req: crate::model::projects::MoveDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.move_disk(req, options).await
     }
 
@@ -6854,8 +6838,8 @@ where
     async fn move_instance(
         &self,
         req: crate::model::projects::MoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.move_instance(req, options).await
     }
 
@@ -6863,8 +6847,8 @@ where
     async fn set_cloud_armor_tier(
         &self,
         req: crate::model::projects::SetCloudArmorTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_cloud_armor_tier(req, options).await
     }
 
@@ -6872,8 +6856,8 @@ where
     async fn set_common_instance_metadata(
         &self,
         req: crate::model::projects::SetCommonInstanceMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_common_instance_metadata(req, options).await
     }
 
@@ -6881,8 +6865,8 @@ where
     async fn set_default_network_tier(
         &self,
         req: crate::model::projects::SetDefaultNetworkTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_default_network_tier(req, options).await
     }
 
@@ -6890,8 +6874,8 @@ where
     async fn set_usage_export_bucket(
         &self,
         req: crate::model::projects::SetUsageExportBucketRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_usage_export_bucket(req, options).await
     }
 
@@ -6899,22 +6883,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6948,8 +6932,8 @@ where
     async fn announce(
         &self,
         req: crate::model::public_advertised_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.announce(req, options).await
     }
 
@@ -6957,8 +6941,8 @@ where
     async fn delete(
         &self,
         req: crate::model::public_advertised_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -6966,8 +6950,8 @@ where
     async fn get(
         &self,
         req: crate::model::public_advertised_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicAdvertisedPrefix>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicAdvertisedPrefix>> {
         self.inner.get(req, options).await
     }
 
@@ -6975,8 +6959,8 @@ where
     async fn insert(
         &self,
         req: crate::model::public_advertised_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -6984,8 +6968,8 @@ where
     async fn list(
         &self,
         req: crate::model::public_advertised_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicAdvertisedPrefixList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicAdvertisedPrefixList>> {
         self.inner.list(req, options).await
     }
 
@@ -6993,8 +6977,8 @@ where
     async fn patch(
         &self,
         req: crate::model::public_advertised_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -7002,8 +6986,8 @@ where
     async fn withdraw(
         &self,
         req: crate::model::public_advertised_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.withdraw(req, options).await
     }
 
@@ -7011,22 +6995,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7060,8 +7044,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::public_delegated_prefixes::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefixAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefixAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -7069,8 +7053,8 @@ where
     async fn announce(
         &self,
         req: crate::model::public_delegated_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.announce(req, options).await
     }
 
@@ -7078,8 +7062,8 @@ where
     async fn delete(
         &self,
         req: crate::model::public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -7087,8 +7071,8 @@ where
     async fn get(
         &self,
         req: crate::model::public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefix>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefix>> {
         self.inner.get(req, options).await
     }
 
@@ -7096,8 +7080,8 @@ where
     async fn insert(
         &self,
         req: crate::model::public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7105,8 +7089,8 @@ where
     async fn list(
         &self,
         req: crate::model::public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefixList>> {
         self.inner.list(req, options).await
     }
 
@@ -7114,8 +7098,8 @@ where
     async fn patch(
         &self,
         req: crate::model::public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -7123,8 +7107,8 @@ where
     async fn withdraw(
         &self,
         req: crate::model::public_delegated_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.withdraw(req, options).await
     }
 
@@ -7132,22 +7116,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7181,8 +7165,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -7190,8 +7174,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Autoscaler>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Autoscaler>> {
         self.inner.get(req, options).await
     }
 
@@ -7199,8 +7183,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7208,8 +7192,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionAutoscalerList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionAutoscalerList>> {
         self.inner.list(req, options).await
     }
 
@@ -7217,8 +7201,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -7226,8 +7210,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -7235,8 +7219,8 @@ where
     async fn update(
         &self,
         req: crate::model::region_autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -7244,22 +7228,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7293,8 +7277,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -7302,8 +7286,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendService>> {
         self.inner.get(req, options).await
     }
 
@@ -7311,8 +7295,8 @@ where
     async fn get_health(
         &self,
         req: crate::model::region_backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceGroupHealth>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceGroupHealth>> {
         self.inner.get_health(req, options).await
     }
 
@@ -7320,8 +7304,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::region_backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -7329,8 +7313,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7338,8 +7322,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceList>> {
         self.inner.list(req, options).await
     }
 
@@ -7347,8 +7331,8 @@ where
     async fn list_usable(
         &self,
         req: crate::model::region_backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceListUsable>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceListUsable>> {
         self.inner.list_usable(req, options).await
     }
 
@@ -7356,8 +7340,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -7365,8 +7349,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::region_backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -7374,8 +7358,8 @@ where
     async fn set_security_policy(
         &self,
         req: crate::model::region_backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_security_policy(req, options).await
     }
 
@@ -7383,8 +7367,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -7392,8 +7376,8 @@ where
     async fn update(
         &self,
         req: crate::model::region_backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -7401,22 +7385,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7450,8 +7434,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::region_commitments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitmentAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -7459,8 +7443,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_commitments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Commitment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Commitment>> {
         self.inner.get(req, options).await
     }
 
@@ -7468,8 +7452,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_commitments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7477,8 +7461,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_commitments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitmentList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitmentList>> {
         self.inner.list(req, options).await
     }
 
@@ -7486,8 +7470,8 @@ where
     async fn update(
         &self,
         req: crate::model::region_commitments::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -7495,22 +7479,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7544,8 +7528,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskType>> {
         self.inner.get(req, options).await
     }
 
@@ -7553,8 +7537,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionDiskTypeList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionDiskTypeList>> {
         self.inner.list(req, options).await
     }
 }
@@ -7588,8 +7572,8 @@ where
     async fn add_resource_policies(
         &self,
         req: crate::model::region_disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_resource_policies(req, options).await
     }
 
@@ -7597,8 +7581,8 @@ where
     async fn bulk_insert(
         &self,
         req: crate::model::region_disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.bulk_insert(req, options).await
     }
 
@@ -7606,8 +7590,8 @@ where
     async fn create_snapshot(
         &self,
         req: crate::model::region_disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.create_snapshot(req, options).await
     }
 
@@ -7615,8 +7599,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -7624,8 +7608,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Disk>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Disk>> {
         self.inner.get(req, options).await
     }
 
@@ -7633,8 +7617,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::region_disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -7642,8 +7626,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7651,8 +7635,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskList>> {
         self.inner.list(req, options).await
     }
 
@@ -7660,8 +7644,8 @@ where
     async fn remove_resource_policies(
         &self,
         req: crate::model::region_disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_resource_policies(req, options).await
     }
 
@@ -7669,8 +7653,8 @@ where
     async fn resize(
         &self,
         req: crate::model::region_disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resize(req, options).await
     }
 
@@ -7678,8 +7662,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::region_disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -7687,8 +7671,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::region_disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -7696,8 +7680,8 @@ where
     async fn start_async_replication(
         &self,
         req: crate::model::region_disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.start_async_replication(req, options).await
     }
 
@@ -7705,8 +7689,8 @@ where
     async fn stop_async_replication(
         &self,
         req: crate::model::region_disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop_async_replication(req, options).await
     }
 
@@ -7714,8 +7698,8 @@ where
     async fn stop_group_async_replication(
         &self,
         req: crate::model::region_disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop_group_async_replication(req, options).await
     }
 
@@ -7723,8 +7707,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -7732,8 +7716,8 @@ where
     async fn update(
         &self,
         req: crate::model::region_disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -7741,22 +7725,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7790,8 +7774,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_health_check_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -7799,8 +7783,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_health_check_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckService>> {
         self.inner.get(req, options).await
     }
 
@@ -7808,8 +7792,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_health_check_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7817,8 +7801,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_health_check_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckServicesList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckServicesList>> {
         self.inner.list(req, options).await
     }
 
@@ -7826,8 +7810,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_health_check_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -7835,8 +7819,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_check_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -7844,22 +7828,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7893,8 +7877,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -7902,8 +7886,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheck>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheck>> {
         self.inner.get(req, options).await
     }
 
@@ -7911,8 +7895,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -7920,8 +7904,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckList>> {
         self.inner.list(req, options).await
     }
 
@@ -7929,8 +7913,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -7938,8 +7922,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -7947,8 +7931,8 @@ where
     async fn update(
         &self,
         req: crate::model::region_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -7956,22 +7940,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8005,8 +7989,8 @@ where
     async fn abandon_instances(
         &self,
         req: crate::model::region_instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.abandon_instances(req, options).await
     }
 
@@ -8014,8 +7998,8 @@ where
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::region_instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.apply_updates_to_instances(req, options).await
     }
 
@@ -8023,8 +8007,8 @@ where
     async fn create_instances(
         &self,
         req: crate::model::region_instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.create_instances(req, options).await
     }
 
@@ -8032,8 +8016,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -8041,8 +8025,8 @@ where
     async fn delete_instances(
         &self,
         req: crate::model::region_instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_instances(req, options).await
     }
 
@@ -8050,8 +8034,8 @@ where
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_per_instance_configs(req, options).await
     }
 
@@ -8059,8 +8043,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManager>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManager>> {
         self.inner.get(req, options).await
     }
 
@@ -8068,8 +8052,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -8077,8 +8061,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupManagerList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagerList>> {
         self.inner.list(req, options).await
     }
 
@@ -8086,9 +8070,8 @@ where
     async fn list_errors(
         &self,
         req: crate::model::region_instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>> {
         self.inner.list_errors(req, options).await
     }
 
@@ -8096,10 +8079,9 @@ where
     async fn list_managed_instances(
         &self,
         req: crate::model::region_instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>>
+    {
         self.inner.list_managed_instances(req, options).await
     }
 
@@ -8107,10 +8089,9 @@ where
     async fn list_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>>
+    {
         self.inner.list_per_instance_configs(req, options).await
     }
 
@@ -8118,8 +8099,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -8127,8 +8108,8 @@ where
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_per_instance_configs(req, options).await
     }
 
@@ -8136,8 +8117,8 @@ where
     async fn recreate_instances(
         &self,
         req: crate::model::region_instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.recreate_instances(req, options).await
     }
 
@@ -8145,8 +8126,8 @@ where
     async fn resize(
         &self,
         req: crate::model::region_instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resize(req, options).await
     }
 
@@ -8154,8 +8135,8 @@ where
     async fn resume_instances(
         &self,
         req: crate::model::region_instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resume_instances(req, options).await
     }
 
@@ -8163,8 +8144,8 @@ where
     async fn set_instance_template(
         &self,
         req: crate::model::region_instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_instance_template(req, options).await
     }
 
@@ -8172,8 +8153,8 @@ where
     async fn set_target_pools(
         &self,
         req: crate::model::region_instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_target_pools(req, options).await
     }
 
@@ -8181,8 +8162,8 @@ where
     async fn start_instances(
         &self,
         req: crate::model::region_instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.start_instances(req, options).await
     }
 
@@ -8190,8 +8171,8 @@ where
     async fn stop_instances(
         &self,
         req: crate::model::region_instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.stop_instances(req, options).await
     }
 
@@ -8199,8 +8180,8 @@ where
     async fn suspend_instances(
         &self,
         req: crate::model::region_instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.suspend_instances(req, options).await
     }
 
@@ -8208,8 +8189,8 @@ where
     async fn update_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_per_instance_configs(req, options).await
     }
 
@@ -8217,22 +8198,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8266,8 +8247,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -8275,8 +8256,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -8284,8 +8265,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::region_instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupsListInstances>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupsListInstances>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -8293,8 +8274,8 @@ where
     async fn set_named_ports(
         &self,
         req: crate::model::region_instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_named_ports(req, options).await
     }
 
@@ -8302,8 +8283,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -8311,22 +8292,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8360,8 +8341,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -8369,8 +8350,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplate>> {
         self.inner.get(req, options).await
     }
 
@@ -8378,8 +8359,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -8387,8 +8368,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplateList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplateList>> {
         self.inner.list(req, options).await
     }
 
@@ -8396,22 +8377,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8445,8 +8426,8 @@ where
     async fn bulk_insert(
         &self,
         req: crate::model::region_instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.bulk_insert(req, options).await
     }
 
@@ -8454,22 +8435,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8503,8 +8484,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -8512,8 +8493,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshot>> {
         self.inner.get(req, options).await
     }
 
@@ -8521,8 +8502,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -8530,8 +8511,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -8539,8 +8520,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshotList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshotList>> {
         self.inner.list(req, options).await
     }
 
@@ -8548,8 +8529,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -8557,8 +8538,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::region_instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -8566,8 +8547,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -8575,22 +8556,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8624,8 +8605,8 @@ where
     async fn attach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.attach_network_endpoints(req, options).await
     }
 
@@ -8633,8 +8614,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -8642,8 +8623,8 @@ where
     async fn detach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.detach_network_endpoints(req, options).await
     }
 
@@ -8651,8 +8632,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -8660,8 +8641,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -8669,8 +8650,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -8678,9 +8659,8 @@ where
     async fn list_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>> {
         self.inner.list_network_endpoints(req, options).await
     }
 
@@ -8688,22 +8668,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8737,8 +8717,8 @@ where
     async fn add_association(
         &self,
         req: crate::model::region_network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_association(req, options).await
     }
 
@@ -8746,8 +8726,8 @@ where
     async fn add_rule(
         &self,
         req: crate::model::region_network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_rule(req, options).await
     }
 
@@ -8755,8 +8735,8 @@ where
     async fn clone_rules(
         &self,
         req: crate::model::region_network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.clone_rules(req, options).await
     }
 
@@ -8764,8 +8744,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -8773,8 +8753,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -8782,8 +8762,8 @@ where
     async fn get_association(
         &self,
         req: crate::model::region_network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         self.inner.get_association(req, options).await
     }
 
@@ -8791,11 +8771,9 @@ where
     async fn get_effective_firewalls(
         &self,
         req: crate::model::region_network_firewall_policies::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse,
-        >,
+        crate::Response<crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse>,
     > {
         self.inner.get_effective_firewalls(req, options).await
     }
@@ -8804,8 +8782,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -8813,8 +8791,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::region_network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -8822,8 +8800,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -8831,8 +8809,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -8840,8 +8818,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -8849,8 +8827,8 @@ where
     async fn patch_rule(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_rule(req, options).await
     }
 
@@ -8858,8 +8836,8 @@ where
     async fn remove_association(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_association(req, options).await
     }
 
@@ -8867,8 +8845,8 @@ where
     async fn remove_rule(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_rule(req, options).await
     }
 
@@ -8876,8 +8854,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -8885,8 +8863,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -8894,22 +8872,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8943,8 +8921,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_notification_endpoints::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -8952,8 +8930,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_notification_endpoints::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotificationEndpoint>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotificationEndpoint>> {
         self.inner.get(req, options).await
     }
 
@@ -8961,8 +8939,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_notification_endpoints::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -8970,8 +8948,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_notification_endpoints::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotificationEndpointList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotificationEndpointList>> {
         self.inner.list(req, options).await
     }
 
@@ -8979,8 +8957,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_notification_endpoints::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -8988,22 +8966,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9037,8 +9015,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -9046,8 +9024,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get(req, options).await
     }
 
@@ -9055,8 +9033,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         self.inner.list(req, options).await
     }
 
@@ -9064,8 +9042,8 @@ where
     async fn wait(
         &self,
         req: crate::model::region_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.wait(req, options).await
     }
 }
@@ -9099,8 +9077,8 @@ where
     async fn add_rule(
         &self,
         req: crate::model::region_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_rule(req, options).await
     }
 
@@ -9108,8 +9086,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9117,8 +9095,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -9126,8 +9104,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::region_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyRule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -9135,8 +9113,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9144,8 +9122,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -9153,8 +9131,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -9162,8 +9140,8 @@ where
     async fn patch_rule(
         &self,
         req: crate::model::region_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_rule(req, options).await
     }
 
@@ -9171,8 +9149,8 @@ where
     async fn remove_rule(
         &self,
         req: crate::model::region_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_rule(req, options).await
     }
 
@@ -9180,8 +9158,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::region_security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -9189,22 +9167,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9238,8 +9216,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9247,8 +9225,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificate>> {
         self.inner.get(req, options).await
     }
 
@@ -9256,8 +9234,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9265,8 +9243,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificateList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificateList>> {
         self.inner.list(req, options).await
     }
 
@@ -9274,22 +9252,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9323,8 +9301,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9332,8 +9310,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -9341,8 +9319,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9350,8 +9328,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesList>> {
         self.inner.list(req, options).await
     }
 
@@ -9359,9 +9337,8 @@ where
     async fn list_available_features(
         &self,
         req: crate::model::region_ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>> {
         self.inner.list_available_features(req, options).await
     }
 
@@ -9369,8 +9346,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -9378,22 +9355,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9427,8 +9404,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9436,8 +9413,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -9445,8 +9422,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9454,8 +9431,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -9463,8 +9440,8 @@ where
     async fn set_url_map(
         &self,
         req: crate::model::region_target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_url_map(req, options).await
     }
 
@@ -9472,22 +9449,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9521,8 +9498,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9530,8 +9507,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -9539,8 +9516,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9548,8 +9525,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -9557,8 +9534,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -9566,8 +9543,8 @@ where
     async fn set_ssl_certificates(
         &self,
         req: crate::model::region_target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_ssl_certificates(req, options).await
     }
 
@@ -9575,8 +9552,8 @@ where
     async fn set_url_map(
         &self,
         req: crate::model::region_target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_url_map(req, options).await
     }
 
@@ -9584,22 +9561,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9633,8 +9610,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9642,8 +9619,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -9651,8 +9628,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9660,8 +9637,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -9669,22 +9646,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9718,8 +9695,8 @@ where
     async fn delete(
         &self,
         req: crate::model::region_url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -9727,8 +9704,8 @@ where
     async fn get(
         &self,
         req: crate::model::region_url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMap>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMap>> {
         self.inner.get(req, options).await
     }
 
@@ -9736,8 +9713,8 @@ where
     async fn insert(
         &self,
         req: crate::model::region_url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -9745,8 +9722,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapList>> {
         self.inner.list(req, options).await
     }
 
@@ -9754,8 +9731,8 @@ where
     async fn patch(
         &self,
         req: crate::model::region_url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -9763,8 +9740,8 @@ where
     async fn update(
         &self,
         req: crate::model::region_url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -9772,8 +9749,8 @@ where
     async fn validate(
         &self,
         req: crate::model::region_url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapsValidateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapsValidateResponse>> {
         self.inner.validate(req, options).await
     }
 
@@ -9781,22 +9758,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9830,8 +9807,8 @@ where
     async fn list(
         &self,
         req: crate::model::region_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ZoneList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ZoneList>> {
         self.inner.list(req, options).await
     }
 }
@@ -9865,8 +9842,8 @@ where
     async fn get(
         &self,
         req: crate::model::regions::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Region>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Region>> {
         self.inner.get(req, options).await
     }
 
@@ -9874,8 +9851,8 @@ where
     async fn list(
         &self,
         req: crate::model::regions::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionList>> {
         self.inner.list(req, options).await
     }
 }
@@ -9909,8 +9886,8 @@ where
     async fn get(
         &self,
         req: crate::model::reservation_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationBlocksGetResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationBlocksGetResponse>> {
         self.inner.get(req, options).await
     }
 
@@ -9918,8 +9895,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -9927,8 +9904,8 @@ where
     async fn list(
         &self,
         req: crate::model::reservation_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationBlocksListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationBlocksListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -9936,8 +9913,8 @@ where
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.perform_maintenance(req, options).await
     }
 
@@ -9945,8 +9922,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -9954,8 +9931,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -9963,22 +9940,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10012,8 +9989,8 @@ where
     async fn get(
         &self,
         req: crate::model::reservation_slots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSlotsGetResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSlotsGetResponse>> {
         self.inner.get(req, options).await
     }
 
@@ -10021,8 +9998,8 @@ where
     async fn list(
         &self,
         req: crate::model::reservation_slots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSlotsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSlotsListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -10030,8 +10007,8 @@ where
     async fn update(
         &self,
         req: crate::model::reservation_slots::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -10039,22 +10016,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10088,8 +10065,8 @@ where
     async fn get(
         &self,
         req: crate::model::reservation_sub_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSubBlocksGetResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSubBlocksGetResponse>> {
         self.inner.get(req, options).await
     }
 
@@ -10097,8 +10074,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -10106,8 +10083,8 @@ where
     async fn list(
         &self,
         req: crate::model::reservation_sub_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSubBlocksListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSubBlocksListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -10115,8 +10092,8 @@ where
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_sub_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.perform_maintenance(req, options).await
     }
 
@@ -10124,8 +10101,8 @@ where
     async fn report_faulty(
         &self,
         req: crate::model::reservation_sub_blocks::ReportFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.report_faulty(req, options).await
     }
 
@@ -10133,8 +10110,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -10142,8 +10119,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_sub_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -10151,22 +10128,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10200,8 +10177,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -10209,8 +10186,8 @@ where
     async fn delete(
         &self,
         req: crate::model::reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -10218,8 +10195,8 @@ where
     async fn get(
         &self,
         req: crate::model::reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         self.inner.get(req, options).await
     }
 
@@ -10227,8 +10204,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::reservations::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -10236,8 +10213,8 @@ where
     async fn insert(
         &self,
         req: crate::model::reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -10245,8 +10222,8 @@ where
     async fn list(
         &self,
         req: crate::model::reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationList>> {
         self.inner.list(req, options).await
     }
 
@@ -10254,8 +10231,8 @@ where
     async fn perform_maintenance(
         &self,
         req: crate::model::reservations::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.perform_maintenance(req, options).await
     }
 
@@ -10263,8 +10240,8 @@ where
     async fn resize(
         &self,
         req: crate::model::reservations::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.resize(req, options).await
     }
 
@@ -10272,8 +10249,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::reservations::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -10281,8 +10258,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservations::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -10290,8 +10267,8 @@ where
     async fn update(
         &self,
         req: crate::model::reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -10299,22 +10276,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10348,8 +10325,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::resource_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourcePolicyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourcePolicyAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -10357,8 +10334,8 @@ where
     async fn delete(
         &self,
         req: crate::model::resource_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -10366,8 +10343,8 @@ where
     async fn get(
         &self,
         req: crate::model::resource_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourcePolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourcePolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -10375,8 +10352,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::resource_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -10384,8 +10361,8 @@ where
     async fn insert(
         &self,
         req: crate::model::resource_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -10393,8 +10370,8 @@ where
     async fn list(
         &self,
         req: crate::model::resource_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourcePolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourcePolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -10402,8 +10379,8 @@ where
     async fn patch(
         &self,
         req: crate::model::resource_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -10411,8 +10388,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::resource_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -10420,8 +10397,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::resource_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -10429,22 +10406,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10478,8 +10455,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::routers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouterAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouterAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -10487,8 +10464,8 @@ where
     async fn delete(
         &self,
         req: crate::model::routers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -10496,8 +10473,8 @@ where
     async fn delete_route_policy(
         &self,
         req: crate::model::routers::DeleteRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete_route_policy(req, options).await
     }
 
@@ -10505,8 +10482,8 @@ where
     async fn get(
         &self,
         req: crate::model::routers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Router>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Router>> {
         self.inner.get(req, options).await
     }
 
@@ -10514,8 +10491,8 @@ where
     async fn get_nat_ip_info(
         &self,
         req: crate::model::routers::GetNatIpInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NatIpInfoResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NatIpInfoResponse>> {
         self.inner.get_nat_ip_info(req, options).await
     }
 
@@ -10523,8 +10500,8 @@ where
     async fn get_nat_mapping_info(
         &self,
         req: crate::model::routers::GetNatMappingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VmEndpointNatMappingsList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VmEndpointNatMappingsList>> {
         self.inner.get_nat_mapping_info(req, options).await
     }
 
@@ -10532,8 +10509,8 @@ where
     async fn get_route_policy(
         &self,
         req: crate::model::routers::GetRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersGetRoutePolicyResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersGetRoutePolicyResponse>> {
         self.inner.get_route_policy(req, options).await
     }
 
@@ -10541,8 +10518,8 @@ where
     async fn get_router_status(
         &self,
         req: crate::model::routers::GetRouterStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouterStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouterStatusResponse>> {
         self.inner.get_router_status(req, options).await
     }
 
@@ -10550,8 +10527,8 @@ where
     async fn insert(
         &self,
         req: crate::model::routers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -10559,8 +10536,8 @@ where
     async fn list(
         &self,
         req: crate::model::routers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouterList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouterList>> {
         self.inner.list(req, options).await
     }
 
@@ -10568,8 +10545,8 @@ where
     async fn list_bgp_routes(
         &self,
         req: crate::model::routers::ListBgpRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersListBgpRoutes>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersListBgpRoutes>> {
         self.inner.list_bgp_routes(req, options).await
     }
 
@@ -10577,8 +10554,8 @@ where
     async fn list_route_policies(
         &self,
         req: crate::model::routers::ListRoutePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersListRoutePolicies>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersListRoutePolicies>> {
         self.inner.list_route_policies(req, options).await
     }
 
@@ -10586,8 +10563,8 @@ where
     async fn patch(
         &self,
         req: crate::model::routers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -10595,8 +10572,8 @@ where
     async fn patch_route_policy(
         &self,
         req: crate::model::routers::PatchRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_route_policy(req, options).await
     }
 
@@ -10604,8 +10581,8 @@ where
     async fn preview(
         &self,
         req: crate::model::routers::PreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersPreviewResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersPreviewResponse>> {
         self.inner.preview(req, options).await
     }
 
@@ -10613,8 +10590,8 @@ where
     async fn update(
         &self,
         req: crate::model::routers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -10622,8 +10599,8 @@ where
     async fn update_route_policy(
         &self,
         req: crate::model::routers::UpdateRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update_route_policy(req, options).await
     }
 
@@ -10631,22 +10608,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10680,8 +10657,8 @@ where
     async fn delete(
         &self,
         req: crate::model::routes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -10689,8 +10666,8 @@ where
     async fn get(
         &self,
         req: crate::model::routes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Route>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Route>> {
         self.inner.get(req, options).await
     }
 
@@ -10698,8 +10675,8 @@ where
     async fn insert(
         &self,
         req: crate::model::routes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -10707,8 +10684,8 @@ where
     async fn list(
         &self,
         req: crate::model::routes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouteList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouteList>> {
         self.inner.list(req, options).await
     }
 
@@ -10716,8 +10693,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::routes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -10725,22 +10702,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10774,8 +10751,8 @@ where
     async fn add_rule(
         &self,
         req: crate::model::security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_rule(req, options).await
     }
 
@@ -10783,8 +10760,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::security_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPoliciesAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPoliciesAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -10792,8 +10769,8 @@ where
     async fn delete(
         &self,
         req: crate::model::security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -10801,8 +10778,8 @@ where
     async fn get(
         &self,
         req: crate::model::security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -10810,8 +10787,8 @@ where
     async fn get_rule(
         &self,
         req: crate::model::security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyRule>> {
         self.inner.get_rule(req, options).await
     }
 
@@ -10819,8 +10796,8 @@ where
     async fn insert(
         &self,
         req: crate::model::security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -10828,8 +10805,8 @@ where
     async fn list(
         &self,
         req: crate::model::security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyList>> {
         self.inner.list(req, options).await
     }
 
@@ -10837,11 +10814,9 @@ where
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     > {
         self.inner
             .list_preconfigured_expression_sets(req, options)
@@ -10852,8 +10827,8 @@ where
     async fn patch(
         &self,
         req: crate::model::security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -10861,8 +10836,8 @@ where
     async fn patch_rule(
         &self,
         req: crate::model::security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch_rule(req, options).await
     }
 
@@ -10870,8 +10845,8 @@ where
     async fn remove_rule(
         &self,
         req: crate::model::security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_rule(req, options).await
     }
 
@@ -10879,8 +10854,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -10888,22 +10863,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10937,8 +10912,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::service_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceAttachmentAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceAttachmentAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -10946,8 +10921,8 @@ where
     async fn delete(
         &self,
         req: crate::model::service_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -10955,8 +10930,8 @@ where
     async fn get(
         &self,
         req: crate::model::service_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceAttachment>> {
         self.inner.get(req, options).await
     }
 
@@ -10964,8 +10939,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::service_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -10973,8 +10948,8 @@ where
     async fn insert(
         &self,
         req: crate::model::service_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -10982,8 +10957,8 @@ where
     async fn list(
         &self,
         req: crate::model::service_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceAttachmentList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceAttachmentList>> {
         self.inner.list(req, options).await
     }
 
@@ -10991,8 +10966,8 @@ where
     async fn patch(
         &self,
         req: crate::model::service_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -11000,8 +10975,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::service_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -11009,8 +10984,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::service_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -11018,22 +10993,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11067,8 +11042,8 @@ where
     async fn get(
         &self,
         req: crate::model::snapshot_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SnapshotSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SnapshotSettings>> {
         self.inner.get(req, options).await
     }
 
@@ -11076,8 +11051,8 @@ where
     async fn patch(
         &self,
         req: crate::model::snapshot_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -11085,22 +11060,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11134,8 +11109,8 @@ where
     async fn delete(
         &self,
         req: crate::model::snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11143,8 +11118,8 @@ where
     async fn get(
         &self,
         req: crate::model::snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         self.inner.get(req, options).await
     }
 
@@ -11152,8 +11127,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -11161,8 +11136,8 @@ where
     async fn insert(
         &self,
         req: crate::model::snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11170,8 +11145,8 @@ where
     async fn list(
         &self,
         req: crate::model::snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SnapshotList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SnapshotList>> {
         self.inner.list(req, options).await
     }
 
@@ -11179,8 +11154,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -11188,8 +11163,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -11197,8 +11172,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -11206,22 +11181,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11255,8 +11230,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_certificates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificateAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificateAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -11264,8 +11239,8 @@ where
     async fn delete(
         &self,
         req: crate::model::ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11273,8 +11248,8 @@ where
     async fn get(
         &self,
         req: crate::model::ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificate>> {
         self.inner.get(req, options).await
     }
 
@@ -11282,8 +11257,8 @@ where
     async fn insert(
         &self,
         req: crate::model::ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11291,8 +11266,8 @@ where
     async fn list(
         &self,
         req: crate::model::ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificateList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificateList>> {
         self.inner.list(req, options).await
     }
 
@@ -11300,22 +11275,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11349,8 +11324,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -11358,8 +11333,8 @@ where
     async fn delete(
         &self,
         req: crate::model::ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11367,8 +11342,8 @@ where
     async fn get(
         &self,
         req: crate::model::ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -11376,8 +11351,8 @@ where
     async fn insert(
         &self,
         req: crate::model::ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11385,8 +11360,8 @@ where
     async fn list(
         &self,
         req: crate::model::ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesList>> {
         self.inner.list(req, options).await
     }
 
@@ -11394,9 +11369,8 @@ where
     async fn list_available_features(
         &self,
         req: crate::model::ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>> {
         self.inner.list_available_features(req, options).await
     }
 
@@ -11404,8 +11378,8 @@ where
     async fn patch(
         &self,
         req: crate::model::ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -11413,22 +11387,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11462,8 +11436,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pool_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolTypeAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolTypeAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -11471,8 +11445,8 @@ where
     async fn get(
         &self,
         req: crate::model::storage_pool_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolType>> {
         self.inner.get(req, options).await
     }
 
@@ -11480,8 +11454,8 @@ where
     async fn list(
         &self,
         req: crate::model::storage_pool_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolTypeList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolTypeList>> {
         self.inner.list(req, options).await
     }
 }
@@ -11515,8 +11489,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -11524,8 +11498,8 @@ where
     async fn delete(
         &self,
         req: crate::model::storage_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11533,8 +11507,8 @@ where
     async fn get(
         &self,
         req: crate::model::storage_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePool>> {
         self.inner.get(req, options).await
     }
 
@@ -11542,8 +11516,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::storage_pools::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -11551,8 +11525,8 @@ where
     async fn insert(
         &self,
         req: crate::model::storage_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11560,8 +11534,8 @@ where
     async fn list(
         &self,
         req: crate::model::storage_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolList>> {
         self.inner.list(req, options).await
     }
 
@@ -11569,8 +11543,8 @@ where
     async fn list_disks(
         &self,
         req: crate::model::storage_pools::ListDisksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolListDisks>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolListDisks>> {
         self.inner.list_disks(req, options).await
     }
 
@@ -11578,8 +11552,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::storage_pools::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -11587,8 +11561,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::storage_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -11596,8 +11570,8 @@ where
     async fn update(
         &self,
         req: crate::model::storage_pools::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -11605,22 +11579,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11654,8 +11628,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::subnetworks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubnetworkAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubnetworkAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -11663,8 +11637,8 @@ where
     async fn delete(
         &self,
         req: crate::model::subnetworks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11672,8 +11646,8 @@ where
     async fn expand_ip_cidr_range(
         &self,
         req: crate::model::subnetworks::ExpandIpCidrRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.expand_ip_cidr_range(req, options).await
     }
 
@@ -11681,8 +11655,8 @@ where
     async fn get(
         &self,
         req: crate::model::subnetworks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Subnetwork>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Subnetwork>> {
         self.inner.get(req, options).await
     }
 
@@ -11690,8 +11664,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::subnetworks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -11699,8 +11673,8 @@ where
     async fn insert(
         &self,
         req: crate::model::subnetworks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11708,8 +11682,8 @@ where
     async fn list(
         &self,
         req: crate::model::subnetworks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubnetworkList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubnetworkList>> {
         self.inner.list(req, options).await
     }
 
@@ -11717,8 +11691,8 @@ where
     async fn list_usable(
         &self,
         req: crate::model::subnetworks::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UsableSubnetworksAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UsableSubnetworksAggregatedList>> {
         self.inner.list_usable(req, options).await
     }
 
@@ -11726,8 +11700,8 @@ where
     async fn patch(
         &self,
         req: crate::model::subnetworks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -11735,8 +11709,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::subnetworks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -11744,8 +11718,8 @@ where
     async fn set_private_ip_google_access(
         &self,
         req: crate::model::subnetworks::SetPrivateIpGoogleAccessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_private_ip_google_access(req, options).await
     }
 
@@ -11753,8 +11727,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::subnetworks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -11762,22 +11736,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11811,8 +11785,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_grpc_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11820,8 +11794,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_grpc_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetGrpcProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetGrpcProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -11829,8 +11803,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_grpc_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11838,8 +11812,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_grpc_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetGrpcProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetGrpcProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -11847,8 +11821,8 @@ where
     async fn patch(
         &self,
         req: crate::model::target_grpc_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -11856,22 +11830,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11905,8 +11879,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::target_http_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxyAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -11914,8 +11888,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -11923,8 +11897,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -11932,8 +11906,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -11941,8 +11915,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -11950,8 +11924,8 @@ where
     async fn patch(
         &self,
         req: crate::model::target_http_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -11959,8 +11933,8 @@ where
     async fn set_url_map(
         &self,
         req: crate::model::target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_url_map(req, options).await
     }
 
@@ -11968,22 +11942,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12017,8 +11991,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::target_https_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxyAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12026,8 +12000,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12035,8 +12009,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -12044,8 +12018,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12053,8 +12027,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -12062,8 +12036,8 @@ where
     async fn patch(
         &self,
         req: crate::model::target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -12071,8 +12045,8 @@ where
     async fn set_certificate_map(
         &self,
         req: crate::model::target_https_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_certificate_map(req, options).await
     }
 
@@ -12080,8 +12054,8 @@ where
     async fn set_quic_override(
         &self,
         req: crate::model::target_https_proxies::SetQuicOverrideRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_quic_override(req, options).await
     }
 
@@ -12089,8 +12063,8 @@ where
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_ssl_certificates(req, options).await
     }
 
@@ -12098,8 +12072,8 @@ where
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_https_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_ssl_policy(req, options).await
     }
 
@@ -12107,8 +12081,8 @@ where
     async fn set_url_map(
         &self,
         req: crate::model::target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_url_map(req, options).await
     }
 
@@ -12116,22 +12090,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12165,8 +12139,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::target_instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetInstanceAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetInstanceAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12174,8 +12148,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12183,8 +12157,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetInstance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetInstance>> {
         self.inner.get(req, options).await
     }
 
@@ -12192,8 +12166,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12201,8 +12175,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetInstanceList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetInstanceList>> {
         self.inner.list(req, options).await
     }
 
@@ -12210,8 +12184,8 @@ where
     async fn set_security_policy(
         &self,
         req: crate::model::target_instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_security_policy(req, options).await
     }
 
@@ -12219,8 +12193,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -12228,22 +12202,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12277,8 +12251,8 @@ where
     async fn add_health_check(
         &self,
         req: crate::model::target_pools::AddHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_health_check(req, options).await
     }
 
@@ -12286,8 +12260,8 @@ where
     async fn add_instance(
         &self,
         req: crate::model::target_pools::AddInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.add_instance(req, options).await
     }
 
@@ -12295,8 +12269,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::target_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPoolAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPoolAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12304,8 +12278,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12313,8 +12287,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPool>> {
         self.inner.get(req, options).await
     }
 
@@ -12322,8 +12296,8 @@ where
     async fn get_health(
         &self,
         req: crate::model::target_pools::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPoolInstanceHealth>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPoolInstanceHealth>> {
         self.inner.get_health(req, options).await
     }
 
@@ -12331,8 +12305,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12340,8 +12314,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPoolList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPoolList>> {
         self.inner.list(req, options).await
     }
 
@@ -12349,8 +12323,8 @@ where
     async fn remove_health_check(
         &self,
         req: crate::model::target_pools::RemoveHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_health_check(req, options).await
     }
 
@@ -12358,8 +12332,8 @@ where
     async fn remove_instance(
         &self,
         req: crate::model::target_pools::RemoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.remove_instance(req, options).await
     }
 
@@ -12367,8 +12341,8 @@ where
     async fn set_backup(
         &self,
         req: crate::model::target_pools::SetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_backup(req, options).await
     }
 
@@ -12376,8 +12350,8 @@ where
     async fn set_security_policy(
         &self,
         req: crate::model::target_pools::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_security_policy(req, options).await
     }
 
@@ -12385,8 +12359,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -12394,22 +12368,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12443,8 +12417,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_ssl_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12452,8 +12426,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_ssl_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetSslProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetSslProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -12461,8 +12435,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_ssl_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12470,8 +12444,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_ssl_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetSslProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetSslProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -12479,8 +12453,8 @@ where
     async fn set_backend_service(
         &self,
         req: crate::model::target_ssl_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_backend_service(req, options).await
     }
 
@@ -12488,8 +12462,8 @@ where
     async fn set_certificate_map(
         &self,
         req: crate::model::target_ssl_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_certificate_map(req, options).await
     }
 
@@ -12497,8 +12471,8 @@ where
     async fn set_proxy_header(
         &self,
         req: crate::model::target_ssl_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_proxy_header(req, options).await
     }
 
@@ -12506,8 +12480,8 @@ where
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_ssl_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_ssl_certificates(req, options).await
     }
 
@@ -12515,8 +12489,8 @@ where
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_ssl_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_ssl_policy(req, options).await
     }
 
@@ -12524,8 +12498,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_ssl_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -12533,22 +12507,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12582,8 +12556,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::target_tcp_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxyAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxyAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12591,8 +12565,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12600,8 +12574,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxy>> {
         self.inner.get(req, options).await
     }
 
@@ -12609,8 +12583,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12618,8 +12592,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxyList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxyList>> {
         self.inner.list(req, options).await
     }
 
@@ -12627,8 +12601,8 @@ where
     async fn set_backend_service(
         &self,
         req: crate::model::target_tcp_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_backend_service(req, options).await
     }
 
@@ -12636,8 +12610,8 @@ where
     async fn set_proxy_header(
         &self,
         req: crate::model::target_tcp_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_proxy_header(req, options).await
     }
 
@@ -12645,8 +12619,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_tcp_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -12654,22 +12628,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12703,8 +12677,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::target_vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetVpnGatewayAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetVpnGatewayAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12712,8 +12686,8 @@ where
     async fn delete(
         &self,
         req: crate::model::target_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12721,8 +12695,8 @@ where
     async fn get(
         &self,
         req: crate::model::target_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetVpnGateway>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetVpnGateway>> {
         self.inner.get(req, options).await
     }
 
@@ -12730,8 +12704,8 @@ where
     async fn insert(
         &self,
         req: crate::model::target_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12739,8 +12713,8 @@ where
     async fn list(
         &self,
         req: crate::model::target_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetVpnGatewayList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetVpnGatewayList>> {
         self.inner.list(req, options).await
     }
 
@@ -12748,8 +12722,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::target_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -12757,22 +12731,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12806,8 +12780,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::url_maps::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapsAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapsAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12815,8 +12789,8 @@ where
     async fn delete(
         &self,
         req: crate::model::url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12824,8 +12798,8 @@ where
     async fn get(
         &self,
         req: crate::model::url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMap>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMap>> {
         self.inner.get(req, options).await
     }
 
@@ -12833,8 +12807,8 @@ where
     async fn insert(
         &self,
         req: crate::model::url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12842,8 +12816,8 @@ where
     async fn invalidate_cache(
         &self,
         req: crate::model::url_maps::InvalidateCacheRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.invalidate_cache(req, options).await
     }
 
@@ -12851,8 +12825,8 @@ where
     async fn list(
         &self,
         req: crate::model::url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapList>> {
         self.inner.list(req, options).await
     }
 
@@ -12860,8 +12834,8 @@ where
     async fn patch(
         &self,
         req: crate::model::url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -12869,8 +12843,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::url_maps::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -12878,8 +12852,8 @@ where
     async fn update(
         &self,
         req: crate::model::url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -12887,8 +12861,8 @@ where
     async fn validate(
         &self,
         req: crate::model::url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapsValidateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapsValidateResponse>> {
         self.inner.validate(req, options).await
     }
 
@@ -12896,22 +12870,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12945,8 +12919,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGatewayAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGatewayAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -12954,8 +12928,8 @@ where
     async fn delete(
         &self,
         req: crate::model::vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -12963,8 +12937,8 @@ where
     async fn get(
         &self,
         req: crate::model::vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGateway>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGateway>> {
         self.inner.get(req, options).await
     }
 
@@ -12972,8 +12946,8 @@ where
     async fn get_status(
         &self,
         req: crate::model::vpn_gateways::GetStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGatewaysGetStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGatewaysGetStatusResponse>> {
         self.inner.get_status(req, options).await
     }
 
@@ -12981,8 +12955,8 @@ where
     async fn insert(
         &self,
         req: crate::model::vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -12990,8 +12964,8 @@ where
     async fn list(
         &self,
         req: crate::model::vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGatewayList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGatewayList>> {
         self.inner.list(req, options).await
     }
 
@@ -12999,8 +12973,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -13008,8 +12982,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -13017,22 +12991,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13066,8 +13040,8 @@ where
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_tunnels::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnTunnelAggregatedList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnTunnelAggregatedList>> {
         self.inner.aggregated_list(req, options).await
     }
 
@@ -13075,8 +13049,8 @@ where
     async fn delete(
         &self,
         req: crate::model::vpn_tunnels::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -13084,8 +13058,8 @@ where
     async fn get(
         &self,
         req: crate::model::vpn_tunnels::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnTunnel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnTunnel>> {
         self.inner.get(req, options).await
     }
 
@@ -13093,8 +13067,8 @@ where
     async fn insert(
         &self,
         req: crate::model::vpn_tunnels::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -13102,8 +13076,8 @@ where
     async fn list(
         &self,
         req: crate::model::vpn_tunnels::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnTunnelList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnTunnelList>> {
         self.inner.list(req, options).await
     }
 
@@ -13111,8 +13085,8 @@ where
     async fn set_labels(
         &self,
         req: crate::model::vpn_tunnels::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.set_labels(req, options).await
     }
 
@@ -13120,22 +13094,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13169,8 +13143,8 @@ where
     async fn delete(
         &self,
         req: crate::model::wire_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.delete(req, options).await
     }
 
@@ -13178,8 +13152,8 @@ where
     async fn get(
         &self,
         req: crate::model::wire_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WireGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WireGroup>> {
         self.inner.get(req, options).await
     }
 
@@ -13187,8 +13161,8 @@ where
     async fn insert(
         &self,
         req: crate::model::wire_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.insert(req, options).await
     }
 
@@ -13196,8 +13170,8 @@ where
     async fn list(
         &self,
         req: crate::model::wire_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WireGroupList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WireGroupList>> {
         self.inner.list(req, options).await
     }
 
@@ -13205,8 +13179,8 @@ where
     async fn patch(
         &self,
         req: crate::model::wire_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -13214,22 +13188,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13263,8 +13237,8 @@ where
     async fn delete(
         &self,
         req: crate::model::zone_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -13272,8 +13246,8 @@ where
     async fn get(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get(req, options).await
     }
 
@@ -13281,8 +13255,8 @@ where
     async fn list(
         &self,
         req: crate::model::zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         self.inner.list(req, options).await
     }
 
@@ -13290,8 +13264,8 @@ where
     async fn wait(
         &self,
         req: crate::model::zone_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.wait(req, options).await
     }
 }
@@ -13325,8 +13299,8 @@ where
     async fn get(
         &self,
         req: crate::model::zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Zone>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Zone>> {
         self.inner.get(req, options).await
     }
 
@@ -13334,8 +13308,8 @@ where
     async fn list(
         &self,
         req: crate::model::zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ZoneList>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ZoneList>> {
         self.inner.list(req, options).await
     }
 }
diff --git a/src/generated/cloud/compute/v1/src/transport.rs b/src/generated/cloud/compute/v1/src/transport.rs
index d602f7e141..a08637ff2c 100644
--- a/src/generated/cloud/compute/v1/src/transport.rs
+++ b/src/generated/cloud/compute/v1/src/transport.rs
@@ -14,6 +14,8 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
+#[allow(unused_imports)]
+use crate::Error;
 #[cfg(any(
     feature = "accelerator-types",
     feature = "addresses",
@@ -129,8 +131,6 @@
     feature = "zones",
 ))]
 use crate::Result;
-#[allow(unused_imports)]
-use gax::error::Error;
 
 /// Implements [AcceleratorTypes](super::stub::AcceleratorTypes) using a [gaxi::http::ReqwestClient].
 #[cfg(feature = "accelerator-types")]
@@ -150,7 +150,7 @@ impl std::fmt::Debug for AcceleratorTypes {
 
 #[cfg(feature = "accelerator-types")]
 impl AcceleratorTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -161,13 +161,13 @@ impl super::stub::AcceleratorTypes for AcceleratorTypes {
     async fn aggregated_list(
         &self,
         req: crate::model::accelerator_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AcceleratorTypeAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AcceleratorTypeAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -225,9 +225,9 @@ impl super::stub::AcceleratorTypes for AcceleratorTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -242,13 +242,13 @@ impl super::stub::AcceleratorTypes for AcceleratorTypes {
     async fn get(
         &self,
         req: crate::model::accelerator_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AcceleratorType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AcceleratorType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -295,9 +295,9 @@ impl super::stub::AcceleratorTypes for AcceleratorTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312,13 +312,13 @@ impl super::stub::AcceleratorTypes for AcceleratorTypes {
     async fn list(
         &self,
         req: crate::model::accelerator_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AcceleratorTypeList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AcceleratorTypeList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -377,9 +377,9 @@ impl super::stub::AcceleratorTypes for AcceleratorTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -410,7 +410,7 @@ impl std::fmt::Debug for Addresses {
 
 #[cfg(feature = "addresses")]
 impl Addresses {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -421,13 +421,13 @@ impl super::stub::Addresses for Addresses {
     async fn aggregated_list(
         &self,
         req: crate::model::addresses::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddressAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddressAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -485,9 +485,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -502,13 +502,13 @@ impl super::stub::Addresses for Addresses {
     async fn delete(
         &self,
         req: crate::model::addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -559,9 +559,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -576,13 +576,13 @@ impl super::stub::Addresses for Addresses {
     async fn get(
         &self,
         req: crate::model::addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Address>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Address>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -629,9 +629,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -646,13 +646,13 @@ impl super::stub::Addresses for Addresses {
     async fn insert(
         &self,
         req: crate::model::addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -693,9 +693,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -710,13 +710,13 @@ impl super::stub::Addresses for Addresses {
     async fn list(
         &self,
         req: crate::model::addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddressList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddressList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -775,9 +775,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -792,13 +792,13 @@ impl super::stub::Addresses for Addresses {
     async fn r#move(
         &self,
         req: crate::model::addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -849,9 +849,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -866,13 +866,13 @@ impl super::stub::Addresses for Addresses {
     async fn set_labels(
         &self,
         req: crate::model::addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -923,9 +923,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -940,13 +940,13 @@ impl super::stub::Addresses for Addresses {
     async fn test_iam_permissions(
         &self,
         req: crate::model::addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -993,9 +993,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1010,13 +1010,13 @@ impl super::stub::Addresses for Addresses {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1063,9 +1063,9 @@ impl super::stub::Addresses for Addresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1079,15 +1079,15 @@ impl super::stub::Addresses for Addresses {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1110,7 +1110,7 @@ impl std::fmt::Debug for Advice {
 
 #[cfg(feature = "advice")]
 impl Advice {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1121,13 +1121,13 @@ impl super::stub::Advice for Advice {
     async fn calendar_mode(
         &self,
         req: crate::model::advice::CalendarModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalendarModeAdviceResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalendarModeAdviceResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1164,9 +1164,9 @@ impl super::stub::Advice for Advice {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1197,7 +1197,7 @@ impl std::fmt::Debug for Autoscalers {
 
 #[cfg(feature = "autoscalers")]
 impl Autoscalers {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1208,13 +1208,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn aggregated_list(
         &self,
         req: crate::model::autoscalers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalerAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalerAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1272,9 +1272,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1289,13 +1289,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn delete(
         &self,
         req: crate::model::autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1346,9 +1346,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1363,13 +1363,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn get(
         &self,
         req: crate::model::autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Autoscaler>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Autoscaler>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1416,9 +1416,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1433,13 +1433,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn insert(
         &self,
         req: crate::model::autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1480,9 +1480,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1497,13 +1497,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn list(
         &self,
         req: crate::model::autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalerList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalerList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1562,9 +1562,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1579,13 +1579,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn patch(
         &self,
         req: crate::model::autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1630,9 +1630,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1647,13 +1647,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn test_iam_permissions(
         &self,
         req: crate::model::autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1700,9 +1700,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1717,13 +1717,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn update(
         &self,
         req: crate::model::autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1768,9 +1768,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1785,13 +1785,13 @@ impl super::stub::Autoscalers for Autoscalers {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1838,9 +1838,9 @@ impl super::stub::Autoscalers for Autoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1854,15 +1854,15 @@ impl super::stub::Autoscalers for Autoscalers {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1885,7 +1885,7 @@ impl std::fmt::Debug for BackendBuckets {
 
 #[cfg(feature = "backend-buckets")]
 impl BackendBuckets {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1896,13 +1896,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_buckets::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1943,9 +1943,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1960,13 +1960,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn delete(
         &self,
         req: crate::model::backend_buckets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2007,9 +2007,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2024,13 +2024,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_buckets::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2072,9 +2072,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2089,13 +2089,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn get(
         &self,
         req: crate::model::backend_buckets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendBucket>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendBucket>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2132,9 +2132,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2149,13 +2149,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_buckets::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2198,9 +2198,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2215,13 +2215,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn insert(
         &self,
         req: crate::model::backend_buckets::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2252,9 +2252,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2269,13 +2269,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn list(
         &self,
         req: crate::model::backend_buckets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendBucketList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendBucketList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2324,9 +2324,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2341,13 +2341,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn patch(
         &self,
         req: crate::model::backend_buckets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2388,9 +2388,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2405,13 +2405,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_buckets::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2452,9 +2452,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2469,13 +2469,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_buckets::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2512,9 +2512,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2529,13 +2529,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_buckets::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2572,9 +2572,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2589,13 +2589,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn update(
         &self,
         req: crate::model::backend_buckets::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2636,9 +2636,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2653,13 +2653,13 @@ impl super::stub::BackendBuckets for BackendBuckets {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2696,9 +2696,9 @@ impl super::stub::BackendBuckets for BackendBuckets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2712,15 +2712,15 @@ impl super::stub::BackendBuckets for BackendBuckets {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2743,7 +2743,7 @@ impl std::fmt::Debug for BackendServices {
 
 #[cfg(feature = "backend-services")]
 impl BackendServices {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2754,13 +2754,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn add_signed_url_key(
         &self,
         req: crate::model::backend_services::AddSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2801,9 +2801,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2818,13 +2818,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn aggregated_list(
         &self,
         req: crate::model::backend_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2882,9 +2882,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2899,13 +2899,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn delete(
         &self,
         req: crate::model::backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2946,9 +2946,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2963,13 +2963,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn delete_signed_url_key(
         &self,
         req: crate::model::backend_services::DeleteSignedUrlKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3011,9 +3011,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3028,13 +3028,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn get(
         &self,
         req: crate::model::backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3071,9 +3071,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3088,13 +3088,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn get_effective_security_policies(
         &self,
         req: crate::model::backend_services::GetEffectiveSecurityPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -3123,9 +3123,9 @@ impl super::stub::BackendServices for BackendServices {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3134,24 +3134,25 @@ impl super::stub::BackendServices for BackendServices {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_health(
         &self,
         req: crate::model::backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceGroupHealth>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceGroupHealth>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3188,9 +3189,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3205,13 +3206,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn get_iam_policy(
         &self,
         req: crate::model::backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3254,9 +3255,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3271,13 +3272,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn insert(
         &self,
         req: crate::model::backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3308,9 +3309,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3325,13 +3326,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn list(
         &self,
         req: crate::model::backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3380,9 +3381,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3397,13 +3398,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn list_usable(
         &self,
         req: crate::model::backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceListUsable>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceListUsable>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3452,9 +3453,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3469,13 +3470,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn patch(
         &self,
         req: crate::model::backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3516,9 +3517,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3533,13 +3534,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn set_edge_security_policy(
         &self,
         req: crate::model::backend_services::SetEdgeSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3580,9 +3581,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3597,13 +3598,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn set_iam_policy(
         &self,
         req: crate::model::backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3640,9 +3641,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3657,13 +3658,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn set_security_policy(
         &self,
         req: crate::model::backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3704,9 +3705,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3721,13 +3722,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn test_iam_permissions(
         &self,
         req: crate::model::backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3764,9 +3765,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3781,13 +3782,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn update(
         &self,
         req: crate::model::backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3828,9 +3829,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3845,13 +3846,13 @@ impl super::stub::BackendServices for BackendServices {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3888,9 +3889,9 @@ impl super::stub::BackendServices for BackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3904,15 +3905,15 @@ impl super::stub::BackendServices for BackendServices {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3935,7 +3936,7 @@ impl std::fmt::Debug for CrossSiteNetworks {
 
 #[cfg(feature = "cross-site-networks")]
 impl CrossSiteNetworks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3946,13 +3947,13 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
     async fn delete(
         &self,
         req: crate::model::cross_site_networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3997,9 +3998,9 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4014,13 +4015,13 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
     async fn get(
         &self,
         req: crate::model::cross_site_networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CrossSiteNetwork>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CrossSiteNetwork>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4061,9 +4062,9 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4078,13 +4079,13 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
     async fn insert(
         &self,
         req: crate::model::cross_site_networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4119,9 +4120,9 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4136,13 +4137,13 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
     async fn list(
         &self,
         req: crate::model::cross_site_networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CrossSiteNetworkList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CrossSiteNetworkList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4191,9 +4192,9 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4208,13 +4209,13 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
     async fn patch(
         &self,
         req: crate::model::cross_site_networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4275,9 +4276,9 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4292,13 +4293,13 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4335,9 +4336,9 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4351,15 +4352,15 @@ impl super::stub::CrossSiteNetworks for CrossSiteNetworks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4382,7 +4383,7 @@ impl std::fmt::Debug for DiskTypes {
 
 #[cfg(feature = "disk-types")]
 impl DiskTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -4393,13 +4394,13 @@ impl super::stub::DiskTypes for DiskTypes {
     async fn aggregated_list(
         &self,
         req: crate::model::disk_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskTypeAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskTypeAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4457,9 +4458,9 @@ impl super::stub::DiskTypes for DiskTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4474,13 +4475,13 @@ impl super::stub::DiskTypes for DiskTypes {
     async fn get(
         &self,
         req: crate::model::disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4527,9 +4528,9 @@ impl super::stub::DiskTypes for DiskTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4544,13 +4545,13 @@ impl super::stub::DiskTypes for DiskTypes {
     async fn list(
         &self,
         req: crate::model::disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskTypeList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskTypeList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4609,9 +4610,9 @@ impl super::stub::DiskTypes for DiskTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4640,7 +4641,7 @@ impl std::fmt::Debug for Disks {
 
 #[cfg(feature = "disks")]
 impl Disks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -4651,13 +4652,13 @@ impl super::stub::Disks for Disks {
     async fn add_resource_policies(
         &self,
         req: crate::model::disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4708,9 +4709,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4725,13 +4726,13 @@ impl super::stub::Disks for Disks {
     async fn aggregated_list(
         &self,
         req: crate::model::disks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4789,9 +4790,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4806,13 +4807,13 @@ impl super::stub::Disks for Disks {
     async fn bulk_insert(
         &self,
         req: crate::model::disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4853,9 +4854,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4870,13 +4871,13 @@ impl super::stub::Disks for Disks {
     async fn bulk_set_labels(
         &self,
         req: crate::model::disks::BulkSetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4921,9 +4922,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4938,13 +4939,13 @@ impl super::stub::Disks for Disks {
     async fn create_snapshot(
         &self,
         req: crate::model::disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4999,9 +5000,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5016,13 +5017,13 @@ impl super::stub::Disks for Disks {
     async fn delete(
         &self,
         req: crate::model::disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5073,9 +5074,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5090,13 +5091,13 @@ impl super::stub::Disks for Disks {
     async fn get(
         &self,
         req: crate::model::disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Disk>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Disk>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5143,9 +5144,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5160,13 +5161,13 @@ impl super::stub::Disks for Disks {
     async fn get_iam_policy(
         &self,
         req: crate::model::disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5219,9 +5220,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5236,13 +5237,13 @@ impl super::stub::Disks for Disks {
     async fn insert(
         &self,
         req: crate::model::disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5287,9 +5288,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5304,13 +5305,13 @@ impl super::stub::Disks for Disks {
     async fn list(
         &self,
         req: crate::model::disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5369,9 +5370,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5386,13 +5387,13 @@ impl super::stub::Disks for Disks {
     async fn remove_resource_policies(
         &self,
         req: crate::model::disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5443,9 +5444,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5460,13 +5461,13 @@ impl super::stub::Disks for Disks {
     async fn resize(
         &self,
         req: crate::model::disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5517,9 +5518,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5534,13 +5535,13 @@ impl super::stub::Disks for Disks {
     async fn set_iam_policy(
         &self,
         req: crate::model::disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5587,9 +5588,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5604,13 +5605,13 @@ impl super::stub::Disks for Disks {
     async fn set_labels(
         &self,
         req: crate::model::disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5661,9 +5662,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5678,13 +5679,13 @@ impl super::stub::Disks for Disks {
     async fn start_async_replication(
         &self,
         req: crate::model::disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5735,9 +5736,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5752,13 +5753,13 @@ impl super::stub::Disks for Disks {
     async fn stop_async_replication(
         &self,
         req: crate::model::disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5809,9 +5810,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5826,13 +5827,13 @@ impl super::stub::Disks for Disks {
     async fn stop_group_async_replication(
         &self,
         req: crate::model::disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5873,9 +5874,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5890,13 +5891,13 @@ impl super::stub::Disks for Disks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5943,9 +5944,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5960,13 +5961,13 @@ impl super::stub::Disks for Disks {
     async fn update(
         &self,
         req: crate::model::disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6033,9 +6034,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6050,13 +6051,13 @@ impl super::stub::Disks for Disks {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6103,9 +6104,9 @@ impl super::stub::Disks for Disks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6119,15 +6120,15 @@ impl super::stub::Disks for Disks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6150,7 +6151,7 @@ impl std::fmt::Debug for ExternalVpnGateways {
 
 #[cfg(feature = "external-vpn-gateways")]
 impl ExternalVpnGateways {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -6161,13 +6162,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn delete(
         &self,
         req: crate::model::external_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6212,9 +6213,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6229,13 +6230,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn get(
         &self,
         req: crate::model::external_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalVpnGateway>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalVpnGateway>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6276,9 +6277,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6293,13 +6294,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn insert(
         &self,
         req: crate::model::external_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6330,9 +6331,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6347,13 +6348,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn list(
         &self,
         req: crate::model::external_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExternalVpnGatewayList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExternalVpnGatewayList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6402,9 +6403,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6419,13 +6420,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn set_labels(
         &self,
         req: crate::model::external_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6462,9 +6463,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6479,13 +6480,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn test_iam_permissions(
         &self,
         req: crate::model::external_vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6522,9 +6523,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6539,13 +6540,13 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6582,9 +6583,9 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6598,15 +6599,15 @@ impl super::stub::ExternalVpnGateways for ExternalVpnGateways {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -6629,7 +6630,7 @@ impl std::fmt::Debug for FirewallPolicies {
 
 #[cfg(feature = "firewall-policies")]
 impl FirewallPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -6640,13 +6641,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn add_association(
         &self,
         req: crate::model::firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6683,9 +6684,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6700,13 +6701,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn add_rule(
         &self,
         req: crate::model::firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6737,9 +6738,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6754,13 +6755,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn clone_rules(
         &self,
         req: crate::model::firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6797,9 +6798,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6814,13 +6815,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn delete(
         &self,
         req: crate::model::firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6851,9 +6852,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6868,13 +6869,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn get(
         &self,
         req: crate::model::firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6901,9 +6902,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6918,13 +6919,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn get_association(
         &self,
         req: crate::model::firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6955,9 +6956,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6972,13 +6973,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn get_iam_policy(
         &self,
         req: crate::model::firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7011,9 +7012,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7028,13 +7029,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn get_rule(
         &self,
         req: crate::model::firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7065,9 +7066,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7082,11 +7083,11 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn insert(
         &self,
         req: crate::model::firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/compute/v1/locations/global/firewallPolicies".to_string();
@@ -7109,9 +7110,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7126,11 +7127,11 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn list(
         &self,
         req: crate::model::firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/compute/v1/locations/global/firewallPolicies".to_string();
@@ -7171,9 +7172,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7188,12 +7189,11 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn list_associations(
         &self,
         req: crate::model::firewall_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPoliciesListAssociationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPoliciesListAssociationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path =
@@ -7212,9 +7212,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7229,13 +7229,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn r#move(
         &self,
         req: crate::model::firewall_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7270,9 +7270,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7287,13 +7287,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn patch(
         &self,
         req: crate::model::firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7324,9 +7324,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7341,13 +7341,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn patch_rule(
         &self,
         req: crate::model::firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7382,9 +7382,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7399,13 +7399,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn remove_association(
         &self,
         req: crate::model::firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7440,9 +7440,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7457,13 +7457,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn remove_rule(
         &self,
         req: crate::model::firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7498,9 +7498,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7515,13 +7515,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn set_iam_policy(
         &self,
         req: crate::model::firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7548,9 +7548,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7565,13 +7565,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7598,9 +7598,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7615,13 +7615,13 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7652,9 +7652,9 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7668,15 +7668,15 @@ impl super::stub::FirewallPolicies for FirewallPolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7699,7 +7699,7 @@ impl std::fmt::Debug for Firewalls {
 
 #[cfg(feature = "firewalls")]
 impl Firewalls {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -7710,13 +7710,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn delete(
         &self,
         req: crate::model::firewalls::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7757,9 +7757,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7774,13 +7774,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn get(
         &self,
         req: crate::model::firewalls::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Firewall>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Firewall>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7817,9 +7817,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7834,13 +7834,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn insert(
         &self,
         req: crate::model::firewalls::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7871,9 +7871,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7888,13 +7888,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn list(
         &self,
         req: crate::model::firewalls::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7943,9 +7943,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7960,13 +7960,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn patch(
         &self,
         req: crate::model::firewalls::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8007,9 +8007,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8024,13 +8024,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn test_iam_permissions(
         &self,
         req: crate::model::firewalls::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8067,9 +8067,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8084,13 +8084,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn update(
         &self,
         req: crate::model::firewalls::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8131,9 +8131,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8148,13 +8148,13 @@ impl super::stub::Firewalls for Firewalls {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8191,9 +8191,9 @@ impl super::stub::Firewalls for Firewalls {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8207,15 +8207,15 @@ impl super::stub::Firewalls for Firewalls {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8238,7 +8238,7 @@ impl std::fmt::Debug for ForwardingRules {
 
 #[cfg(feature = "forwarding-rules")]
 impl ForwardingRules {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8249,13 +8249,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn aggregated_list(
         &self,
         req: crate::model::forwarding_rules::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRuleAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRuleAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8313,9 +8313,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8330,13 +8330,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn delete(
         &self,
         req: crate::model::forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8387,9 +8387,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8404,13 +8404,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn get(
         &self,
         req: crate::model::forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8457,9 +8457,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8474,13 +8474,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn insert(
         &self,
         req: crate::model::forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8521,9 +8521,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8538,13 +8538,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn list(
         &self,
         req: crate::model::forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRuleList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRuleList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8603,9 +8603,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8620,13 +8620,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn patch(
         &self,
         req: crate::model::forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8677,9 +8677,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8694,13 +8694,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn set_labels(
         &self,
         req: crate::model::forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8751,9 +8751,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8768,13 +8768,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn set_target(
         &self,
         req: crate::model::forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8825,9 +8825,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8842,13 +8842,13 @@ impl super::stub::ForwardingRules for ForwardingRules {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8895,9 +8895,9 @@ impl super::stub::ForwardingRules for ForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8911,15 +8911,15 @@ impl super::stub::ForwardingRules for ForwardingRules {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8942,7 +8942,7 @@ impl std::fmt::Debug for FutureReservations {
 
 #[cfg(feature = "future-reservations")]
 impl FutureReservations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8953,14 +8953,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn aggregated_list(
         &self,
         req: crate::model::future_reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FutureReservationsAggregatedListResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FutureReservationsAggregatedListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9018,9 +9017,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9035,13 +9034,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn cancel(
         &self,
         req: crate::model::future_reservations::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9096,9 +9095,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9113,13 +9112,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn delete(
         &self,
         req: crate::model::future_reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9174,9 +9173,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9191,13 +9190,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn get(
         &self,
         req: crate::model::future_reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FutureReservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FutureReservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9248,9 +9247,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9265,13 +9264,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn insert(
         &self,
         req: crate::model::future_reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9312,9 +9311,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9329,13 +9328,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn list(
         &self,
         req: crate::model::future_reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FutureReservationsListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FutureReservationsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9394,9 +9393,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9411,13 +9410,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn update(
         &self,
         req: crate::model::future_reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9484,9 +9483,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9501,13 +9500,13 @@ impl super::stub::FutureReservations for FutureReservations {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9554,9 +9553,9 @@ impl super::stub::FutureReservations for FutureReservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9570,15 +9569,15 @@ impl super::stub::FutureReservations for FutureReservations {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9601,7 +9600,7 @@ impl std::fmt::Debug for GlobalAddresses {
 
 #[cfg(feature = "global-addresses")]
 impl GlobalAddresses {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -9612,13 +9611,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn delete(
         &self,
         req: crate::model::global_addresses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9659,9 +9658,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9676,13 +9675,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn get(
         &self,
         req: crate::model::global_addresses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Address>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Address>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9719,9 +9718,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9736,13 +9735,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn insert(
         &self,
         req: crate::model::global_addresses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9773,9 +9772,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9790,13 +9789,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn list(
         &self,
         req: crate::model::global_addresses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddressList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddressList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9845,9 +9844,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9862,13 +9861,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn r#move(
         &self,
         req: crate::model::global_addresses::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9909,9 +9908,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9926,13 +9925,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn set_labels(
         &self,
         req: crate::model::global_addresses::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9969,9 +9968,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9986,13 +9985,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn test_iam_permissions(
         &self,
         req: crate::model::global_addresses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10029,9 +10028,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10046,13 +10045,13 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10089,9 +10088,9 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10105,15 +10104,15 @@ impl super::stub::GlobalAddresses for GlobalAddresses {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10136,7 +10135,7 @@ impl std::fmt::Debug for GlobalForwardingRules {
 
 #[cfg(feature = "global-forwarding-rules")]
 impl GlobalForwardingRules {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -10147,13 +10146,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn delete(
         &self,
         req: crate::model::global_forwarding_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10194,9 +10193,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10211,13 +10210,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn get(
         &self,
         req: crate::model::global_forwarding_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10254,9 +10253,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10271,13 +10270,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn insert(
         &self,
         req: crate::model::global_forwarding_rules::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10308,9 +10307,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10325,13 +10324,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn list(
         &self,
         req: crate::model::global_forwarding_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ForwardingRuleList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ForwardingRuleList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10380,9 +10379,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10397,13 +10396,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn patch(
         &self,
         req: crate::model::global_forwarding_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10444,9 +10443,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10461,13 +10460,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn set_labels(
         &self,
         req: crate::model::global_forwarding_rules::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10504,9 +10503,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10521,13 +10520,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn set_target(
         &self,
         req: crate::model::global_forwarding_rules::SetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10568,9 +10567,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10585,13 +10584,13 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10628,9 +10627,9 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10644,15 +10643,15 @@ impl super::stub::GlobalForwardingRules for GlobalForwardingRules {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10675,7 +10674,7 @@ impl std::fmt::Debug for GlobalNetworkEndpointGroups {
 
 #[cfg(feature = "global-network-endpoint-groups")]
 impl GlobalNetworkEndpointGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -10686,13 +10685,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -10722,9 +10721,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10739,13 +10738,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn delete(
         &self,
         req: crate::model::global_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10790,9 +10789,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10807,13 +10806,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn detach_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -10843,9 +10842,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10860,13 +10859,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn get(
         &self,
         req: crate::model::global_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10907,9 +10906,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10924,13 +10923,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn insert(
         &self,
         req: crate::model::global_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10961,9 +10960,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10978,13 +10977,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn list(
         &self,
         req: crate::model::global_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11033,9 +11032,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11050,14 +11049,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn list_network_endpoints(
         &self,
         req: crate::model::global_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11120,9 +11118,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11137,13 +11135,13 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11180,9 +11178,9 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11196,15 +11194,15 @@ impl super::stub::GlobalNetworkEndpointGroups for GlobalNetworkEndpointGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11227,7 +11225,7 @@ impl std::fmt::Debug for GlobalOperations {
 
 #[cfg(feature = "global-operations")]
 impl GlobalOperations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11238,13 +11236,13 @@ impl super::stub::GlobalOperations for GlobalOperations {
     async fn aggregated_list(
         &self,
         req: crate::model::global_operations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11302,9 +11300,9 @@ impl super::stub::GlobalOperations for GlobalOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11319,13 +11317,13 @@ impl super::stub::GlobalOperations for GlobalOperations {
     async fn delete(
         &self,
         req: crate::model::global_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11362,9 +11360,9 @@ impl super::stub::GlobalOperations for GlobalOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11373,24 +11371,25 @@ impl super::stub::GlobalOperations for GlobalOperations {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11427,9 +11426,9 @@ impl super::stub::GlobalOperations for GlobalOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11444,13 +11443,13 @@ impl super::stub::GlobalOperations for GlobalOperations {
     async fn list(
         &self,
         req: crate::model::global_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11499,9 +11498,9 @@ impl super::stub::GlobalOperations for GlobalOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11516,13 +11515,13 @@ impl super::stub::GlobalOperations for GlobalOperations {
     async fn wait(
         &self,
         req: crate::model::global_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11559,9 +11558,9 @@ impl super::stub::GlobalOperations for GlobalOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11592,7 +11591,7 @@ impl std::fmt::Debug for GlobalOrganizationOperations {
 
 #[cfg(feature = "global-organization-operations")]
 impl GlobalOrganizationOperations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11603,13 +11602,13 @@ impl super::stub::GlobalOrganizationOperations for GlobalOrganizationOperations
     async fn delete(
         &self,
         req: crate::model::global_organization_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11640,9 +11639,9 @@ impl super::stub::GlobalOrganizationOperations for GlobalOrganizationOperations
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11651,24 +11650,25 @@ impl super::stub::GlobalOrganizationOperations for GlobalOrganizationOperations
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11699,9 +11699,9 @@ impl super::stub::GlobalOrganizationOperations for GlobalOrganizationOperations
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11716,11 +11716,11 @@ impl super::stub::GlobalOrganizationOperations for GlobalOrganizationOperations
     async fn list(
         &self,
         req: crate::model::global_organization_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/compute/v1/locations/global/operations".to_string();
@@ -11761,9 +11761,9 @@ impl super::stub::GlobalOrganizationOperations for GlobalOrganizationOperations
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11794,7 +11794,7 @@ impl std::fmt::Debug for GlobalPublicDelegatedPrefixes {
 
 #[cfg(feature = "global-public-delegated-prefixes")]
 impl GlobalPublicDelegatedPrefixes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11805,13 +11805,13 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
     async fn delete(
         &self,
         req: crate::model::global_public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11856,9 +11856,9 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11873,13 +11873,13 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
     async fn get(
         &self,
         req: crate::model::global_public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefix>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefix>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11920,9 +11920,9 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11937,13 +11937,13 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
     async fn insert(
         &self,
         req: crate::model::global_public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11974,9 +11974,9 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11991,13 +11991,13 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
     async fn list(
         &self,
         req: crate::model::global_public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefixList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12046,9 +12046,9 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12063,13 +12063,13 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
     async fn patch(
         &self,
         req: crate::model::global_public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12114,9 +12114,9 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12131,13 +12131,13 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12174,9 +12174,9 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12190,15 +12190,15 @@ impl super::stub::GlobalPublicDelegatedPrefixes for GlobalPublicDelegatedPrefixe
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12221,7 +12221,7 @@ impl std::fmt::Debug for HealthChecks {
 
 #[cfg(feature = "health-checks")]
 impl HealthChecks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -12232,13 +12232,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn aggregated_list(
         &self,
         req: crate::model::health_checks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthChecksAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthChecksAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12296,9 +12296,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12313,13 +12313,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn delete(
         &self,
         req: crate::model::health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12360,9 +12360,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12377,13 +12377,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn get(
         &self,
         req: crate::model::health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheck>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheck>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12420,9 +12420,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12437,13 +12437,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn insert(
         &self,
         req: crate::model::health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12474,9 +12474,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12491,13 +12491,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn list(
         &self,
         req: crate::model::health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12546,9 +12546,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12563,13 +12563,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn patch(
         &self,
         req: crate::model::health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12610,9 +12610,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12627,13 +12627,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12670,9 +12670,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12687,13 +12687,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn update(
         &self,
         req: crate::model::health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12734,9 +12734,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12751,13 +12751,13 @@ impl super::stub::HealthChecks for HealthChecks {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12794,9 +12794,9 @@ impl super::stub::HealthChecks for HealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12810,15 +12810,15 @@ impl super::stub::HealthChecks for HealthChecks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12841,7 +12841,7 @@ impl std::fmt::Debug for HttpHealthChecks {
 
 #[cfg(feature = "http-health-checks")]
 impl HttpHealthChecks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -12852,13 +12852,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn delete(
         &self,
         req: crate::model::http_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12899,9 +12899,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12916,13 +12916,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn get(
         &self,
         req: crate::model::http_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpHealthCheck>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpHealthCheck>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12959,9 +12959,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12976,13 +12976,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn insert(
         &self,
         req: crate::model::http_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13013,9 +13013,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13030,13 +13030,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn list(
         &self,
         req: crate::model::http_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpHealthCheckList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpHealthCheckList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13085,9 +13085,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13102,13 +13102,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn patch(
         &self,
         req: crate::model::http_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13149,9 +13149,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13166,13 +13166,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::http_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13209,9 +13209,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13226,13 +13226,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn update(
         &self,
         req: crate::model::http_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13273,9 +13273,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13290,13 +13290,13 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13333,9 +13333,9 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13349,15 +13349,15 @@ impl super::stub::HttpHealthChecks for HttpHealthChecks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13380,7 +13380,7 @@ impl std::fmt::Debug for HttpsHealthChecks {
 
 #[cfg(feature = "https-health-checks")]
 impl HttpsHealthChecks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13391,13 +13391,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn delete(
         &self,
         req: crate::model::https_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13442,9 +13442,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13459,13 +13459,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn get(
         &self,
         req: crate::model::https_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpsHealthCheck>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpsHealthCheck>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13506,9 +13506,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13523,13 +13523,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn insert(
         &self,
         req: crate::model::https_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13560,9 +13560,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13577,13 +13577,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn list(
         &self,
         req: crate::model::https_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HttpsHealthCheckList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HttpsHealthCheckList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13632,9 +13632,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13649,13 +13649,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn patch(
         &self,
         req: crate::model::https_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13700,9 +13700,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13717,13 +13717,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::https_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13760,9 +13760,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13777,13 +13777,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn update(
         &self,
         req: crate::model::https_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13828,9 +13828,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13845,13 +13845,13 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13888,9 +13888,9 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13904,15 +13904,15 @@ impl super::stub::HttpsHealthChecks for HttpsHealthChecks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13935,7 +13935,7 @@ impl std::fmt::Debug for ImageFamilyViews {
 
 #[cfg(feature = "image-family-views")]
 impl ImageFamilyViews {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13946,13 +13946,13 @@ impl super::stub::ImageFamilyViews for ImageFamilyViews {
     async fn get(
         &self,
         req: crate::model::image_family_views::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImageFamilyView>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImageFamilyView>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13999,9 +13999,9 @@ impl super::stub::ImageFamilyViews for ImageFamilyViews {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14032,7 +14032,7 @@ impl std::fmt::Debug for Images {
 
 #[cfg(feature = "images")]
 impl Images {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -14043,13 +14043,13 @@ impl super::stub::Images for Images {
     async fn delete(
         &self,
         req: crate::model::images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14090,9 +14090,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14107,13 +14107,13 @@ impl super::stub::Images for Images {
     async fn deprecate(
         &self,
         req: crate::model::images::DeprecateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14154,9 +14154,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14171,13 +14171,13 @@ impl super::stub::Images for Images {
     async fn get(
         &self,
         req: crate::model::images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Image>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Image>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14214,9 +14214,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14231,13 +14231,13 @@ impl super::stub::Images for Images {
     async fn get_from_family(
         &self,
         req: crate::model::images::GetFromFamilyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Image>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Image>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14274,9 +14274,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14291,13 +14291,13 @@ impl super::stub::Images for Images {
     async fn get_iam_policy(
         &self,
         req: crate::model::images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14340,9 +14340,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14357,13 +14357,13 @@ impl super::stub::Images for Images {
     async fn insert(
         &self,
         req: crate::model::images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14398,9 +14398,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14415,13 +14415,13 @@ impl super::stub::Images for Images {
     async fn list(
         &self,
         req: crate::model::images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImageList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImageList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14470,9 +14470,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14487,13 +14487,13 @@ impl super::stub::Images for Images {
     async fn patch(
         &self,
         req: crate::model::images::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14534,9 +14534,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14551,13 +14551,13 @@ impl super::stub::Images for Images {
     async fn set_iam_policy(
         &self,
         req: crate::model::images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14594,9 +14594,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14611,13 +14611,13 @@ impl super::stub::Images for Images {
     async fn set_labels(
         &self,
         req: crate::model::images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14654,9 +14654,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14671,13 +14671,13 @@ impl super::stub::Images for Images {
     async fn test_iam_permissions(
         &self,
         req: crate::model::images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14714,9 +14714,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14731,13 +14731,13 @@ impl super::stub::Images for Images {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14774,9 +14774,9 @@ impl super::stub::Images for Images {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14790,15 +14790,15 @@ impl super::stub::Images for Images {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -14821,7 +14821,7 @@ impl std::fmt::Debug for InstanceGroupManagerResizeRequests {
 
 #[cfg(feature = "instance-group-manager-resize-requests")]
 impl InstanceGroupManagerResizeRequests {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -14832,13 +14832,13 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
     async fn cancel(
         &self,
         req: crate::model::instance_group_manager_resize_requests::CancelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -14880,9 +14880,9 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14897,13 +14897,13 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
     async fn delete(
         &self,
         req: crate::model::instance_group_manager_resize_requests::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14968,9 +14968,9 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14985,13 +14985,13 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
     async fn get(
         &self,
         req: crate::model::instance_group_manager_resize_requests::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerResizeRequest>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerResizeRequest>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15052,9 +15052,9 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15069,13 +15069,13 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
     async fn insert(
         &self,
         req: crate::model::instance_group_manager_resize_requests::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15130,9 +15130,9 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15147,14 +15147,13 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
     async fn list(
         &self,
         req: crate::model::instance_group_manager_resize_requests::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerResizeRequestsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15227,9 +15226,9 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15244,13 +15243,13 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15297,9 +15296,9 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15313,15 +15312,15 @@ impl super::stub::InstanceGroupManagerResizeRequests for InstanceGroupManagerRes
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -15344,7 +15343,7 @@ impl std::fmt::Debug for InstanceGroupManagers {
 
 #[cfg(feature = "instance-group-managers")]
 impl InstanceGroupManagers {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -15355,13 +15354,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn abandon_instances(
         &self,
         req: crate::model::instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15416,9 +15415,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15433,13 +15432,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_group_managers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15497,9 +15496,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15514,13 +15513,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -15555,9 +15554,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15572,13 +15571,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn create_instances(
         &self,
         req: crate::model::instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15633,9 +15632,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15650,13 +15649,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn delete(
         &self,
         req: crate::model::instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15711,9 +15710,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15728,13 +15727,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn delete_instances(
         &self,
         req: crate::model::instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15789,9 +15788,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15806,13 +15805,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -15847,9 +15846,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15864,13 +15863,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn get(
         &self,
         req: crate::model::instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManager>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManager>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15921,9 +15920,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15938,13 +15937,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn insert(
         &self,
         req: crate::model::instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15985,9 +15984,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16002,13 +16001,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn list(
         &self,
         req: crate::model::instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagerList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagerList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16067,9 +16066,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16084,14 +16083,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn list_errors(
         &self,
         req: crate::model::instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManagersListErrorsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagersListErrorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16164,9 +16162,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16181,15 +16179,14 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn list_managed_instances(
         &self,
         req: crate::model::instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagersListManagedInstancesResponse>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -16229,9 +16226,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16246,15 +16243,14 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn list_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManagersListPerInstanceConfigsResp>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -16294,9 +16290,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16311,13 +16307,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn patch(
         &self,
         req: crate::model::instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16372,9 +16368,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16389,13 +16385,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -16431,9 +16427,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16448,13 +16444,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn recreate_instances(
         &self,
         req: crate::model::instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16509,9 +16505,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16526,13 +16522,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn resize(
         &self,
         req: crate::model::instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16588,9 +16584,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16605,13 +16601,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn resume_instances(
         &self,
         req: crate::model::instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16666,9 +16662,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16683,13 +16679,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn set_instance_template(
         &self,
         req: crate::model::instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16744,9 +16740,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16761,13 +16757,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn set_target_pools(
         &self,
         req: crate::model::instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16822,9 +16818,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16839,13 +16835,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn start_instances(
         &self,
         req: crate::model::instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16900,9 +16896,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16917,13 +16913,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn stop_instances(
         &self,
         req: crate::model::instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16978,9 +16974,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16995,13 +16991,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn suspend_instances(
         &self,
         req: crate::model::instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17056,9 +17052,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17073,13 +17069,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn update_per_instance_configs(
         &self,
         req: crate::model::instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -17115,9 +17111,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17132,13 +17128,13 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17185,9 +17181,9 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17201,15 +17197,15 @@ impl super::stub::InstanceGroupManagers for InstanceGroupManagers {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -17232,7 +17228,7 @@ impl std::fmt::Debug for InstanceGroups {
 
 #[cfg(feature = "instance-groups")]
 impl InstanceGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -17243,13 +17239,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn add_instances(
         &self,
         req: crate::model::instance_groups::AddInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17300,9 +17296,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17317,13 +17313,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17381,9 +17377,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17398,13 +17394,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn delete(
         &self,
         req: crate::model::instance_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17455,9 +17451,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17472,13 +17468,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn get(
         &self,
         req: crate::model::instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17525,9 +17521,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17542,13 +17538,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn insert(
         &self,
         req: crate::model::instance_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17589,9 +17585,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17606,13 +17602,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn list(
         &self,
         req: crate::model::instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17671,9 +17667,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17688,13 +17684,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn list_instances(
         &self,
         req: crate::model::instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupsListInstances>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupsListInstances>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17763,9 +17759,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17780,13 +17776,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn remove_instances(
         &self,
         req: crate::model::instance_groups::RemoveInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17837,9 +17833,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17854,13 +17850,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn set_named_ports(
         &self,
         req: crate::model::instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17911,9 +17907,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17928,13 +17924,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17981,9 +17977,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17998,13 +17994,13 @@ impl super::stub::InstanceGroups for InstanceGroups {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18051,9 +18047,9 @@ impl super::stub::InstanceGroups for InstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18067,15 +18063,15 @@ impl super::stub::InstanceGroups for InstanceGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -18098,7 +18094,7 @@ impl std::fmt::Debug for InstanceSettings {
 
 #[cfg(feature = "instance-settings")]
 impl InstanceSettings {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18109,13 +18105,13 @@ impl super::stub::InstanceSettings for InstanceSettings {
     async fn get(
         &self,
         req: crate::model::instance_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18152,9 +18148,9 @@ impl super::stub::InstanceSettings for InstanceSettings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18169,13 +18165,13 @@ impl super::stub::InstanceSettings for InstanceSettings {
     async fn patch(
         &self,
         req: crate::model::instance_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18228,9 +18224,9 @@ impl super::stub::InstanceSettings for InstanceSettings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18245,13 +18241,13 @@ impl super::stub::InstanceSettings for InstanceSettings {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18298,9 +18294,9 @@ impl super::stub::InstanceSettings for InstanceSettings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18314,15 +18310,15 @@ impl super::stub::InstanceSettings for InstanceSettings {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -18345,7 +18341,7 @@ impl std::fmt::Debug for InstanceTemplates {
 
 #[cfg(feature = "instance-templates")]
 impl InstanceTemplates {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18356,13 +18352,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn aggregated_list(
         &self,
         req: crate::model::instance_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplateAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplateAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18420,9 +18416,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18437,13 +18433,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn delete(
         &self,
         req: crate::model::instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18484,9 +18480,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18501,13 +18497,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn get(
         &self,
         req: crate::model::instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18544,9 +18540,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18561,13 +18557,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn get_iam_policy(
         &self,
         req: crate::model::instance_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18610,9 +18606,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18627,13 +18623,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn insert(
         &self,
         req: crate::model::instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18664,9 +18660,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18681,13 +18677,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn list(
         &self,
         req: crate::model::instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplateList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplateList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18736,9 +18732,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18753,13 +18749,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn set_iam_policy(
         &self,
         req: crate::model::instance_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18796,9 +18792,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18813,13 +18809,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instance_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18856,9 +18852,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18873,13 +18869,13 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18916,9 +18912,9 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18932,15 +18928,15 @@ impl super::stub::InstanceTemplates for InstanceTemplates {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -18963,7 +18959,7 @@ impl std::fmt::Debug for Instances {
 
 #[cfg(feature = "instances")]
 impl Instances {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18974,13 +18970,13 @@ impl super::stub::Instances for Instances {
     async fn add_access_config(
         &self,
         req: crate::model::instances::AddAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19032,9 +19028,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19049,13 +19045,13 @@ impl super::stub::Instances for Instances {
     async fn add_network_interface(
         &self,
         req: crate::model::instances::AddNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19106,9 +19102,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19123,13 +19119,13 @@ impl super::stub::Instances for Instances {
     async fn add_resource_policies(
         &self,
         req: crate::model::instances::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19180,9 +19176,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19197,13 +19193,13 @@ impl super::stub::Instances for Instances {
     async fn aggregated_list(
         &self,
         req: crate::model::instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19261,9 +19257,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19278,13 +19274,13 @@ impl super::stub::Instances for Instances {
     async fn attach_disk(
         &self,
         req: crate::model::instances::AttachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19339,9 +19335,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19356,13 +19352,13 @@ impl super::stub::Instances for Instances {
     async fn bulk_insert(
         &self,
         req: crate::model::instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19403,9 +19399,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19420,13 +19416,13 @@ impl super::stub::Instances for Instances {
     async fn delete(
         &self,
         req: crate::model::instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19477,9 +19473,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19494,13 +19490,13 @@ impl super::stub::Instances for Instances {
     async fn delete_access_config(
         &self,
         req: crate::model::instances::DeleteAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19553,9 +19549,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19570,13 +19566,13 @@ impl super::stub::Instances for Instances {
     async fn delete_network_interface(
         &self,
         req: crate::model::instances::DeleteNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19629,9 +19625,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19646,13 +19642,13 @@ impl super::stub::Instances for Instances {
     async fn detach_disk(
         &self,
         req: crate::model::instances::DetachDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19704,9 +19700,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19721,13 +19717,13 @@ impl super::stub::Instances for Instances {
     async fn get(
         &self,
         req: crate::model::instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19774,9 +19770,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19791,13 +19787,13 @@ impl super::stub::Instances for Instances {
     async fn get_effective_firewalls(
         &self,
         req: crate::model::instances::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstancesGetEffectiveFirewallsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstancesGetEffectiveFirewallsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19845,9 +19841,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19862,13 +19858,13 @@ impl super::stub::Instances for Instances {
     async fn get_guest_attributes(
         &self,
         req: crate::model::instances::GetGuestAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GuestAttributes>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GuestAttributes>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19923,9 +19919,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19940,13 +19936,13 @@ impl super::stub::Instances for Instances {
     async fn get_iam_policy(
         &self,
         req: crate::model::instances::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19999,9 +19995,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20016,13 +20012,13 @@ impl super::stub::Instances for Instances {
     async fn get_screenshot(
         &self,
         req: crate::model::instances::GetScreenshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Screenshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Screenshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20069,9 +20065,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20086,13 +20082,13 @@ impl super::stub::Instances for Instances {
     async fn get_serial_port_output(
         &self,
         req: crate::model::instances::GetSerialPortOutputRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SerialPortOutput>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SerialPortOutput>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20147,9 +20143,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20164,13 +20160,13 @@ impl super::stub::Instances for Instances {
     async fn get_shielded_instance_identity(
         &self,
         req: crate::model::instances::GetShieldedInstanceIdentityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ShieldedInstanceIdentity>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ShieldedInstanceIdentity>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20217,9 +20213,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20234,13 +20230,13 @@ impl super::stub::Instances for Instances {
     async fn insert(
         &self,
         req: crate::model::instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20290,9 +20286,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20307,13 +20303,13 @@ impl super::stub::Instances for Instances {
     async fn list(
         &self,
         req: crate::model::instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20372,9 +20368,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20389,13 +20385,13 @@ impl super::stub::Instances for Instances {
     async fn list_referrers(
         &self,
         req: crate::model::instances::ListReferrersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceListReferrers>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceListReferrers>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20464,9 +20460,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20481,13 +20477,13 @@ impl super::stub::Instances for Instances {
     async fn perform_maintenance(
         &self,
         req: crate::model::instances::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20538,9 +20534,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20555,13 +20551,13 @@ impl super::stub::Instances for Instances {
     async fn remove_resource_policies(
         &self,
         req: crate::model::instances::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20612,9 +20608,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20629,13 +20625,13 @@ impl super::stub::Instances for Instances {
     async fn report_host_as_faulty(
         &self,
         req: crate::model::instances::ReportHostAsFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20686,9 +20682,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20703,13 +20699,13 @@ impl super::stub::Instances for Instances {
     async fn reset(
         &self,
         req: crate::model::instances::ResetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20760,9 +20756,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20777,13 +20773,13 @@ impl super::stub::Instances for Instances {
     async fn resume(
         &self,
         req: crate::model::instances::ResumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20834,9 +20830,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20851,13 +20847,13 @@ impl super::stub::Instances for Instances {
     async fn send_diagnostic_interrupt(
         &self,
         req: crate::model::instances::SendDiagnosticInterruptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20904,9 +20900,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20915,24 +20911,25 @@ impl super::stub::Instances for Instances {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_deletion_protection(
         &self,
         req: crate::model::instances::SetDeletionProtectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20986,9 +20983,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21003,13 +21000,13 @@ impl super::stub::Instances for Instances {
     async fn set_disk_auto_delete(
         &self,
         req: crate::model::instances::SetDiskAutoDeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21062,9 +21059,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21079,13 +21076,13 @@ impl super::stub::Instances for Instances {
     async fn set_iam_policy(
         &self,
         req: crate::model::instances::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21132,9 +21129,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21149,13 +21146,13 @@ impl super::stub::Instances for Instances {
     async fn set_labels(
         &self,
         req: crate::model::instances::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21206,9 +21203,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21223,13 +21220,13 @@ impl super::stub::Instances for Instances {
     async fn set_machine_resources(
         &self,
         req: crate::model::instances::SetMachineResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21280,9 +21277,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21297,13 +21294,13 @@ impl super::stub::Instances for Instances {
     async fn set_machine_type(
         &self,
         req: crate::model::instances::SetMachineTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21354,9 +21351,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21371,13 +21368,13 @@ impl super::stub::Instances for Instances {
     async fn set_metadata(
         &self,
         req: crate::model::instances::SetMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21428,9 +21425,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21445,13 +21442,13 @@ impl super::stub::Instances for Instances {
     async fn set_min_cpu_platform(
         &self,
         req: crate::model::instances::SetMinCpuPlatformRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21502,9 +21499,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21519,13 +21516,13 @@ impl super::stub::Instances for Instances {
     async fn set_name(
         &self,
         req: crate::model::instances::SetNameRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21576,9 +21573,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21593,13 +21590,13 @@ impl super::stub::Instances for Instances {
     async fn set_scheduling(
         &self,
         req: crate::model::instances::SetSchedulingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21650,9 +21647,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21667,13 +21664,13 @@ impl super::stub::Instances for Instances {
     async fn set_security_policy(
         &self,
         req: crate::model::instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21724,9 +21721,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21741,13 +21738,13 @@ impl super::stub::Instances for Instances {
     async fn set_service_account(
         &self,
         req: crate::model::instances::SetServiceAccountRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21798,9 +21795,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21815,13 +21812,13 @@ impl super::stub::Instances for Instances {
     async fn set_shielded_instance_integrity_policy(
         &self,
         req: crate::model::instances::SetShieldedInstanceIntegrityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -21857,9 +21854,9 @@ impl super::stub::Instances for Instances {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21874,13 +21871,13 @@ impl super::stub::Instances for Instances {
     async fn set_tags(
         &self,
         req: crate::model::instances::SetTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21931,9 +21928,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21948,13 +21945,13 @@ impl super::stub::Instances for Instances {
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::instances::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22011,9 +22008,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22028,13 +22025,13 @@ impl super::stub::Instances for Instances {
     async fn start(
         &self,
         req: crate::model::instances::StartRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22085,9 +22082,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22102,13 +22099,13 @@ impl super::stub::Instances for Instances {
     async fn start_with_encryption_key(
         &self,
         req: crate::model::instances::StartWithEncryptionKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22159,9 +22156,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22176,13 +22173,13 @@ impl super::stub::Instances for Instances {
     async fn stop(
         &self,
         req: crate::model::instances::StopRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22236,9 +22233,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22253,13 +22250,13 @@ impl super::stub::Instances for Instances {
     async fn suspend(
         &self,
         req: crate::model::instances::SuspendRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22313,9 +22310,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22330,13 +22327,13 @@ impl super::stub::Instances for Instances {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22383,9 +22380,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22400,13 +22397,13 @@ impl super::stub::Instances for Instances {
     async fn update(
         &self,
         req: crate::model::instances::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22467,9 +22464,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22484,13 +22481,13 @@ impl super::stub::Instances for Instances {
     async fn update_access_config(
         &self,
         req: crate::model::instances::UpdateAccessConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22542,9 +22539,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22559,13 +22556,13 @@ impl super::stub::Instances for Instances {
     async fn update_display_device(
         &self,
         req: crate::model::instances::UpdateDisplayDeviceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22616,9 +22613,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22633,13 +22630,13 @@ impl super::stub::Instances for Instances {
     async fn update_network_interface(
         &self,
         req: crate::model::instances::UpdateNetworkInterfaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22691,9 +22688,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22708,13 +22705,13 @@ impl super::stub::Instances for Instances {
     async fn update_shielded_instance_config(
         &self,
         req: crate::model::instances::UpdateShieldedInstanceConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22765,9 +22762,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22782,13 +22779,13 @@ impl super::stub::Instances for Instances {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22835,9 +22832,9 @@ impl super::stub::Instances for Instances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22851,15 +22848,15 @@ impl super::stub::Instances for Instances {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -22882,7 +22879,7 @@ impl std::fmt::Debug for InstantSnapshots {
 
 #[cfg(feature = "instant-snapshots")]
 impl InstantSnapshots {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -22893,13 +22890,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn aggregated_list(
         &self,
         req: crate::model::instant_snapshots::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshotAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshotAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22957,9 +22954,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22974,13 +22971,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn delete(
         &self,
         req: crate::model::instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23031,9 +23028,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23048,13 +23045,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn get(
         &self,
         req: crate::model::instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23101,9 +23098,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23118,13 +23115,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn get_iam_policy(
         &self,
         req: crate::model::instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23177,9 +23174,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23194,13 +23191,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn insert(
         &self,
         req: crate::model::instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23241,9 +23238,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23258,13 +23255,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn list(
         &self,
         req: crate::model::instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshotList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshotList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23323,9 +23320,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23340,13 +23337,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn set_iam_policy(
         &self,
         req: crate::model::instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23393,9 +23390,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23410,13 +23407,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn set_labels(
         &self,
         req: crate::model::instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23467,9 +23464,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23484,13 +23481,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn test_iam_permissions(
         &self,
         req: crate::model::instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23537,9 +23534,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23554,13 +23551,13 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23607,9 +23604,9 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23623,15 +23620,15 @@ impl super::stub::InstantSnapshots for InstantSnapshots {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -23654,7 +23651,7 @@ impl std::fmt::Debug for InterconnectAttachmentGroups {
 
 #[cfg(feature = "interconnect-attachment-groups")]
 impl InterconnectAttachmentGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -23665,13 +23662,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn delete(
         &self,
         req: crate::model::interconnect_attachment_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23716,9 +23713,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23733,13 +23730,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn get(
         &self,
         req: crate::model::interconnect_attachment_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23780,9 +23777,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23797,13 +23794,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23846,9 +23843,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23863,17 +23860,15 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_attachment_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse,
-        >,
+        crate::Response<crate::model::InterconnectAttachmentGroupsGetOperationalStatusResponse>,
     > {
-        use gax::error::binding::BindingError;
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -23902,9 +23897,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23919,13 +23914,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn insert(
         &self,
         req: crate::model::interconnect_attachment_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23956,9 +23951,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23973,14 +23968,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn list(
         &self,
         req: crate::model::interconnect_attachment_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentGroupsListResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentGroupsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24029,9 +24023,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24046,13 +24040,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn patch(
         &self,
         req: crate::model::interconnect_attachment_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24109,9 +24103,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24126,13 +24120,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_attachment_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24169,9 +24163,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24186,13 +24180,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_attachment_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -24221,9 +24215,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24238,13 +24232,13 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24281,9 +24275,9 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24297,15 +24291,15 @@ impl super::stub::InterconnectAttachmentGroups for InterconnectAttachmentGroups
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -24328,7 +24322,7 @@ impl std::fmt::Debug for InterconnectAttachments {
 
 #[cfg(feature = "interconnect-attachments")]
 impl InterconnectAttachments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -24339,13 +24333,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn aggregated_list(
         &self,
         req: crate::model::interconnect_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24403,9 +24397,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24420,13 +24414,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn delete(
         &self,
         req: crate::model::interconnect_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24481,9 +24475,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24498,13 +24492,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn get(
         &self,
         req: crate::model::interconnect_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24555,9 +24549,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24572,13 +24566,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn insert(
         &self,
         req: crate::model::interconnect_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24623,9 +24617,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24640,13 +24634,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn list(
         &self,
         req: crate::model::interconnect_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachmentList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachmentList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24705,9 +24699,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24722,13 +24716,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn patch(
         &self,
         req: crate::model::interconnect_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24783,9 +24777,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24800,13 +24794,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn set_labels(
         &self,
         req: crate::model::interconnect_attachments::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24857,9 +24851,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24874,13 +24868,13 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24927,9 +24921,9 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24943,15 +24937,15 @@ impl super::stub::InterconnectAttachments for InterconnectAttachments {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -24974,7 +24968,7 @@ impl std::fmt::Debug for InterconnectGroups {
 
 #[cfg(feature = "interconnect-groups")]
 impl InterconnectGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -24985,13 +24979,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn create_members(
         &self,
         req: crate::model::interconnect_groups::CreateMembersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25032,9 +25026,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25049,13 +25043,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn delete(
         &self,
         req: crate::model::interconnect_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25100,9 +25094,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25117,13 +25111,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn get(
         &self,
         req: crate::model::interconnect_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25164,9 +25158,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25181,13 +25175,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn get_iam_policy(
         &self,
         req: crate::model::interconnect_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25230,9 +25224,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25247,14 +25241,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn get_operational_status(
         &self,
         req: crate::model::interconnect_groups::GetOperationalStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectGroupsGetOperationalStatusResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25295,9 +25288,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25312,13 +25305,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn insert(
         &self,
         req: crate::model::interconnect_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25349,9 +25342,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25366,13 +25359,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn list(
         &self,
         req: crate::model::interconnect_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectGroupsListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectGroupsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25421,9 +25414,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25438,13 +25431,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn patch(
         &self,
         req: crate::model::interconnect_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25501,9 +25494,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25518,13 +25511,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn set_iam_policy(
         &self,
         req: crate::model::interconnect_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25561,9 +25554,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25578,13 +25571,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn test_iam_permissions(
         &self,
         req: crate::model::interconnect_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25621,9 +25614,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25638,13 +25631,13 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25681,9 +25674,9 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25697,15 +25690,15 @@ impl super::stub::InterconnectGroups for InterconnectGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -25728,7 +25721,7 @@ impl std::fmt::Debug for InterconnectLocations {
 
 #[cfg(feature = "interconnect-locations")]
 impl InterconnectLocations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -25739,13 +25732,13 @@ impl super::stub::InterconnectLocations for InterconnectLocations {
     async fn get(
         &self,
         req: crate::model::interconnect_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectLocation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectLocation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25786,9 +25779,9 @@ impl super::stub::InterconnectLocations for InterconnectLocations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25803,13 +25796,13 @@ impl super::stub::InterconnectLocations for InterconnectLocations {
     async fn list(
         &self,
         req: crate::model::interconnect_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectLocationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectLocationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25858,9 +25851,9 @@ impl super::stub::InterconnectLocations for InterconnectLocations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25891,7 +25884,7 @@ impl std::fmt::Debug for InterconnectRemoteLocations {
 
 #[cfg(feature = "interconnect-remote-locations")]
 impl InterconnectRemoteLocations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -25902,13 +25895,13 @@ impl super::stub::InterconnectRemoteLocations for InterconnectRemoteLocations {
     async fn get(
         &self,
         req: crate::model::interconnect_remote_locations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectRemoteLocation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectRemoteLocation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25949,9 +25942,9 @@ impl super::stub::InterconnectRemoteLocations for InterconnectRemoteLocations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25966,13 +25959,13 @@ impl super::stub::InterconnectRemoteLocations for InterconnectRemoteLocations {
     async fn list(
         &self,
         req: crate::model::interconnect_remote_locations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectRemoteLocationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectRemoteLocationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26021,9 +26014,9 @@ impl super::stub::InterconnectRemoteLocations for InterconnectRemoteLocations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26054,7 +26047,7 @@ impl std::fmt::Debug for Interconnects {
 
 #[cfg(feature = "interconnects")]
 impl Interconnects {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -26065,13 +26058,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn delete(
         &self,
         req: crate::model::interconnects::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26112,9 +26105,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26129,13 +26122,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn get(
         &self,
         req: crate::model::interconnects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Interconnect>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Interconnect>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26172,9 +26165,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26189,13 +26182,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn get_diagnostics(
         &self,
         req: crate::model::interconnects::GetDiagnosticsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectsGetDiagnosticsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectsGetDiagnosticsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26232,9 +26225,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26249,13 +26242,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn get_macsec_config(
         &self,
         req: crate::model::interconnects::GetMacsecConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectsGetMacsecConfigResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectsGetMacsecConfigResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26292,9 +26285,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26309,13 +26302,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn insert(
         &self,
         req: crate::model::interconnects::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26346,9 +26339,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26363,13 +26356,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn list(
         &self,
         req: crate::model::interconnects::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26418,9 +26411,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26435,13 +26428,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn patch(
         &self,
         req: crate::model::interconnects::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26482,9 +26475,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26499,13 +26492,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn set_labels(
         &self,
         req: crate::model::interconnects::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26542,9 +26535,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26559,13 +26552,13 @@ impl super::stub::Interconnects for Interconnects {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26602,9 +26595,9 @@ impl super::stub::Interconnects for Interconnects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26618,15 +26611,15 @@ impl super::stub::Interconnects for Interconnects {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -26649,7 +26642,7 @@ impl std::fmt::Debug for LicenseCodes {
 
 #[cfg(feature = "license-codes")]
 impl LicenseCodes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -26660,13 +26653,13 @@ impl super::stub::LicenseCodes for LicenseCodes {
     async fn get(
         &self,
         req: crate::model::license_codes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicenseCode>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicenseCode>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26703,9 +26696,9 @@ impl super::stub::LicenseCodes for LicenseCodes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26720,13 +26713,13 @@ impl super::stub::LicenseCodes for LicenseCodes {
     async fn test_iam_permissions(
         &self,
         req: crate::model::license_codes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26763,9 +26756,9 @@ impl super::stub::LicenseCodes for LicenseCodes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26796,7 +26789,7 @@ impl std::fmt::Debug for Licenses {
 
 #[cfg(feature = "licenses")]
 impl Licenses {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -26807,13 +26800,13 @@ impl super::stub::Licenses for Licenses {
     async fn delete(
         &self,
         req: crate::model::licenses::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26854,9 +26847,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26871,13 +26864,13 @@ impl super::stub::Licenses for Licenses {
     async fn get(
         &self,
         req: crate::model::licenses::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::License>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::License>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26914,9 +26907,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26931,13 +26924,13 @@ impl super::stub::Licenses for Licenses {
     async fn get_iam_policy(
         &self,
         req: crate::model::licenses::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26980,9 +26973,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26997,13 +26990,13 @@ impl super::stub::Licenses for Licenses {
     async fn insert(
         &self,
         req: crate::model::licenses::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27034,9 +27027,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27051,13 +27044,13 @@ impl super::stub::Licenses for Licenses {
     async fn list(
         &self,
         req: crate::model::licenses::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LicensesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LicensesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27106,9 +27099,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27123,13 +27116,13 @@ impl super::stub::Licenses for Licenses {
     async fn set_iam_policy(
         &self,
         req: crate::model::licenses::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27166,9 +27159,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27183,13 +27176,13 @@ impl super::stub::Licenses for Licenses {
     async fn test_iam_permissions(
         &self,
         req: crate::model::licenses::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27226,9 +27219,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27243,13 +27236,13 @@ impl super::stub::Licenses for Licenses {
     async fn update(
         &self,
         req: crate::model::licenses::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27302,9 +27295,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27319,13 +27312,13 @@ impl super::stub::Licenses for Licenses {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27362,9 +27355,9 @@ impl super::stub::Licenses for Licenses {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27378,15 +27371,15 @@ impl super::stub::Licenses for Licenses {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -27409,7 +27402,7 @@ impl std::fmt::Debug for MachineImages {
 
 #[cfg(feature = "machine-images")]
 impl MachineImages {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -27420,13 +27413,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn delete(
         &self,
         req: crate::model::machine_images::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27467,9 +27460,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27484,13 +27477,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn get(
         &self,
         req: crate::model::machine_images::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineImage>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineImage>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27527,9 +27520,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27544,13 +27537,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn get_iam_policy(
         &self,
         req: crate::model::machine_images::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27593,9 +27586,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27610,13 +27603,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn insert(
         &self,
         req: crate::model::machine_images::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27650,9 +27643,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27667,13 +27660,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn list(
         &self,
         req: crate::model::machine_images::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineImageList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineImageList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27722,9 +27715,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27739,13 +27732,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn set_iam_policy(
         &self,
         req: crate::model::machine_images::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27782,9 +27775,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27799,13 +27792,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn set_labels(
         &self,
         req: crate::model::machine_images::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27842,9 +27835,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27859,13 +27852,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn test_iam_permissions(
         &self,
         req: crate::model::machine_images::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27902,9 +27895,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27919,13 +27912,13 @@ impl super::stub::MachineImages for MachineImages {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27962,9 +27955,9 @@ impl super::stub::MachineImages for MachineImages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27978,15 +27971,15 @@ impl super::stub::MachineImages for MachineImages {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -28009,7 +28002,7 @@ impl std::fmt::Debug for MachineTypes {
 
 #[cfg(feature = "machine-types")]
 impl MachineTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -28020,13 +28013,13 @@ impl super::stub::MachineTypes for MachineTypes {
     async fn aggregated_list(
         &self,
         req: crate::model::machine_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineTypeAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineTypeAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28084,9 +28077,9 @@ impl super::stub::MachineTypes for MachineTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28101,13 +28094,13 @@ impl super::stub::MachineTypes for MachineTypes {
     async fn get(
         &self,
         req: crate::model::machine_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28154,9 +28147,9 @@ impl super::stub::MachineTypes for MachineTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28171,13 +28164,13 @@ impl super::stub::MachineTypes for MachineTypes {
     async fn list(
         &self,
         req: crate::model::machine_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MachineTypeList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MachineTypeList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28236,9 +28229,9 @@ impl super::stub::MachineTypes for MachineTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28269,7 +28262,7 @@ impl std::fmt::Debug for NetworkAttachments {
 
 #[cfg(feature = "network-attachments")]
 impl NetworkAttachments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -28280,13 +28273,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn aggregated_list(
         &self,
         req: crate::model::network_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkAttachmentAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkAttachmentAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28344,9 +28337,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28361,13 +28354,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn delete(
         &self,
         req: crate::model::network_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28422,9 +28415,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28439,13 +28432,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn get(
         &self,
         req: crate::model::network_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28496,9 +28489,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28513,13 +28506,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn get_iam_policy(
         &self,
         req: crate::model::network_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28572,9 +28565,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28589,13 +28582,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn insert(
         &self,
         req: crate::model::network_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28636,9 +28629,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28653,13 +28646,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn list(
         &self,
         req: crate::model::network_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkAttachmentList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkAttachmentList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28718,9 +28711,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28735,13 +28728,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn patch(
         &self,
         req: crate::model::network_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28796,9 +28789,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28813,13 +28806,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn set_iam_policy(
         &self,
         req: crate::model::network_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28866,9 +28859,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28883,13 +28876,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28936,9 +28929,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28953,13 +28946,13 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29006,9 +28999,9 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29022,15 +29015,15 @@ impl super::stub::NetworkAttachments for NetworkAttachments {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -29053,7 +29046,7 @@ impl std::fmt::Debug for NetworkEdgeSecurityServices {
 
 #[cfg(feature = "network-edge-security-services")]
 impl NetworkEdgeSecurityServices {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -29064,14 +29057,13 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
     async fn aggregated_list(
         &self,
         req: crate::model::network_edge_security_services::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEdgeSecurityServiceAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29129,9 +29121,9 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29146,13 +29138,13 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
     async fn delete(
         &self,
         req: crate::model::network_edge_security_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29207,9 +29199,9 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29224,13 +29216,13 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
     async fn get(
         &self,
         req: crate::model::network_edge_security_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEdgeSecurityService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEdgeSecurityService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29281,9 +29273,9 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29298,13 +29290,13 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
     async fn insert(
         &self,
         req: crate::model::network_edge_security_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29349,9 +29341,9 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29366,13 +29358,13 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
     async fn patch(
         &self,
         req: crate::model::network_edge_security_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29443,9 +29435,9 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29460,13 +29452,13 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29513,9 +29505,9 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29529,15 +29521,15 @@ impl super::stub::NetworkEdgeSecurityServices for NetworkEdgeSecurityServices {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -29560,7 +29552,7 @@ impl std::fmt::Debug for NetworkEndpointGroups {
 
 #[cfg(feature = "network-endpoint-groups")]
 impl NetworkEndpointGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -29571,13 +29563,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn aggregated_list(
         &self,
         req: crate::model::network_endpoint_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29635,9 +29627,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29652,13 +29644,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -29694,9 +29686,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29711,13 +29703,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn delete(
         &self,
         req: crate::model::network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29772,9 +29764,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29789,13 +29781,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn detach_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -29831,9 +29823,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29848,13 +29840,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn get(
         &self,
         req: crate::model::network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29905,9 +29897,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29922,13 +29914,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn insert(
         &self,
         req: crate::model::network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29969,9 +29961,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29986,13 +29978,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn list(
         &self,
         req: crate::model::network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30051,9 +30043,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30068,14 +30060,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn list_network_endpoints(
         &self,
         req: crate::model::network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -30115,9 +30106,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30132,13 +30123,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_endpoint_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30185,9 +30176,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30202,13 +30193,13 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30255,9 +30246,9 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30271,15 +30262,15 @@ impl super::stub::NetworkEndpointGroups for NetworkEndpointGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -30302,7 +30293,7 @@ impl std::fmt::Debug for NetworkFirewallPolicies {
 
 #[cfg(feature = "network-firewall-policies")]
 impl NetworkFirewallPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -30313,13 +30304,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn add_association(
         &self,
         req: crate::model::network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30366,9 +30357,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30383,13 +30374,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn add_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::AddPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30438,9 +30429,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30455,13 +30446,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn add_rule(
         &self,
         req: crate::model::network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30510,9 +30501,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30527,13 +30518,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn aggregated_list(
         &self,
         req: crate::model::network_firewall_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkFirewallPolicyAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkFirewallPolicyAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30591,9 +30582,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30608,13 +30599,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn clone_rules(
         &self,
         req: crate::model::network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30661,9 +30652,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30678,13 +30669,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn delete(
         &self,
         req: crate::model::network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30725,9 +30716,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30742,13 +30733,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn get(
         &self,
         req: crate::model::network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30785,9 +30776,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30802,13 +30793,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn get_association(
         &self,
         req: crate::model::network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30849,9 +30840,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30866,13 +30857,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn get_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30915,9 +30906,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30932,13 +30923,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn get_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::GetPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30979,9 +30970,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30996,13 +30987,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn get_rule(
         &self,
         req: crate::model::network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31043,9 +31034,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31060,13 +31051,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn insert(
         &self,
         req: crate::model::network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31097,9 +31088,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31114,13 +31105,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn list(
         &self,
         req: crate::model::network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31169,9 +31160,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31186,13 +31177,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn patch(
         &self,
         req: crate::model::network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31233,9 +31224,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31250,13 +31241,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn patch_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchPacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31301,9 +31292,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31318,13 +31309,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn patch_rule(
         &self,
         req: crate::model::network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31369,9 +31360,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31386,13 +31377,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn remove_association(
         &self,
         req: crate::model::network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31437,9 +31428,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31454,13 +31445,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn remove_packet_mirroring_rule(
         &self,
         req: crate::model::network_firewall_policies::RemovePacketMirroringRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31505,9 +31496,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31522,13 +31513,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn remove_rule(
         &self,
         req: crate::model::network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31573,9 +31564,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31590,13 +31581,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn set_iam_policy(
         &self,
         req: crate::model::network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31633,9 +31624,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31650,13 +31641,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn test_iam_permissions(
         &self,
         req: crate::model::network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31693,9 +31684,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31710,13 +31701,13 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31753,9 +31744,9 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31769,15 +31760,15 @@ impl super::stub::NetworkFirewallPolicies for NetworkFirewallPolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -31800,7 +31791,7 @@ impl std::fmt::Debug for NetworkProfiles {
 
 #[cfg(feature = "network-profiles")]
 impl NetworkProfiles {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -31811,13 +31802,13 @@ impl super::stub::NetworkProfiles for NetworkProfiles {
     async fn get(
         &self,
         req: crate::model::network_profiles::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31854,9 +31845,9 @@ impl super::stub::NetworkProfiles for NetworkProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31871,13 +31862,13 @@ impl super::stub::NetworkProfiles for NetworkProfiles {
     async fn list(
         &self,
         req: crate::model::network_profiles::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkProfilesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkProfilesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31926,9 +31917,9 @@ impl super::stub::NetworkProfiles for NetworkProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31959,7 +31950,7 @@ impl std::fmt::Debug for Networks {
 
 #[cfg(feature = "networks")]
 impl Networks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -31970,13 +31961,13 @@ impl super::stub::Networks for Networks {
     async fn add_peering(
         &self,
         req: crate::model::networks::AddPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32017,9 +32008,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32034,13 +32025,13 @@ impl super::stub::Networks for Networks {
     async fn delete(
         &self,
         req: crate::model::networks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32081,9 +32072,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32098,13 +32089,13 @@ impl super::stub::Networks for Networks {
     async fn get(
         &self,
         req: crate::model::networks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32141,9 +32132,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32158,13 +32149,13 @@ impl super::stub::Networks for Networks {
     async fn get_effective_firewalls(
         &self,
         req: crate::model::networks::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworksGetEffectiveFirewallsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworksGetEffectiveFirewallsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32201,9 +32192,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32218,13 +32209,13 @@ impl super::stub::Networks for Networks {
     async fn insert(
         &self,
         req: crate::model::networks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32255,9 +32246,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32272,13 +32263,13 @@ impl super::stub::Networks for Networks {
     async fn list(
         &self,
         req: crate::model::networks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32327,9 +32318,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32344,13 +32335,13 @@ impl super::stub::Networks for Networks {
     async fn list_peering_routes(
         &self,
         req: crate::model::networks::ListPeeringRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExchangedPeeringRoutesList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExchangedPeeringRoutesList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32421,9 +32412,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32438,13 +32429,13 @@ impl super::stub::Networks for Networks {
     async fn patch(
         &self,
         req: crate::model::networks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32485,9 +32476,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32502,13 +32493,13 @@ impl super::stub::Networks for Networks {
     async fn remove_peering(
         &self,
         req: crate::model::networks::RemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32549,9 +32540,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32566,13 +32557,13 @@ impl super::stub::Networks for Networks {
     async fn request_remove_peering(
         &self,
         req: crate::model::networks::RequestRemovePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32613,9 +32604,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32630,13 +32621,13 @@ impl super::stub::Networks for Networks {
     async fn switch_to_custom_mode(
         &self,
         req: crate::model::networks::SwitchToCustomModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32677,9 +32668,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32694,13 +32685,13 @@ impl super::stub::Networks for Networks {
     async fn update_peering(
         &self,
         req: crate::model::networks::UpdatePeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32741,9 +32732,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32758,13 +32749,13 @@ impl super::stub::Networks for Networks {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32801,9 +32792,9 @@ impl super::stub::Networks for Networks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32817,15 +32808,15 @@ impl super::stub::Networks for Networks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -32848,7 +32839,7 @@ impl std::fmt::Debug for NodeGroups {
 
 #[cfg(feature = "node-groups")]
 impl NodeGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -32859,13 +32850,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn add_nodes(
         &self,
         req: crate::model::node_groups::AddNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32916,9 +32907,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -32933,13 +32924,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn aggregated_list(
         &self,
         req: crate::model::node_groups::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroupAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroupAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -32997,9 +32988,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33014,13 +33005,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn delete(
         &self,
         req: crate::model::node_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33071,9 +33062,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33088,13 +33079,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn delete_nodes(
         &self,
         req: crate::model::node_groups::DeleteNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33145,9 +33136,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33162,13 +33153,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn get(
         &self,
         req: crate::model::node_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33215,9 +33206,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33232,13 +33223,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn get_iam_policy(
         &self,
         req: crate::model::node_groups::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33291,9 +33282,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33308,13 +33299,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn insert(
         &self,
         req: crate::model::node_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33356,9 +33347,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33373,13 +33364,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn list(
         &self,
         req: crate::model::node_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33438,9 +33429,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33455,13 +33446,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn list_nodes(
         &self,
         req: crate::model::node_groups::ListNodesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroupsListNodes>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroupsListNodes>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33530,9 +33521,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33547,13 +33538,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn patch(
         &self,
         req: crate::model::node_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33604,9 +33595,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33621,13 +33612,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn perform_maintenance(
         &self,
         req: crate::model::node_groups::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33678,9 +33669,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33695,13 +33686,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn set_iam_policy(
         &self,
         req: crate::model::node_groups::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33748,9 +33739,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33765,13 +33756,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn set_node_template(
         &self,
         req: crate::model::node_groups::SetNodeTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33822,9 +33813,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33839,13 +33830,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn simulate_maintenance_event(
         &self,
         req: crate::model::node_groups::SimulateMaintenanceEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33896,9 +33887,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33913,13 +33904,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -33966,9 +33957,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -33983,13 +33974,13 @@ impl super::stub::NodeGroups for NodeGroups {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34036,9 +34027,9 @@ impl super::stub::NodeGroups for NodeGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34052,15 +34043,15 @@ impl super::stub::NodeGroups for NodeGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -34083,7 +34074,7 @@ impl std::fmt::Debug for NodeTemplates {
 
 #[cfg(feature = "node-templates")]
 impl NodeTemplates {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -34094,13 +34085,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn aggregated_list(
         &self,
         req: crate::model::node_templates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTemplateAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTemplateAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34158,9 +34149,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34175,13 +34166,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn delete(
         &self,
         req: crate::model::node_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34232,9 +34223,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34249,13 +34240,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn get(
         &self,
         req: crate::model::node_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34302,9 +34293,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34319,13 +34310,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn get_iam_policy(
         &self,
         req: crate::model::node_templates::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34378,9 +34369,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34395,13 +34386,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn insert(
         &self,
         req: crate::model::node_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34442,9 +34433,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34459,13 +34450,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn list(
         &self,
         req: crate::model::node_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTemplateList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTemplateList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34524,9 +34515,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34541,13 +34532,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn set_iam_policy(
         &self,
         req: crate::model::node_templates::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34594,9 +34585,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34611,13 +34602,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn test_iam_permissions(
         &self,
         req: crate::model::node_templates::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34664,9 +34655,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34681,13 +34672,13 @@ impl super::stub::NodeTemplates for NodeTemplates {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34734,9 +34725,9 @@ impl super::stub::NodeTemplates for NodeTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34750,15 +34741,15 @@ impl super::stub::NodeTemplates for NodeTemplates {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -34781,7 +34772,7 @@ impl std::fmt::Debug for NodeTypes {
 
 #[cfg(feature = "node-types")]
 impl NodeTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -34792,13 +34783,13 @@ impl super::stub::NodeTypes for NodeTypes {
     async fn aggregated_list(
         &self,
         req: crate::model::node_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTypeAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTypeAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34856,9 +34847,9 @@ impl super::stub::NodeTypes for NodeTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34873,13 +34864,13 @@ impl super::stub::NodeTypes for NodeTypes {
     async fn get(
         &self,
         req: crate::model::node_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -34926,9 +34917,9 @@ impl super::stub::NodeTypes for NodeTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -34943,13 +34934,13 @@ impl super::stub::NodeTypes for NodeTypes {
     async fn list(
         &self,
         req: crate::model::node_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeTypeList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeTypeList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35008,9 +34999,9 @@ impl super::stub::NodeTypes for NodeTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35041,7 +35032,7 @@ impl std::fmt::Debug for OrganizationSecurityPolicies {
 
 #[cfg(feature = "organization-security-policies")]
 impl OrganizationSecurityPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -35052,13 +35043,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn add_association(
         &self,
         req: crate::model::organization_security_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35095,9 +35086,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35112,13 +35103,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn add_rule(
         &self,
         req: crate::model::organization_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35149,9 +35140,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35166,13 +35157,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn copy_rules(
         &self,
         req: crate::model::organization_security_policies::CopyRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35209,9 +35200,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35226,13 +35217,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn delete(
         &self,
         req: crate::model::organization_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35263,9 +35254,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35280,13 +35271,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn get(
         &self,
         req: crate::model::organization_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35313,9 +35304,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35330,13 +35321,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn get_association(
         &self,
         req: crate::model::organization_security_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyAssociation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyAssociation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35367,9 +35358,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35384,13 +35375,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn get_rule(
         &self,
         req: crate::model::organization_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35421,9 +35412,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35438,11 +35429,11 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn insert(
         &self,
         req: crate::model::organization_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/compute/v1/locations/global/securityPolicies".to_string();
@@ -35465,9 +35456,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35482,11 +35473,11 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn list(
         &self,
         req: crate::model::organization_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/compute/v1/locations/global/securityPolicies".to_string();
@@ -35527,9 +35518,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35544,13 +35535,12 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn list_associations(
         &self,
         req: crate::model::organization_security_policies::ListAssociationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OrganizationSecurityPoliciesListAssociationsResponse>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path =
@@ -35569,9 +35559,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35586,15 +35576,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::organization_security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     > {
-        use gax::error::binding::BindingError;
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path =
@@ -35637,9 +35625,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35654,13 +35642,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn r#move(
         &self,
         req: crate::model::organization_security_policies::MoveRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35695,9 +35683,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35712,13 +35700,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn patch(
         &self,
         req: crate::model::organization_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35749,9 +35737,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35766,13 +35754,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn patch_rule(
         &self,
         req: crate::model::organization_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35807,9 +35795,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35824,13 +35812,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn remove_association(
         &self,
         req: crate::model::organization_security_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35865,9 +35853,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35882,13 +35870,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn remove_rule(
         &self,
         req: crate::model::organization_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35923,9 +35911,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35940,13 +35928,13 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
     async fn get_operation(
         &self,
         req: crate::model::global_organization_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -35977,9 +35965,9 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -35993,15 +35981,15 @@ impl super::stub::OrganizationSecurityPolicies for OrganizationSecurityPolicies
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -36024,7 +36012,7 @@ impl std::fmt::Debug for PacketMirrorings {
 
 #[cfg(feature = "packet-mirrorings")]
 impl PacketMirrorings {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -36035,13 +36023,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn aggregated_list(
         &self,
         req: crate::model::packet_mirrorings::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PacketMirroringAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PacketMirroringAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36099,9 +36087,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36116,13 +36104,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn delete(
         &self,
         req: crate::model::packet_mirrorings::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36173,9 +36161,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36190,13 +36178,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn get(
         &self,
         req: crate::model::packet_mirrorings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PacketMirroring>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PacketMirroring>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36243,9 +36231,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36260,13 +36248,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn insert(
         &self,
         req: crate::model::packet_mirrorings::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36307,9 +36295,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36324,13 +36312,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn list(
         &self,
         req: crate::model::packet_mirrorings::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PacketMirroringList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PacketMirroringList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36389,9 +36377,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36406,13 +36394,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn patch(
         &self,
         req: crate::model::packet_mirrorings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36463,9 +36451,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36480,13 +36468,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn test_iam_permissions(
         &self,
         req: crate::model::packet_mirrorings::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36533,9 +36521,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36550,13 +36538,13 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36603,9 +36591,9 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36619,15 +36607,15 @@ impl super::stub::PacketMirrorings for PacketMirrorings {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -36650,7 +36638,7 @@ impl std::fmt::Debug for PreviewFeatures {
 
 #[cfg(feature = "preview-features")]
 impl PreviewFeatures {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -36661,13 +36649,13 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
     async fn get(
         &self,
         req: crate::model::preview_features::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PreviewFeature>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PreviewFeature>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36704,9 +36692,9 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36721,13 +36709,13 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
     async fn list(
         &self,
         req: crate::model::preview_features::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PreviewFeatureList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PreviewFeatureList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36776,9 +36764,9 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36793,13 +36781,13 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
     async fn update(
         &self,
         req: crate::model::preview_features::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36840,9 +36828,9 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36857,13 +36845,13 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36900,9 +36888,9 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -36916,15 +36904,15 @@ impl super::stub::PreviewFeatures for PreviewFeatures {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -36947,7 +36935,7 @@ impl std::fmt::Debug for Projects {
 
 #[cfg(feature = "projects")]
 impl Projects {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -36958,13 +36946,13 @@ impl super::stub::Projects for Projects {
     async fn disable_xpn_host(
         &self,
         req: crate::model::projects::DisableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -36995,9 +36983,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37012,13 +37000,13 @@ impl super::stub::Projects for Projects {
     async fn disable_xpn_resource(
         &self,
         req: crate::model::projects::DisableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37049,9 +37037,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37066,13 +37054,13 @@ impl super::stub::Projects for Projects {
     async fn enable_xpn_host(
         &self,
         req: crate::model::projects::EnableXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37103,9 +37091,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37120,13 +37108,13 @@ impl super::stub::Projects for Projects {
     async fn enable_xpn_resource(
         &self,
         req: crate::model::projects::EnableXpnResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37157,9 +37145,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37174,13 +37162,13 @@ impl super::stub::Projects for Projects {
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Project>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Project>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37207,9 +37195,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37224,13 +37212,13 @@ impl super::stub::Projects for Projects {
     async fn get_xpn_host(
         &self,
         req: crate::model::projects::GetXpnHostRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Project>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Project>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37257,9 +37245,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37274,13 +37262,13 @@ impl super::stub::Projects for Projects {
     async fn get_xpn_resources(
         &self,
         req: crate::model::projects::GetXpnResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProjectsGetXpnResources>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProjectsGetXpnResources>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37329,9 +37317,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37346,13 +37334,13 @@ impl super::stub::Projects for Projects {
     async fn list_xpn_hosts(
         &self,
         req: crate::model::projects::ListXpnHostsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::XpnHostList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::XpnHostList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37401,9 +37389,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37418,13 +37406,13 @@ impl super::stub::Projects for Projects {
     async fn move_disk(
         &self,
         req: crate::model::projects::MoveDiskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37455,9 +37443,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37472,13 +37460,13 @@ impl super::stub::Projects for Projects {
     async fn move_instance(
         &self,
         req: crate::model::projects::MoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37509,9 +37497,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37526,13 +37514,13 @@ impl super::stub::Projects for Projects {
     async fn set_cloud_armor_tier(
         &self,
         req: crate::model::projects::SetCloudArmorTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37563,9 +37551,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37580,13 +37568,13 @@ impl super::stub::Projects for Projects {
     async fn set_common_instance_metadata(
         &self,
         req: crate::model::projects::SetCommonInstanceMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37617,9 +37605,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37634,13 +37622,13 @@ impl super::stub::Projects for Projects {
     async fn set_default_network_tier(
         &self,
         req: crate::model::projects::SetDefaultNetworkTierRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37671,9 +37659,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37688,13 +37676,13 @@ impl super::stub::Projects for Projects {
     async fn set_usage_export_bucket(
         &self,
         req: crate::model::projects::SetUsageExportBucketRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37725,9 +37713,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37742,13 +37730,13 @@ impl super::stub::Projects for Projects {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37785,9 +37773,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37801,15 +37789,15 @@ impl super::stub::Projects for Projects {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -37832,7 +37820,7 @@ impl std::fmt::Debug for PublicAdvertisedPrefixes {
 
 #[cfg(feature = "public-advertised-prefixes")]
 impl PublicAdvertisedPrefixes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -37843,13 +37831,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn announce(
         &self,
         req: crate::model::public_advertised_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37894,9 +37882,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37911,13 +37899,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn delete(
         &self,
         req: crate::model::public_advertised_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -37962,9 +37950,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -37979,13 +37967,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn get(
         &self,
         req: crate::model::public_advertised_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicAdvertisedPrefix>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicAdvertisedPrefix>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38026,9 +38014,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38043,13 +38031,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn insert(
         &self,
         req: crate::model::public_advertised_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38080,9 +38068,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38097,13 +38085,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn list(
         &self,
         req: crate::model::public_advertised_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicAdvertisedPrefixList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicAdvertisedPrefixList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38152,9 +38140,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38169,13 +38157,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn patch(
         &self,
         req: crate::model::public_advertised_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38220,9 +38208,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38237,13 +38225,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn withdraw(
         &self,
         req: crate::model::public_advertised_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38288,9 +38276,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38305,13 +38293,13 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38348,9 +38336,9 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38364,15 +38352,15 @@ impl super::stub::PublicAdvertisedPrefixes for PublicAdvertisedPrefixes {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -38395,7 +38383,7 @@ impl std::fmt::Debug for PublicDelegatedPrefixes {
 
 #[cfg(feature = "public-delegated-prefixes")]
 impl PublicDelegatedPrefixes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -38406,13 +38394,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn aggregated_list(
         &self,
         req: crate::model::public_delegated_prefixes::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefixAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefixAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38470,9 +38458,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38487,13 +38475,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn announce(
         &self,
         req: crate::model::public_delegated_prefixes::AnnounceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38548,9 +38536,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38565,13 +38553,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn delete(
         &self,
         req: crate::model::public_delegated_prefixes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38626,9 +38614,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38643,13 +38631,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn get(
         &self,
         req: crate::model::public_delegated_prefixes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefix>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefix>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38700,9 +38688,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38717,13 +38705,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn insert(
         &self,
         req: crate::model::public_delegated_prefixes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38764,9 +38752,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38781,13 +38769,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn list(
         &self,
         req: crate::model::public_delegated_prefixes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicDelegatedPrefixList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicDelegatedPrefixList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38846,9 +38834,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38863,13 +38851,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn patch(
         &self,
         req: crate::model::public_delegated_prefixes::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -38924,9 +38912,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -38941,13 +38929,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn withdraw(
         &self,
         req: crate::model::public_delegated_prefixes::WithdrawRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39002,9 +38990,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39019,13 +39007,13 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39072,9 +39060,9 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39088,15 +39076,15 @@ impl super::stub::PublicDelegatedPrefixes for PublicDelegatedPrefixes {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -39119,7 +39107,7 @@ impl std::fmt::Debug for RegionAutoscalers {
 
 #[cfg(feature = "region-autoscalers")]
 impl RegionAutoscalers {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -39130,13 +39118,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn delete(
         &self,
         req: crate::model::region_autoscalers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39187,9 +39175,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39204,13 +39192,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn get(
         &self,
         req: crate::model::region_autoscalers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Autoscaler>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Autoscaler>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39257,9 +39245,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39274,13 +39262,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn insert(
         &self,
         req: crate::model::region_autoscalers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39321,9 +39309,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39338,13 +39326,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn list(
         &self,
         req: crate::model::region_autoscalers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionAutoscalerList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionAutoscalerList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39403,9 +39391,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39420,13 +39408,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn patch(
         &self,
         req: crate::model::region_autoscalers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39471,9 +39459,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39488,13 +39476,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_autoscalers::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39541,9 +39529,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39558,13 +39546,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn update(
         &self,
         req: crate::model::region_autoscalers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39609,9 +39597,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39626,13 +39614,13 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39679,9 +39667,9 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39695,15 +39683,15 @@ impl super::stub::RegionAutoscalers for RegionAutoscalers {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -39726,7 +39714,7 @@ impl std::fmt::Debug for RegionBackendServices {
 
 #[cfg(feature = "region-backend-services")]
 impl RegionBackendServices {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -39737,13 +39725,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn delete(
         &self,
         req: crate::model::region_backend_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39794,9 +39782,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39811,13 +39799,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn get(
         &self,
         req: crate::model::region_backend_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39864,9 +39852,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39881,13 +39869,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn get_health(
         &self,
         req: crate::model::region_backend_services::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceGroupHealth>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceGroupHealth>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -39934,9 +39922,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -39951,13 +39939,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn get_iam_policy(
         &self,
         req: crate::model::region_backend_services::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40010,9 +39998,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40027,13 +40015,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn insert(
         &self,
         req: crate::model::region_backend_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40074,9 +40062,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40091,13 +40079,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn list(
         &self,
         req: crate::model::region_backend_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40156,9 +40144,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40173,13 +40161,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn list_usable(
         &self,
         req: crate::model::region_backend_services::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackendServiceListUsable>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackendServiceListUsable>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40238,9 +40226,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40255,13 +40243,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn patch(
         &self,
         req: crate::model::region_backend_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40312,9 +40300,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40329,13 +40317,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn set_iam_policy(
         &self,
         req: crate::model::region_backend_services::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40382,9 +40370,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40399,13 +40387,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn set_security_policy(
         &self,
         req: crate::model::region_backend_services::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40456,9 +40444,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40473,13 +40461,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_backend_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40526,9 +40514,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40543,13 +40531,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn update(
         &self,
         req: crate::model::region_backend_services::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40600,9 +40588,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40617,13 +40605,13 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40670,9 +40658,9 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40686,15 +40674,15 @@ impl super::stub::RegionBackendServices for RegionBackendServices {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -40717,7 +40705,7 @@ impl std::fmt::Debug for RegionCommitments {
 
 #[cfg(feature = "region-commitments")]
 impl RegionCommitments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -40728,13 +40716,13 @@ impl super::stub::RegionCommitments for RegionCommitments {
     async fn aggregated_list(
         &self,
         req: crate::model::region_commitments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitmentAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitmentAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40792,9 +40780,9 @@ impl super::stub::RegionCommitments for RegionCommitments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40809,13 +40797,13 @@ impl super::stub::RegionCommitments for RegionCommitments {
     async fn get(
         &self,
         req: crate::model::region_commitments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Commitment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Commitment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40862,9 +40850,9 @@ impl super::stub::RegionCommitments for RegionCommitments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40879,13 +40867,13 @@ impl super::stub::RegionCommitments for RegionCommitments {
     async fn insert(
         &self,
         req: crate::model::region_commitments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -40926,9 +40914,9 @@ impl super::stub::RegionCommitments for RegionCommitments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -40943,13 +40931,13 @@ impl super::stub::RegionCommitments for RegionCommitments {
     async fn list(
         &self,
         req: crate::model::region_commitments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitmentList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitmentList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41008,9 +40996,9 @@ impl super::stub::RegionCommitments for RegionCommitments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41025,13 +41013,13 @@ impl super::stub::RegionCommitments for RegionCommitments {
     async fn update(
         &self,
         req: crate::model::region_commitments::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41098,9 +41086,9 @@ impl super::stub::RegionCommitments for RegionCommitments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41115,13 +41103,13 @@ impl super::stub::RegionCommitments for RegionCommitments {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41168,9 +41156,9 @@ impl super::stub::RegionCommitments for RegionCommitments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41184,15 +41172,15 @@ impl super::stub::RegionCommitments for RegionCommitments {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -41215,7 +41203,7 @@ impl std::fmt::Debug for RegionDiskTypes {
 
 #[cfg(feature = "region-disk-types")]
 impl RegionDiskTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -41226,13 +41214,13 @@ impl super::stub::RegionDiskTypes for RegionDiskTypes {
     async fn get(
         &self,
         req: crate::model::region_disk_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41279,9 +41267,9 @@ impl super::stub::RegionDiskTypes for RegionDiskTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41296,13 +41284,13 @@ impl super::stub::RegionDiskTypes for RegionDiskTypes {
     async fn list(
         &self,
         req: crate::model::region_disk_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionDiskTypeList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionDiskTypeList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41361,9 +41349,9 @@ impl super::stub::RegionDiskTypes for RegionDiskTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41394,7 +41382,7 @@ impl std::fmt::Debug for RegionDisks {
 
 #[cfg(feature = "region-disks")]
 impl RegionDisks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -41405,13 +41393,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn add_resource_policies(
         &self,
         req: crate::model::region_disks::AddResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41462,9 +41450,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41479,13 +41467,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn bulk_insert(
         &self,
         req: crate::model::region_disks::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41526,9 +41514,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41543,13 +41531,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn create_snapshot(
         &self,
         req: crate::model::region_disks::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41600,9 +41588,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41617,13 +41605,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn delete(
         &self,
         req: crate::model::region_disks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41674,9 +41662,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41691,13 +41679,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn get(
         &self,
         req: crate::model::region_disks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Disk>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Disk>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41744,9 +41732,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41761,13 +41749,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn get_iam_policy(
         &self,
         req: crate::model::region_disks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41820,9 +41808,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41837,13 +41825,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn insert(
         &self,
         req: crate::model::region_disks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41888,9 +41876,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41905,13 +41893,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn list(
         &self,
         req: crate::model::region_disks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiskList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiskList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -41970,9 +41958,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -41987,13 +41975,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn remove_resource_policies(
         &self,
         req: crate::model::region_disks::RemoveResourcePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42044,9 +42032,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42061,13 +42049,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn resize(
         &self,
         req: crate::model::region_disks::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42118,9 +42106,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42135,13 +42123,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn set_iam_policy(
         &self,
         req: crate::model::region_disks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42188,9 +42176,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42205,13 +42193,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn set_labels(
         &self,
         req: crate::model::region_disks::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42262,9 +42250,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42279,13 +42267,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn start_async_replication(
         &self,
         req: crate::model::region_disks::StartAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42336,9 +42324,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42353,13 +42341,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn stop_async_replication(
         &self,
         req: crate::model::region_disks::StopAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42410,9 +42398,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42427,13 +42415,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn stop_group_async_replication(
         &self,
         req: crate::model::region_disks::StopGroupAsyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42474,9 +42462,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42491,13 +42479,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_disks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42544,9 +42532,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42561,13 +42549,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn update(
         &self,
         req: crate::model::region_disks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42634,9 +42622,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42651,13 +42639,13 @@ impl super::stub::RegionDisks for RegionDisks {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42704,9 +42692,9 @@ impl super::stub::RegionDisks for RegionDisks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42720,15 +42708,15 @@ impl super::stub::RegionDisks for RegionDisks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -42751,7 +42739,7 @@ impl std::fmt::Debug for RegionHealthCheckServices {
 
 #[cfg(feature = "region-health-check-services")]
 impl RegionHealthCheckServices {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -42762,13 +42750,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn delete(
         &self,
         req: crate::model::region_health_check_services::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42823,9 +42811,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42840,13 +42828,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn get(
         &self,
         req: crate::model::region_health_check_services::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckService>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckService>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42897,9 +42885,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42914,13 +42902,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn insert(
         &self,
         req: crate::model::region_health_check_services::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -42961,9 +42949,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -42978,13 +42966,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn list(
         &self,
         req: crate::model::region_health_check_services::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckServicesList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckServicesList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43043,9 +43031,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43060,13 +43048,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn patch(
         &self,
         req: crate::model::region_health_check_services::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43121,9 +43109,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43138,13 +43126,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_check_services::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43191,9 +43179,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43208,13 +43196,13 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43261,9 +43249,9 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43277,15 +43265,15 @@ impl super::stub::RegionHealthCheckServices for RegionHealthCheckServices {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -43308,7 +43296,7 @@ impl std::fmt::Debug for RegionHealthChecks {
 
 #[cfg(feature = "region-health-checks")]
 impl RegionHealthChecks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43319,13 +43307,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn delete(
         &self,
         req: crate::model::region_health_checks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43376,9 +43364,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43393,13 +43381,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn get(
         &self,
         req: crate::model::region_health_checks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheck>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheck>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43446,9 +43434,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43463,13 +43451,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn insert(
         &self,
         req: crate::model::region_health_checks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43510,9 +43498,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43527,13 +43515,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn list(
         &self,
         req: crate::model::region_health_checks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HealthCheckList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HealthCheckList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43592,9 +43580,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43609,13 +43597,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn patch(
         &self,
         req: crate::model::region_health_checks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43666,9 +43654,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43683,13 +43671,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_health_checks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43736,9 +43724,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43753,13 +43741,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn update(
         &self,
         req: crate::model::region_health_checks::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43810,9 +43798,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43827,13 +43815,13 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43880,9 +43868,9 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -43896,15 +43884,15 @@ impl super::stub::RegionHealthChecks for RegionHealthChecks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -43927,7 +43915,7 @@ impl std::fmt::Debug for RegionInstanceGroupManagers {
 
 #[cfg(feature = "region-instance-group-managers")]
 impl RegionInstanceGroupManagers {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43938,13 +43926,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn abandon_instances(
         &self,
         req: crate::model::region_instance_group_managers::AbandonInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -43999,9 +43987,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44016,13 +44004,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn apply_updates_to_instances(
         &self,
         req: crate::model::region_instance_group_managers::ApplyUpdatesToInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -44057,9 +44045,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44074,13 +44062,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn create_instances(
         &self,
         req: crate::model::region_instance_group_managers::CreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44135,9 +44123,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44152,13 +44140,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn delete(
         &self,
         req: crate::model::region_instance_group_managers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44213,9 +44201,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44230,13 +44218,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn delete_instances(
         &self,
         req: crate::model::region_instance_group_managers::DeleteInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44291,9 +44279,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44308,13 +44296,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn delete_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::DeletePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -44349,9 +44337,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44366,13 +44354,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn get(
         &self,
         req: crate::model::region_instance_group_managers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroupManager>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroupManager>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44423,9 +44411,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44440,13 +44428,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn insert(
         &self,
         req: crate::model::region_instance_group_managers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44487,9 +44475,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44504,13 +44492,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn list(
         &self,
         req: crate::model::region_instance_group_managers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupManagerList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagerList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44569,9 +44557,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44586,14 +44574,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn list_errors(
         &self,
         req: crate::model::region_instance_group_managers::ListErrorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagersListErrorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44666,9 +44653,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44683,15 +44670,14 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn list_managed_instances(
         &self,
         req: crate::model::region_instance_group_managers::ListManagedInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagersListInstancesResponse>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -44731,9 +44717,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44748,15 +44734,14 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn list_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::ListPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>,
-    > {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupManagersListInstanceConfigsResp>>
+    {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -44796,9 +44781,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44813,13 +44798,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn patch(
         &self,
         req: crate::model::region_instance_group_managers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -44874,9 +44859,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44891,13 +44876,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn patch_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::PatchPerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -44933,9 +44918,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -44950,13 +44935,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn recreate_instances(
         &self,
         req: crate::model::region_instance_group_managers::RecreateInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45011,9 +44996,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45028,13 +45013,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn resize(
         &self,
         req: crate::model::region_instance_group_managers::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45090,9 +45075,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45107,13 +45092,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn resume_instances(
         &self,
         req: crate::model::region_instance_group_managers::ResumeInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45168,9 +45153,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45185,13 +45170,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn set_instance_template(
         &self,
         req: crate::model::region_instance_group_managers::SetInstanceTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -45227,9 +45212,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45244,13 +45229,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn set_target_pools(
         &self,
         req: crate::model::region_instance_group_managers::SetTargetPoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45305,9 +45290,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45322,13 +45307,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn start_instances(
         &self,
         req: crate::model::region_instance_group_managers::StartInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45383,9 +45368,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45400,13 +45385,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn stop_instances(
         &self,
         req: crate::model::region_instance_group_managers::StopInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45461,9 +45446,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45478,13 +45463,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn suspend_instances(
         &self,
         req: crate::model::region_instance_group_managers::SuspendInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45539,9 +45524,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45556,13 +45541,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn update_per_instance_configs(
         &self,
         req: crate::model::region_instance_group_managers::UpdatePerInstanceConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -45598,9 +45583,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45615,13 +45600,13 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45668,9 +45653,9 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45684,15 +45669,15 @@ impl super::stub::RegionInstanceGroupManagers for RegionInstanceGroupManagers {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -45715,7 +45700,7 @@ impl std::fmt::Debug for RegionInstanceGroups {
 
 #[cfg(feature = "region-instance-groups")]
 impl RegionInstanceGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -45726,13 +45711,13 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
     async fn get(
         &self,
         req: crate::model::region_instance_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45779,9 +45764,9 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45796,13 +45781,13 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
     async fn list(
         &self,
         req: crate::model::region_instance_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45861,9 +45846,9 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45878,13 +45863,13 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
     async fn list_instances(
         &self,
         req: crate::model::region_instance_groups::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionInstanceGroupsListInstances>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionInstanceGroupsListInstances>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -45953,9 +45938,9 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -45970,13 +45955,13 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
     async fn set_named_ports(
         &self,
         req: crate::model::region_instance_groups::SetNamedPortsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46027,9 +46012,9 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46044,13 +46029,13 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instance_groups::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46097,9 +46082,9 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46114,13 +46099,13 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46167,9 +46152,9 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46183,15 +46168,15 @@ impl super::stub::RegionInstanceGroups for RegionInstanceGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -46214,7 +46199,7 @@ impl std::fmt::Debug for RegionInstanceTemplates {
 
 #[cfg(feature = "region-instance-templates")]
 impl RegionInstanceTemplates {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -46225,13 +46210,13 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
     async fn delete(
         &self,
         req: crate::model::region_instance_templates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46282,9 +46267,9 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46299,13 +46284,13 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
     async fn get(
         &self,
         req: crate::model::region_instance_templates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46352,9 +46337,9 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46369,13 +46354,13 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
     async fn insert(
         &self,
         req: crate::model::region_instance_templates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46416,9 +46401,9 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46433,13 +46418,13 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
     async fn list(
         &self,
         req: crate::model::region_instance_templates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstanceTemplateList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstanceTemplateList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46498,9 +46483,9 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46515,13 +46500,13 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46568,9 +46553,9 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46584,15 +46569,15 @@ impl super::stub::RegionInstanceTemplates for RegionInstanceTemplates {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -46615,7 +46600,7 @@ impl std::fmt::Debug for RegionInstances {
 
 #[cfg(feature = "region-instances")]
 impl RegionInstances {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -46626,13 +46611,13 @@ impl super::stub::RegionInstances for RegionInstances {
     async fn bulk_insert(
         &self,
         req: crate::model::region_instances::BulkInsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46673,9 +46658,9 @@ impl super::stub::RegionInstances for RegionInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46690,13 +46675,13 @@ impl super::stub::RegionInstances for RegionInstances {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46743,9 +46728,9 @@ impl super::stub::RegionInstances for RegionInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46759,15 +46744,15 @@ impl super::stub::RegionInstances for RegionInstances {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -46790,7 +46775,7 @@ impl std::fmt::Debug for RegionInstantSnapshots {
 
 #[cfg(feature = "region-instant-snapshots")]
 impl RegionInstantSnapshots {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -46801,13 +46786,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn delete(
         &self,
         req: crate::model::region_instant_snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46858,9 +46843,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46875,13 +46860,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn get(
         &self,
         req: crate::model::region_instant_snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -46928,9 +46913,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -46945,13 +46930,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn get_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47004,9 +46989,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47021,13 +47006,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn insert(
         &self,
         req: crate::model::region_instant_snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47068,9 +47053,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47085,13 +47070,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn list(
         &self,
         req: crate::model::region_instant_snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstantSnapshotList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstantSnapshotList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47150,9 +47135,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47167,13 +47152,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn set_iam_policy(
         &self,
         req: crate::model::region_instant_snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47220,9 +47205,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47237,13 +47222,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn set_labels(
         &self,
         req: crate::model::region_instant_snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47294,9 +47279,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47311,13 +47296,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_instant_snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47364,9 +47349,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47381,13 +47366,13 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47434,9 +47419,9 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47450,15 +47435,15 @@ impl super::stub::RegionInstantSnapshots for RegionInstantSnapshots {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -47481,7 +47466,7 @@ impl std::fmt::Debug for RegionNetworkEndpointGroups {
 
 #[cfg(feature = "region-network-endpoint-groups")]
 impl RegionNetworkEndpointGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -47492,13 +47477,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn attach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::AttachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -47534,9 +47519,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47551,13 +47536,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn delete(
         &self,
         req: crate::model::region_network_endpoint_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47612,9 +47597,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47629,13 +47614,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn detach_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::DetachNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -47671,9 +47656,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47688,13 +47673,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn get(
         &self,
         req: crate::model::region_network_endpoint_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47745,9 +47730,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47762,13 +47747,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn insert(
         &self,
         req: crate::model::region_network_endpoint_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47809,9 +47794,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47826,13 +47811,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn list(
         &self,
         req: crate::model::region_network_endpoint_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -47891,9 +47876,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47908,14 +47893,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn list_network_endpoints(
         &self,
         req: crate::model::region_network_endpoint_groups::ListNetworkEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NetworkEndpointGroupsListNetworkEndpoints>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -47955,9 +47939,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -47972,13 +47956,13 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48025,9 +48009,9 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48041,15 +48025,15 @@ impl super::stub::RegionNetworkEndpointGroups for RegionNetworkEndpointGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -48072,7 +48056,7 @@ impl std::fmt::Debug for RegionNetworkFirewallPolicies {
 
 #[cfg(feature = "region-network-firewall-policies")]
 impl RegionNetworkFirewallPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -48083,13 +48067,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn add_association(
         &self,
         req: crate::model::region_network_firewall_policies::AddAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48146,9 +48130,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48163,13 +48147,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn add_rule(
         &self,
         req: crate::model::region_network_firewall_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48228,9 +48212,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48245,13 +48229,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn clone_rules(
         &self,
         req: crate::model::region_network_firewall_policies::CloneRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48308,9 +48292,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48325,13 +48309,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn delete(
         &self,
         req: crate::model::region_network_firewall_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48382,9 +48366,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48399,13 +48383,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn get(
         &self,
         req: crate::model::region_network_firewall_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48452,9 +48436,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48469,13 +48453,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn get_association(
         &self,
         req: crate::model::region_network_firewall_policies::GetAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyAssociation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyAssociation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48526,9 +48510,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48543,17 +48527,15 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn get_effective_firewalls(
         &self,
         req: crate::model::region_network_firewall_policies::GetEffectiveFirewallsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse,
-        >,
+        crate::Response<crate::model::RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse>,
     > {
-        use gax::error::binding::BindingError;
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48591,9 +48573,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48608,13 +48590,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn get_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48667,9 +48649,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48684,13 +48666,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn get_rule(
         &self,
         req: crate::model::region_network_firewall_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48741,9 +48723,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48758,13 +48740,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn insert(
         &self,
         req: crate::model::region_network_firewall_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48805,9 +48787,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48822,13 +48804,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn list(
         &self,
         req: crate::model::region_network_firewall_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FirewallPolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FirewallPolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48887,9 +48869,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48904,13 +48886,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn patch(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -48961,9 +48943,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -48978,13 +48960,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn patch_rule(
         &self,
         req: crate::model::region_network_firewall_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49039,9 +49021,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49056,13 +49038,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn remove_association(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveAssociationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49117,9 +49099,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49134,13 +49116,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn remove_rule(
         &self,
         req: crate::model::region_network_firewall_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49195,9 +49177,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49212,13 +49194,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn set_iam_policy(
         &self,
         req: crate::model::region_network_firewall_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49265,9 +49247,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49282,13 +49264,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_network_firewall_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49335,9 +49317,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49352,13 +49334,13 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49405,9 +49387,9 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49421,15 +49403,15 @@ impl super::stub::RegionNetworkFirewallPolicies for RegionNetworkFirewallPolicie
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -49452,7 +49434,7 @@ impl std::fmt::Debug for RegionNotificationEndpoints {
 
 #[cfg(feature = "region-notification-endpoints")]
 impl RegionNotificationEndpoints {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -49463,13 +49445,13 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
     async fn delete(
         &self,
         req: crate::model::region_notification_endpoints::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49524,9 +49506,9 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49541,13 +49523,13 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
     async fn get(
         &self,
         req: crate::model::region_notification_endpoints::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotificationEndpoint>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotificationEndpoint>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49598,9 +49580,9 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49615,13 +49597,13 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
     async fn insert(
         &self,
         req: crate::model::region_notification_endpoints::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49662,9 +49644,9 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49679,13 +49661,13 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
     async fn list(
         &self,
         req: crate::model::region_notification_endpoints::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NotificationEndpointList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NotificationEndpointList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49744,9 +49726,9 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49761,13 +49743,13 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
     async fn test_iam_permissions(
         &self,
         req: crate::model::region_notification_endpoints::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -49802,9 +49784,9 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49819,13 +49801,13 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49872,9 +49854,9 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49888,15 +49870,15 @@ impl super::stub::RegionNotificationEndpoints for RegionNotificationEndpoints {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -49919,7 +49901,7 @@ impl std::fmt::Debug for RegionOperations {
 
 #[cfg(feature = "region-operations")]
 impl RegionOperations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -49930,13 +49912,13 @@ impl super::stub::RegionOperations for RegionOperations {
     async fn delete(
         &self,
         req: crate::model::region_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -49983,9 +49965,9 @@ impl super::stub::RegionOperations for RegionOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -49994,24 +49976,25 @@ impl super::stub::RegionOperations for RegionOperations {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50058,9 +50041,9 @@ impl super::stub::RegionOperations for RegionOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50075,13 +50058,13 @@ impl super::stub::RegionOperations for RegionOperations {
     async fn list(
         &self,
         req: crate::model::region_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50140,9 +50123,9 @@ impl super::stub::RegionOperations for RegionOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50157,13 +50140,13 @@ impl super::stub::RegionOperations for RegionOperations {
     async fn wait(
         &self,
         req: crate::model::region_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50210,9 +50193,9 @@ impl super::stub::RegionOperations for RegionOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50243,7 +50226,7 @@ impl std::fmt::Debug for RegionSecurityPolicies {
 
 #[cfg(feature = "region-security-policies")]
 impl RegionSecurityPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -50254,13 +50237,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn add_rule(
         &self,
         req: crate::model::region_security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50311,9 +50294,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50328,13 +50311,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn delete(
         &self,
         req: crate::model::region_security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50385,9 +50368,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50402,13 +50385,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn get(
         &self,
         req: crate::model::region_security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50455,9 +50438,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50472,13 +50455,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn get_rule(
         &self,
         req: crate::model::region_security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50529,9 +50512,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50546,13 +50529,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn insert(
         &self,
         req: crate::model::region_security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50597,9 +50580,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50614,13 +50597,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn list(
         &self,
         req: crate::model::region_security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50679,9 +50662,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50696,13 +50679,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn patch(
         &self,
         req: crate::model::region_security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50765,9 +50748,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50782,13 +50765,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn patch_rule(
         &self,
         req: crate::model::region_security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50855,9 +50838,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50872,13 +50855,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn remove_rule(
         &self,
         req: crate::model::region_security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -50929,9 +50912,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -50946,13 +50929,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn set_labels(
         &self,
         req: crate::model::region_security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51003,9 +50986,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51020,13 +51003,13 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51073,9 +51056,9 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51089,15 +51072,15 @@ impl super::stub::RegionSecurityPolicies for RegionSecurityPolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -51120,7 +51103,7 @@ impl std::fmt::Debug for RegionSslCertificates {
 
 #[cfg(feature = "region-ssl-certificates")]
 impl RegionSslCertificates {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -51131,13 +51114,13 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
     async fn delete(
         &self,
         req: crate::model::region_ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51188,9 +51171,9 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51205,13 +51188,13 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
     async fn get(
         &self,
         req: crate::model::region_ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51258,9 +51241,9 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51275,13 +51258,13 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
     async fn insert(
         &self,
         req: crate::model::region_ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51322,9 +51305,9 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51339,13 +51322,13 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
     async fn list(
         &self,
         req: crate::model::region_ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificateList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificateList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51404,9 +51387,9 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51421,13 +51404,13 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51474,9 +51457,9 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51490,15 +51473,15 @@ impl super::stub::RegionSslCertificates for RegionSslCertificates {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -51521,7 +51504,7 @@ impl std::fmt::Debug for RegionSslPolicies {
 
 #[cfg(feature = "region-ssl-policies")]
 impl RegionSslPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -51532,13 +51515,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn delete(
         &self,
         req: crate::model::region_ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51589,9 +51572,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51606,13 +51589,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn get(
         &self,
         req: crate::model::region_ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51659,9 +51642,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51676,13 +51659,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn insert(
         &self,
         req: crate::model::region_ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51723,9 +51706,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51740,13 +51723,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn list(
         &self,
         req: crate::model::region_ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51805,9 +51788,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51822,14 +51805,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn list_available_features(
         &self,
         req: crate::model::region_ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51888,9 +51870,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51905,13 +51887,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn patch(
         &self,
         req: crate::model::region_ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -51962,9 +51944,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -51979,13 +51961,13 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52032,9 +52014,9 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52048,15 +52030,15 @@ impl super::stub::RegionSslPolicies for RegionSslPolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -52079,7 +52061,7 @@ impl std::fmt::Debug for RegionTargetHttpProxies {
 
 #[cfg(feature = "region-target-http-proxies")]
 impl RegionTargetHttpProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -52090,13 +52072,13 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
     async fn delete(
         &self,
         req: crate::model::region_target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52147,9 +52129,9 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52164,13 +52146,13 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
     async fn get(
         &self,
         req: crate::model::region_target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52217,9 +52199,9 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52234,13 +52216,13 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
     async fn insert(
         &self,
         req: crate::model::region_target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52281,9 +52263,9 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52298,13 +52280,13 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
     async fn list(
         &self,
         req: crate::model::region_target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52363,9 +52345,9 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52380,13 +52362,13 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
     async fn set_url_map(
         &self,
         req: crate::model::region_target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52437,9 +52419,9 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52454,13 +52436,13 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52507,9 +52489,9 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52523,15 +52505,15 @@ impl super::stub::RegionTargetHttpProxies for RegionTargetHttpProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -52554,7 +52536,7 @@ impl std::fmt::Debug for RegionTargetHttpsProxies {
 
 #[cfg(feature = "region-target-https-proxies")]
 impl RegionTargetHttpsProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -52565,13 +52547,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn delete(
         &self,
         req: crate::model::region_target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52626,9 +52608,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52643,13 +52625,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn get(
         &self,
         req: crate::model::region_target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52700,9 +52682,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52717,13 +52699,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn insert(
         &self,
         req: crate::model::region_target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52764,9 +52746,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52781,13 +52763,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn list(
         &self,
         req: crate::model::region_target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52846,9 +52828,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52863,13 +52845,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn patch(
         &self,
         req: crate::model::region_target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -52924,9 +52906,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -52941,13 +52923,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn set_ssl_certificates(
         &self,
         req: crate::model::region_target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53002,9 +52984,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53019,13 +53001,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn set_url_map(
         &self,
         req: crate::model::region_target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53080,9 +53062,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53097,13 +53079,13 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53150,9 +53132,9 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53166,15 +53148,15 @@ impl super::stub::RegionTargetHttpsProxies for RegionTargetHttpsProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -53197,7 +53179,7 @@ impl std::fmt::Debug for RegionTargetTcpProxies {
 
 #[cfg(feature = "region-target-tcp-proxies")]
 impl RegionTargetTcpProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -53208,13 +53190,13 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
     async fn delete(
         &self,
         req: crate::model::region_target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53265,9 +53247,9 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53282,13 +53264,13 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
     async fn get(
         &self,
         req: crate::model::region_target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53335,9 +53317,9 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53352,13 +53334,13 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
     async fn insert(
         &self,
         req: crate::model::region_target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53399,9 +53381,9 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53416,13 +53398,13 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
     async fn list(
         &self,
         req: crate::model::region_target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53481,9 +53463,9 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53498,13 +53480,13 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53551,9 +53533,9 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53567,15 +53549,15 @@ impl super::stub::RegionTargetTcpProxies for RegionTargetTcpProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -53598,7 +53580,7 @@ impl std::fmt::Debug for RegionUrlMaps {
 
 #[cfg(feature = "region-url-maps")]
 impl RegionUrlMaps {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -53609,13 +53591,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn delete(
         &self,
         req: crate::model::region_url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53666,9 +53648,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53683,13 +53665,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn get(
         &self,
         req: crate::model::region_url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMap>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMap>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53736,9 +53718,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53753,13 +53735,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn insert(
         &self,
         req: crate::model::region_url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53800,9 +53782,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53817,13 +53799,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn list(
         &self,
         req: crate::model::region_url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53882,9 +53864,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53899,13 +53881,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn patch(
         &self,
         req: crate::model::region_url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -53956,9 +53938,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -53973,13 +53955,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn update(
         &self,
         req: crate::model::region_url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54030,9 +54012,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54047,13 +54029,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn validate(
         &self,
         req: crate::model::region_url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapsValidateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapsValidateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54100,9 +54082,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54117,13 +54099,13 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54170,9 +54152,9 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54186,15 +54168,15 @@ impl super::stub::RegionUrlMaps for RegionUrlMaps {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -54217,7 +54199,7 @@ impl std::fmt::Debug for RegionZones {
 
 #[cfg(feature = "region-zones")]
 impl RegionZones {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -54228,13 +54210,13 @@ impl super::stub::RegionZones for RegionZones {
     async fn list(
         &self,
         req: crate::model::region_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ZoneList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ZoneList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54293,9 +54275,9 @@ impl super::stub::RegionZones for RegionZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54326,7 +54308,7 @@ impl std::fmt::Debug for Regions {
 
 #[cfg(feature = "regions")]
 impl Regions {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -54337,13 +54319,13 @@ impl super::stub::Regions for Regions {
     async fn get(
         &self,
         req: crate::model::regions::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Region>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Region>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54380,9 +54362,9 @@ impl super::stub::Regions for Regions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54397,13 +54379,13 @@ impl super::stub::Regions for Regions {
     async fn list(
         &self,
         req: crate::model::regions::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RegionList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RegionList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54452,9 +54434,9 @@ impl super::stub::Regions for Regions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54485,7 +54467,7 @@ impl std::fmt::Debug for ReservationBlocks {
 
 #[cfg(feature = "reservation-blocks")]
 impl ReservationBlocks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -54496,13 +54478,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn get(
         &self,
         req: crate::model::reservation_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationBlocksGetResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationBlocksGetResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54563,9 +54545,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54580,13 +54562,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -54628,9 +54610,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54645,13 +54627,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn list(
         &self,
         req: crate::model::reservation_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationBlocksListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationBlocksListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54720,9 +54702,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54737,13 +54719,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -54785,9 +54767,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54802,13 +54784,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -54849,9 +54831,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54866,13 +54848,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -54913,9 +54895,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54930,13 +54912,13 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -54983,9 +54965,9 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -54999,15 +54981,15 @@ impl super::stub::ReservationBlocks for ReservationBlocks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -55030,7 +55012,7 @@ impl std::fmt::Debug for ReservationSlots {
 
 #[cfg(feature = "reservation-slots")]
 impl ReservationSlots {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -55041,13 +55023,13 @@ impl super::stub::ReservationSlots for ReservationSlots {
     async fn get(
         &self,
         req: crate::model::reservation_slots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSlotsGetResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSlotsGetResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55104,9 +55086,9 @@ impl super::stub::ReservationSlots for ReservationSlots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55121,13 +55103,13 @@ impl super::stub::ReservationSlots for ReservationSlots {
     async fn list(
         &self,
         req: crate::model::reservation_slots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSlotsListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSlotsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55196,9 +55178,9 @@ impl super::stub::ReservationSlots for ReservationSlots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55213,13 +55195,13 @@ impl super::stub::ReservationSlots for ReservationSlots {
     async fn update(
         &self,
         req: crate::model::reservation_slots::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55288,9 +55270,9 @@ impl super::stub::ReservationSlots for ReservationSlots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55305,13 +55287,13 @@ impl super::stub::ReservationSlots for ReservationSlots {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55358,9 +55340,9 @@ impl super::stub::ReservationSlots for ReservationSlots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55374,15 +55356,15 @@ impl super::stub::ReservationSlots for ReservationSlots {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -55405,7 +55387,7 @@ impl std::fmt::Debug for ReservationSubBlocks {
 
 #[cfg(feature = "reservation-sub-blocks")]
 impl ReservationSubBlocks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -55416,13 +55398,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn get(
         &self,
         req: crate::model::reservation_sub_blocks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSubBlocksGetResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSubBlocksGetResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55487,9 +55469,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55504,13 +55486,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn get_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55573,9 +55555,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55590,13 +55572,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn list(
         &self,
         req: crate::model::reservation_sub_blocks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationSubBlocksListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationSubBlocksListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55665,9 +55647,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55682,13 +55664,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn perform_maintenance(
         &self,
         req: crate::model::reservation_sub_blocks::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -55730,9 +55712,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55747,13 +55729,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn report_faulty(
         &self,
         req: crate::model::reservation_sub_blocks::ReportFaultyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55818,9 +55800,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55835,13 +55817,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn set_iam_policy(
         &self,
         req: crate::model::reservation_sub_blocks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -55898,9 +55880,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55915,13 +55897,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservation_sub_blocks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -55962,9 +55944,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -55979,13 +55961,13 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56032,9 +56014,9 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56048,15 +56030,15 @@ impl super::stub::ReservationSubBlocks for ReservationSubBlocks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -56079,7 +56061,7 @@ impl std::fmt::Debug for Reservations {
 
 #[cfg(feature = "reservations")]
 impl Reservations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -56090,13 +56072,13 @@ impl super::stub::Reservations for Reservations {
     async fn aggregated_list(
         &self,
         req: crate::model::reservations::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56154,9 +56136,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56171,13 +56153,13 @@ impl super::stub::Reservations for Reservations {
     async fn delete(
         &self,
         req: crate::model::reservations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56228,9 +56210,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56245,13 +56227,13 @@ impl super::stub::Reservations for Reservations {
     async fn get(
         &self,
         req: crate::model::reservations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Reservation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Reservation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56298,9 +56280,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56315,13 +56297,13 @@ impl super::stub::Reservations for Reservations {
     async fn get_iam_policy(
         &self,
         req: crate::model::reservations::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56374,9 +56356,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56391,13 +56373,13 @@ impl super::stub::Reservations for Reservations {
     async fn insert(
         &self,
         req: crate::model::reservations::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56438,9 +56420,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56455,13 +56437,13 @@ impl super::stub::Reservations for Reservations {
     async fn list(
         &self,
         req: crate::model::reservations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReservationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReservationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56520,9 +56502,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56537,13 +56519,13 @@ impl super::stub::Reservations for Reservations {
     async fn perform_maintenance(
         &self,
         req: crate::model::reservations::PerformMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56594,9 +56576,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56611,13 +56593,13 @@ impl super::stub::Reservations for Reservations {
     async fn resize(
         &self,
         req: crate::model::reservations::ResizeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56668,9 +56650,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56685,13 +56667,13 @@ impl super::stub::Reservations for Reservations {
     async fn set_iam_policy(
         &self,
         req: crate::model::reservations::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56738,9 +56720,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56755,13 +56737,13 @@ impl super::stub::Reservations for Reservations {
     async fn test_iam_permissions(
         &self,
         req: crate::model::reservations::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56808,9 +56790,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56825,13 +56807,13 @@ impl super::stub::Reservations for Reservations {
     async fn update(
         &self,
         req: crate::model::reservations::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56898,9 +56880,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56915,13 +56897,13 @@ impl super::stub::Reservations for Reservations {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -56968,9 +56950,9 @@ impl super::stub::Reservations for Reservations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -56984,15 +56966,15 @@ impl super::stub::Reservations for Reservations {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -57015,7 +56997,7 @@ impl std::fmt::Debug for ResourcePolicies {
 
 #[cfg(feature = "resource-policies")]
 impl ResourcePolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -57026,13 +57008,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn aggregated_list(
         &self,
         req: crate::model::resource_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourcePolicyAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourcePolicyAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57090,9 +57072,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57107,13 +57089,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn delete(
         &self,
         req: crate::model::resource_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57164,9 +57146,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57181,13 +57163,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn get(
         &self,
         req: crate::model::resource_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourcePolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourcePolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57234,9 +57216,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57251,13 +57233,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn get_iam_policy(
         &self,
         req: crate::model::resource_policies::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57310,9 +57292,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57327,13 +57309,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn insert(
         &self,
         req: crate::model::resource_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57374,9 +57356,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57391,13 +57373,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn list(
         &self,
         req: crate::model::resource_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourcePolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourcePolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57456,9 +57438,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57473,13 +57455,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn patch(
         &self,
         req: crate::model::resource_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57542,9 +57524,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57559,13 +57541,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn set_iam_policy(
         &self,
         req: crate::model::resource_policies::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57612,9 +57594,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57629,13 +57611,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn test_iam_permissions(
         &self,
         req: crate::model::resource_policies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57682,9 +57664,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57699,13 +57681,13 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57752,9 +57734,9 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57768,15 +57750,15 @@ impl super::stub::ResourcePolicies for ResourcePolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -57799,7 +57781,7 @@ impl std::fmt::Debug for Routers {
 
 #[cfg(feature = "routers")]
 impl Routers {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -57810,13 +57792,13 @@ impl super::stub::Routers for Routers {
     async fn aggregated_list(
         &self,
         req: crate::model::routers::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouterAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouterAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57874,9 +57856,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57891,13 +57873,13 @@ impl super::stub::Routers for Routers {
     async fn delete(
         &self,
         req: crate::model::routers::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -57948,9 +57930,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -57965,13 +57947,13 @@ impl super::stub::Routers for Routers {
     async fn delete_route_policy(
         &self,
         req: crate::model::routers::DeleteRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58026,9 +58008,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58043,13 +58025,13 @@ impl super::stub::Routers for Routers {
     async fn get(
         &self,
         req: crate::model::routers::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Router>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Router>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58096,9 +58078,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58113,13 +58095,13 @@ impl super::stub::Routers for Routers {
     async fn get_nat_ip_info(
         &self,
         req: crate::model::routers::GetNatIpInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NatIpInfoResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NatIpInfoResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58170,9 +58152,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58187,13 +58169,13 @@ impl super::stub::Routers for Routers {
     async fn get_nat_mapping_info(
         &self,
         req: crate::model::routers::GetNatMappingInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VmEndpointNatMappingsList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VmEndpointNatMappingsList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58266,9 +58248,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58283,13 +58265,13 @@ impl super::stub::Routers for Routers {
     async fn get_route_policy(
         &self,
         req: crate::model::routers::GetRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersGetRoutePolicyResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersGetRoutePolicyResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58340,9 +58322,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58357,13 +58339,13 @@ impl super::stub::Routers for Routers {
     async fn get_router_status(
         &self,
         req: crate::model::routers::GetRouterStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouterStatusResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouterStatusResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58410,9 +58392,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58427,13 +58409,13 @@ impl super::stub::Routers for Routers {
     async fn insert(
         &self,
         req: crate::model::routers::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58474,9 +58456,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58491,13 +58473,13 @@ impl super::stub::Routers for Routers {
     async fn list(
         &self,
         req: crate::model::routers::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouterList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouterList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58556,9 +58538,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58573,13 +58555,13 @@ impl super::stub::Routers for Routers {
     async fn list_bgp_routes(
         &self,
         req: crate::model::routers::ListBgpRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersListBgpRoutes>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersListBgpRoutes>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58667,9 +58649,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58684,13 +58666,13 @@ impl super::stub::Routers for Routers {
     async fn list_route_policies(
         &self,
         req: crate::model::routers::ListRoutePoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersListRoutePolicies>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersListRoutePolicies>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58759,9 +58741,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58776,13 +58758,13 @@ impl super::stub::Routers for Routers {
     async fn patch(
         &self,
         req: crate::model::routers::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58833,9 +58815,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58850,13 +58832,13 @@ impl super::stub::Routers for Routers {
     async fn patch_route_policy(
         &self,
         req: crate::model::routers::PatchRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58907,9 +58889,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58924,13 +58906,13 @@ impl super::stub::Routers for Routers {
     async fn preview(
         &self,
         req: crate::model::routers::PreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RoutersPreviewResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RoutersPreviewResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -58977,9 +58959,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -58994,13 +58976,13 @@ impl super::stub::Routers for Routers {
     async fn update(
         &self,
         req: crate::model::routers::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59051,9 +59033,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59068,13 +59050,13 @@ impl super::stub::Routers for Routers {
     async fn update_route_policy(
         &self,
         req: crate::model::routers::UpdateRoutePolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59125,9 +59107,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59142,13 +59124,13 @@ impl super::stub::Routers for Routers {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59195,9 +59177,9 @@ impl super::stub::Routers for Routers {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59211,15 +59193,15 @@ impl super::stub::Routers for Routers {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -59242,7 +59224,7 @@ impl std::fmt::Debug for Routes {
 
 #[cfg(feature = "routes")]
 impl Routes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -59253,13 +59235,13 @@ impl super::stub::Routes for Routes {
     async fn delete(
         &self,
         req: crate::model::routes::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59300,9 +59282,9 @@ impl super::stub::Routes for Routes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59317,13 +59299,13 @@ impl super::stub::Routes for Routes {
     async fn get(
         &self,
         req: crate::model::routes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Route>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Route>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59360,9 +59342,9 @@ impl super::stub::Routes for Routes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59377,13 +59359,13 @@ impl super::stub::Routes for Routes {
     async fn insert(
         &self,
         req: crate::model::routes::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59414,9 +59396,9 @@ impl super::stub::Routes for Routes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59431,13 +59413,13 @@ impl super::stub::Routes for Routes {
     async fn list(
         &self,
         req: crate::model::routes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouteList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouteList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59486,9 +59468,9 @@ impl super::stub::Routes for Routes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59503,13 +59485,13 @@ impl super::stub::Routes for Routes {
     async fn test_iam_permissions(
         &self,
         req: crate::model::routes::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59546,9 +59528,9 @@ impl super::stub::Routes for Routes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59563,13 +59545,13 @@ impl super::stub::Routes for Routes {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59606,9 +59588,9 @@ impl super::stub::Routes for Routes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59622,15 +59604,15 @@ impl super::stub::Routes for Routes {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -59653,7 +59635,7 @@ impl std::fmt::Debug for SecurityPolicies {
 
 #[cfg(feature = "security-policies")]
 impl SecurityPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -59664,13 +59646,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn add_rule(
         &self,
         req: crate::model::security_policies::AddRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59711,9 +59693,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59728,13 +59710,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn aggregated_list(
         &self,
         req: crate::model::security_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPoliciesAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPoliciesAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59792,9 +59774,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59809,13 +59791,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn delete(
         &self,
         req: crate::model::security_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59856,9 +59838,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59873,13 +59855,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn get(
         &self,
         req: crate::model::security_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59916,9 +59898,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59933,13 +59915,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn get_rule(
         &self,
         req: crate::model::security_policies::GetRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -59980,9 +59962,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -59997,13 +59979,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn insert(
         &self,
         req: crate::model::security_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60038,9 +60020,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60055,13 +60037,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn list(
         &self,
         req: crate::model::security_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecurityPolicyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecurityPolicyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60110,9 +60092,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60127,17 +60109,15 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn list_preconfigured_expression_sets(
         &self,
         req: crate::model::security_policies::ListPreconfiguredExpressionSetsRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> Result<
-        gax::response::Response<
-            crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse,
-        >,
+        crate::Response<crate::model::SecurityPoliciesListPreconfiguredExpressionSetsResponse>,
     > {
-        use gax::error::binding::BindingError;
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -60165,9 +60145,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     "*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60182,13 +60162,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn patch(
         &self,
         req: crate::model::security_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60241,9 +60221,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60258,13 +60238,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn patch_rule(
         &self,
         req: crate::model::security_policies::PatchRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60321,9 +60301,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60338,13 +60318,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn remove_rule(
         &self,
         req: crate::model::security_policies::RemoveRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60385,9 +60365,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60402,13 +60382,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn set_labels(
         &self,
         req: crate::model::security_policies::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60445,9 +60425,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60462,13 +60442,13 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60505,9 +60485,9 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60521,15 +60501,15 @@ impl super::stub::SecurityPolicies for SecurityPolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -60552,7 +60532,7 @@ impl std::fmt::Debug for ServiceAttachments {
 
 #[cfg(feature = "service-attachments")]
 impl ServiceAttachments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -60563,13 +60543,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn aggregated_list(
         &self,
         req: crate::model::service_attachments::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceAttachmentAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceAttachmentAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60627,9 +60607,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60644,13 +60624,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn delete(
         &self,
         req: crate::model::service_attachments::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60705,9 +60685,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60722,13 +60702,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn get(
         &self,
         req: crate::model::service_attachments::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60783,9 +60763,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60800,13 +60780,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn get_iam_policy(
         &self,
         req: crate::model::service_attachments::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60859,9 +60839,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60876,13 +60856,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn insert(
         &self,
         req: crate::model::service_attachments::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -60923,9 +60903,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -60940,13 +60920,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn list(
         &self,
         req: crate::model::service_attachments::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceAttachmentList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceAttachmentList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61005,9 +60985,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61022,13 +61002,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn patch(
         &self,
         req: crate::model::service_attachments::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61083,9 +61063,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61100,13 +61080,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn set_iam_policy(
         &self,
         req: crate::model::service_attachments::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61153,9 +61133,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61170,13 +61150,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn test_iam_permissions(
         &self,
         req: crate::model::service_attachments::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61223,9 +61203,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61240,13 +61220,13 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61293,9 +61273,9 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61309,15 +61289,15 @@ impl super::stub::ServiceAttachments for ServiceAttachments {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -61340,7 +61320,7 @@ impl std::fmt::Debug for SnapshotSettings {
 
 #[cfg(feature = "snapshot-settings")]
 impl SnapshotSettings {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -61351,13 +61331,13 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
     async fn get(
         &self,
         req: crate::model::snapshot_settings::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SnapshotSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SnapshotSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61384,9 +61364,9 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61401,13 +61381,13 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
     async fn patch(
         &self,
         req: crate::model::snapshot_settings::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61450,9 +61430,9 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61467,13 +61447,13 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61510,9 +61490,9 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61526,15 +61506,15 @@ impl super::stub::SnapshotSettings for SnapshotSettings {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -61557,7 +61537,7 @@ impl std::fmt::Debug for Snapshots {
 
 #[cfg(feature = "snapshots")]
 impl Snapshots {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -61568,13 +61548,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn delete(
         &self,
         req: crate::model::snapshots::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61615,9 +61595,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61632,13 +61612,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn get(
         &self,
         req: crate::model::snapshots::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61675,9 +61655,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61692,13 +61672,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn get_iam_policy(
         &self,
         req: crate::model::snapshots::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61741,9 +61721,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61758,13 +61738,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn insert(
         &self,
         req: crate::model::snapshots::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61795,9 +61775,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61812,13 +61792,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn list(
         &self,
         req: crate::model::snapshots::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SnapshotList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SnapshotList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61867,9 +61847,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61884,13 +61864,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn set_iam_policy(
         &self,
         req: crate::model::snapshots::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61927,9 +61907,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -61944,13 +61924,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn set_labels(
         &self,
         req: crate::model::snapshots::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -61987,9 +61967,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62004,13 +61984,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn test_iam_permissions(
         &self,
         req: crate::model::snapshots::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62047,9 +62027,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62064,13 +62044,13 @@ impl super::stub::Snapshots for Snapshots {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62107,9 +62087,9 @@ impl super::stub::Snapshots for Snapshots {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62123,15 +62103,15 @@ impl super::stub::Snapshots for Snapshots {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -62154,7 +62134,7 @@ impl std::fmt::Debug for SslCertificates {
 
 #[cfg(feature = "ssl-certificates")]
 impl SslCertificates {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -62165,13 +62145,13 @@ impl super::stub::SslCertificates for SslCertificates {
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_certificates::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificateAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificateAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62229,9 +62209,9 @@ impl super::stub::SslCertificates for SslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62246,13 +62226,13 @@ impl super::stub::SslCertificates for SslCertificates {
     async fn delete(
         &self,
         req: crate::model::ssl_certificates::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62293,9 +62273,9 @@ impl super::stub::SslCertificates for SslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62310,13 +62290,13 @@ impl super::stub::SslCertificates for SslCertificates {
     async fn get(
         &self,
         req: crate::model::ssl_certificates::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62353,9 +62333,9 @@ impl super::stub::SslCertificates for SslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62370,13 +62350,13 @@ impl super::stub::SslCertificates for SslCertificates {
     async fn insert(
         &self,
         req: crate::model::ssl_certificates::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62407,9 +62387,9 @@ impl super::stub::SslCertificates for SslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62424,13 +62404,13 @@ impl super::stub::SslCertificates for SslCertificates {
     async fn list(
         &self,
         req: crate::model::ssl_certificates::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslCertificateList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslCertificateList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62479,9 +62459,9 @@ impl super::stub::SslCertificates for SslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62496,13 +62476,13 @@ impl super::stub::SslCertificates for SslCertificates {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62539,9 +62519,9 @@ impl super::stub::SslCertificates for SslCertificates {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62555,15 +62535,15 @@ impl super::stub::SslCertificates for SslCertificates {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -62586,7 +62566,7 @@ impl std::fmt::Debug for SslPolicies {
 
 #[cfg(feature = "ssl-policies")]
 impl SslPolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -62597,13 +62577,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn aggregated_list(
         &self,
         req: crate::model::ssl_policies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62661,9 +62641,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62678,13 +62658,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn delete(
         &self,
         req: crate::model::ssl_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62725,9 +62705,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62742,13 +62722,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn get(
         &self,
         req: crate::model::ssl_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62785,9 +62765,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62802,13 +62782,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn insert(
         &self,
         req: crate::model::ssl_policies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62839,9 +62819,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62856,13 +62836,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn list(
         &self,
         req: crate::model::ssl_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62911,9 +62891,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -62928,14 +62908,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn list_available_features(
         &self,
         req: crate::model::ssl_policies::ListAvailableFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SslPoliciesListAvailableFeaturesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -62984,9 +62963,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63001,13 +62980,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn patch(
         &self,
         req: crate::model::ssl_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63048,9 +63027,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63065,13 +63044,13 @@ impl super::stub::SslPolicies for SslPolicies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63108,9 +63087,9 @@ impl super::stub::SslPolicies for SslPolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63124,15 +63103,15 @@ impl super::stub::SslPolicies for SslPolicies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -63155,7 +63134,7 @@ impl std::fmt::Debug for StoragePoolTypes {
 
 #[cfg(feature = "storage-pool-types")]
 impl StoragePoolTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -63166,13 +63145,13 @@ impl super::stub::StoragePoolTypes for StoragePoolTypes {
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pool_types::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolTypeAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolTypeAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63230,9 +63209,9 @@ impl super::stub::StoragePoolTypes for StoragePoolTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63247,13 +63226,13 @@ impl super::stub::StoragePoolTypes for StoragePoolTypes {
     async fn get(
         &self,
         req: crate::model::storage_pool_types::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63300,9 +63279,9 @@ impl super::stub::StoragePoolTypes for StoragePoolTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63317,13 +63296,13 @@ impl super::stub::StoragePoolTypes for StoragePoolTypes {
     async fn list(
         &self,
         req: crate::model::storage_pool_types::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolTypeList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolTypeList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63382,9 +63361,9 @@ impl super::stub::StoragePoolTypes for StoragePoolTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63415,7 +63394,7 @@ impl std::fmt::Debug for StoragePools {
 
 #[cfg(feature = "storage-pools")]
 impl StoragePools {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -63426,13 +63405,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn aggregated_list(
         &self,
         req: crate::model::storage_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63490,9 +63469,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63507,13 +63486,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn delete(
         &self,
         req: crate::model::storage_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63564,9 +63543,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63581,13 +63560,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn get(
         &self,
         req: crate::model::storage_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63634,9 +63613,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63651,13 +63630,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn get_iam_policy(
         &self,
         req: crate::model::storage_pools::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63710,9 +63689,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63727,13 +63706,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn insert(
         &self,
         req: crate::model::storage_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63774,9 +63753,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63791,13 +63770,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn list(
         &self,
         req: crate::model::storage_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63856,9 +63835,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63873,13 +63852,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn list_disks(
         &self,
         req: crate::model::storage_pools::ListDisksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePoolListDisks>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePoolListDisks>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -63948,9 +63927,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -63965,13 +63944,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn set_iam_policy(
         &self,
         req: crate::model::storage_pools::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64018,9 +63997,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64035,13 +64014,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn test_iam_permissions(
         &self,
         req: crate::model::storage_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64088,9 +64067,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64105,13 +64084,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn update(
         &self,
         req: crate::model::storage_pools::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64174,9 +64153,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64191,13 +64170,13 @@ impl super::stub::StoragePools for StoragePools {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64244,9 +64223,9 @@ impl super::stub::StoragePools for StoragePools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64260,15 +64239,15 @@ impl super::stub::StoragePools for StoragePools {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -64291,7 +64270,7 @@ impl std::fmt::Debug for Subnetworks {
 
 #[cfg(feature = "subnetworks")]
 impl Subnetworks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -64302,13 +64281,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn aggregated_list(
         &self,
         req: crate::model::subnetworks::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubnetworkAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubnetworkAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64370,9 +64349,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64387,13 +64366,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn delete(
         &self,
         req: crate::model::subnetworks::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64444,9 +64423,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64461,13 +64440,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn expand_ip_cidr_range(
         &self,
         req: crate::model::subnetworks::ExpandIpCidrRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64518,9 +64497,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64535,13 +64514,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn get(
         &self,
         req: crate::model::subnetworks::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Subnetwork>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Subnetwork>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64592,9 +64571,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64609,13 +64588,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn get_iam_policy(
         &self,
         req: crate::model::subnetworks::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64668,9 +64647,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64685,13 +64664,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn insert(
         &self,
         req: crate::model::subnetworks::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64732,9 +64711,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64749,13 +64728,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn list(
         &self,
         req: crate::model::subnetworks::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SubnetworkList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SubnetworkList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64818,9 +64797,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64835,13 +64814,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn list_usable(
         &self,
         req: crate::model::subnetworks::ListUsableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UsableSubnetworksAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UsableSubnetworksAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64893,9 +64872,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64910,13 +64889,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn patch(
         &self,
         req: crate::model::subnetworks::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -64973,9 +64952,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -64990,13 +64969,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn set_iam_policy(
         &self,
         req: crate::model::subnetworks::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65043,9 +65022,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65060,13 +65039,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn set_private_ip_google_access(
         &self,
         req: crate::model::subnetworks::SetPrivateIpGoogleAccessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65117,9 +65096,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65134,13 +65113,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn test_iam_permissions(
         &self,
         req: crate::model::subnetworks::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65187,9 +65166,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65204,13 +65183,13 @@ impl super::stub::Subnetworks for Subnetworks {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65257,9 +65236,9 @@ impl super::stub::Subnetworks for Subnetworks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65273,15 +65252,15 @@ impl super::stub::Subnetworks for Subnetworks {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -65304,7 +65283,7 @@ impl std::fmt::Debug for TargetGrpcProxies {
 
 #[cfg(feature = "target-grpc-proxies")]
 impl TargetGrpcProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -65315,13 +65294,13 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
     async fn delete(
         &self,
         req: crate::model::target_grpc_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65362,9 +65341,9 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65379,13 +65358,13 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
     async fn get(
         &self,
         req: crate::model::target_grpc_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetGrpcProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetGrpcProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65422,9 +65401,9 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65439,13 +65418,13 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
     async fn insert(
         &self,
         req: crate::model::target_grpc_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65476,9 +65455,9 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65493,13 +65472,13 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
     async fn list(
         &self,
         req: crate::model::target_grpc_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetGrpcProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetGrpcProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65548,9 +65527,9 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65565,13 +65544,13 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
     async fn patch(
         &self,
         req: crate::model::target_grpc_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65612,9 +65591,9 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65629,13 +65608,13 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65672,9 +65651,9 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65688,15 +65667,15 @@ impl super::stub::TargetGrpcProxies for TargetGrpcProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -65719,7 +65698,7 @@ impl std::fmt::Debug for TargetHttpProxies {
 
 #[cfg(feature = "target-http-proxies")]
 impl TargetHttpProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -65730,13 +65709,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn aggregated_list(
         &self,
         req: crate::model::target_http_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxyAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxyAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65794,9 +65773,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65811,13 +65790,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn delete(
         &self,
         req: crate::model::target_http_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65858,9 +65837,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65875,13 +65854,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn get(
         &self,
         req: crate::model::target_http_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65918,9 +65897,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65935,13 +65914,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn insert(
         &self,
         req: crate::model::target_http_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -65972,9 +65951,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -65989,13 +65968,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn list(
         &self,
         req: crate::model::target_http_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66044,9 +66023,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66061,13 +66040,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn patch(
         &self,
         req: crate::model::target_http_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66108,9 +66087,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66125,13 +66104,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn set_url_map(
         &self,
         req: crate::model::target_http_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66172,9 +66151,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66189,13 +66168,13 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66232,9 +66211,9 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66248,15 +66227,15 @@ impl super::stub::TargetHttpProxies for TargetHttpProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -66279,7 +66258,7 @@ impl std::fmt::Debug for TargetHttpsProxies {
 
 #[cfg(feature = "target-https-proxies")]
 impl TargetHttpsProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -66290,13 +66269,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn aggregated_list(
         &self,
         req: crate::model::target_https_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxyAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxyAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66354,9 +66333,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66371,13 +66350,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn delete(
         &self,
         req: crate::model::target_https_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66422,9 +66401,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66439,13 +66418,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn get(
         &self,
         req: crate::model::target_https_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66486,9 +66465,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66503,13 +66482,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn insert(
         &self,
         req: crate::model::target_https_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66540,9 +66519,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66557,13 +66536,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn list(
         &self,
         req: crate::model::target_https_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetHttpsProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetHttpsProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66612,9 +66591,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66629,13 +66608,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn patch(
         &self,
         req: crate::model::target_https_proxies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66680,9 +66659,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66697,13 +66676,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn set_certificate_map(
         &self,
         req: crate::model::target_https_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66748,9 +66727,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66765,13 +66744,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn set_quic_override(
         &self,
         req: crate::model::target_https_proxies::SetQuicOverrideRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66816,9 +66795,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66833,13 +66812,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_https_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66884,9 +66863,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66901,13 +66880,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_https_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -66952,9 +66931,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -66969,13 +66948,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn set_url_map(
         &self,
         req: crate::model::target_https_proxies::SetUrlMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67020,9 +66999,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67037,13 +67016,13 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67080,9 +67059,9 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67096,15 +67075,15 @@ impl super::stub::TargetHttpsProxies for TargetHttpsProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -67127,7 +67106,7 @@ impl std::fmt::Debug for TargetInstances {
 
 #[cfg(feature = "target-instances")]
 impl TargetInstances {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -67138,13 +67117,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn aggregated_list(
         &self,
         req: crate::model::target_instances::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetInstanceAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetInstanceAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67202,9 +67181,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67219,13 +67198,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn delete(
         &self,
         req: crate::model::target_instances::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67276,9 +67255,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67293,13 +67272,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn get(
         &self,
         req: crate::model::target_instances::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetInstance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetInstance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67346,9 +67325,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67363,13 +67342,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn insert(
         &self,
         req: crate::model::target_instances::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67410,9 +67389,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67427,13 +67406,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn list(
         &self,
         req: crate::model::target_instances::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetInstanceList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetInstanceList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67492,9 +67471,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67509,13 +67488,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn set_security_policy(
         &self,
         req: crate::model::target_instances::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67566,9 +67545,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67583,13 +67562,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_instances::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67636,9 +67615,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67653,13 +67632,13 @@ impl super::stub::TargetInstances for TargetInstances {
     async fn get_operation(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67706,9 +67685,9 @@ impl super::stub::TargetInstances for TargetInstances {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67722,15 +67701,15 @@ impl super::stub::TargetInstances for TargetInstances {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -67753,7 +67732,7 @@ impl std::fmt::Debug for TargetPools {
 
 #[cfg(feature = "target-pools")]
 impl TargetPools {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -67764,13 +67743,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn add_health_check(
         &self,
         req: crate::model::target_pools::AddHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67821,9 +67800,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67838,13 +67817,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn add_instance(
         &self,
         req: crate::model::target_pools::AddInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67895,9 +67874,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67912,13 +67891,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn aggregated_list(
         &self,
         req: crate::model::target_pools::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPoolAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPoolAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -67976,9 +67955,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -67993,13 +67972,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn delete(
         &self,
         req: crate::model::target_pools::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68050,9 +68029,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68067,13 +68046,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn get(
         &self,
         req: crate::model::target_pools::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68120,9 +68099,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68137,13 +68116,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn get_health(
         &self,
         req: crate::model::target_pools::GetHealthRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPoolInstanceHealth>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPoolInstanceHealth>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68190,9 +68169,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68207,13 +68186,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn insert(
         &self,
         req: crate::model::target_pools::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68254,9 +68233,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68271,13 +68250,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn list(
         &self,
         req: crate::model::target_pools::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetPoolList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetPoolList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68336,9 +68315,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68353,13 +68332,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn remove_health_check(
         &self,
         req: crate::model::target_pools::RemoveHealthCheckRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68410,9 +68389,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68427,13 +68406,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn remove_instance(
         &self,
         req: crate::model::target_pools::RemoveInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68484,9 +68463,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68501,13 +68480,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn set_backup(
         &self,
         req: crate::model::target_pools::SetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68562,9 +68541,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68579,13 +68558,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn set_security_policy(
         &self,
         req: crate::model::target_pools::SetSecurityPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68636,9 +68615,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68653,13 +68632,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_pools::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68706,9 +68685,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68723,13 +68702,13 @@ impl super::stub::TargetPools for TargetPools {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68776,9 +68755,9 @@ impl super::stub::TargetPools for TargetPools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68792,15 +68771,15 @@ impl super::stub::TargetPools for TargetPools {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -68823,7 +68802,7 @@ impl std::fmt::Debug for TargetSslProxies {
 
 #[cfg(feature = "target-ssl-proxies")]
 impl TargetSslProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -68834,13 +68813,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn delete(
         &self,
         req: crate::model::target_ssl_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68881,9 +68860,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68898,13 +68877,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn get(
         &self,
         req: crate::model::target_ssl_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetSslProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetSslProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68941,9 +68920,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -68958,13 +68937,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn insert(
         &self,
         req: crate::model::target_ssl_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -68995,9 +68974,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69012,13 +68991,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn list(
         &self,
         req: crate::model::target_ssl_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetSslProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetSslProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69067,9 +69046,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69084,13 +69063,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn set_backend_service(
         &self,
         req: crate::model::target_ssl_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69131,9 +69110,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69148,13 +69127,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn set_certificate_map(
         &self,
         req: crate::model::target_ssl_proxies::SetCertificateMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69195,9 +69174,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69212,13 +69191,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn set_proxy_header(
         &self,
         req: crate::model::target_ssl_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69259,9 +69238,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69276,13 +69255,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn set_ssl_certificates(
         &self,
         req: crate::model::target_ssl_proxies::SetSslCertificatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69323,9 +69302,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69340,13 +69319,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn set_ssl_policy(
         &self,
         req: crate::model::target_ssl_proxies::SetSslPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69387,9 +69366,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69404,13 +69383,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_ssl_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69447,9 +69426,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69464,13 +69443,13 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69507,9 +69486,9 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69523,15 +69502,15 @@ impl super::stub::TargetSslProxies for TargetSslProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -69554,7 +69533,7 @@ impl std::fmt::Debug for TargetTcpProxies {
 
 #[cfg(feature = "target-tcp-proxies")]
 impl TargetTcpProxies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -69565,13 +69544,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn aggregated_list(
         &self,
         req: crate::model::target_tcp_proxies::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxyAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxyAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69629,9 +69608,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69646,13 +69625,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn delete(
         &self,
         req: crate::model::target_tcp_proxies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69693,9 +69672,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69710,13 +69689,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn get(
         &self,
         req: crate::model::target_tcp_proxies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69753,9 +69732,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69770,13 +69749,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn insert(
         &self,
         req: crate::model::target_tcp_proxies::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69807,9 +69786,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69824,13 +69803,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn list(
         &self,
         req: crate::model::target_tcp_proxies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetTcpProxyList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetTcpProxyList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69879,9 +69858,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69896,13 +69875,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn set_backend_service(
         &self,
         req: crate::model::target_tcp_proxies::SetBackendServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -69943,9 +69922,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -69960,13 +69939,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn set_proxy_header(
         &self,
         req: crate::model::target_tcp_proxies::SetProxyHeaderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70007,9 +69986,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70024,13 +70003,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn test_iam_permissions(
         &self,
         req: crate::model::target_tcp_proxies::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70067,9 +70046,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70084,13 +70063,13 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70127,9 +70106,9 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70143,15 +70122,15 @@ impl super::stub::TargetTcpProxies for TargetTcpProxies {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -70174,7 +70153,7 @@ impl std::fmt::Debug for TargetVpnGateways {
 
 #[cfg(feature = "target-vpn-gateways")]
 impl TargetVpnGateways {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -70185,13 +70164,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn aggregated_list(
         &self,
         req: crate::model::target_vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetVpnGatewayAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetVpnGatewayAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70249,9 +70228,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70266,13 +70245,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn delete(
         &self,
         req: crate::model::target_vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70327,9 +70306,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70344,13 +70323,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn get(
         &self,
         req: crate::model::target_vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetVpnGateway>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetVpnGateway>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70401,9 +70380,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70418,13 +70397,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn insert(
         &self,
         req: crate::model::target_vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70465,9 +70444,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70482,13 +70461,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn list(
         &self,
         req: crate::model::target_vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetVpnGatewayList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetVpnGatewayList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70547,9 +70526,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70564,13 +70543,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn set_labels(
         &self,
         req: crate::model::target_vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70621,9 +70600,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70638,13 +70617,13 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70691,9 +70670,9 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70707,15 +70686,15 @@ impl super::stub::TargetVpnGateways for TargetVpnGateways {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -70738,7 +70717,7 @@ impl std::fmt::Debug for UrlMaps {
 
 #[cfg(feature = "url-maps")]
 impl UrlMaps {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -70749,13 +70728,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn aggregated_list(
         &self,
         req: crate::model::url_maps::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapsAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapsAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70813,9 +70792,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70830,13 +70809,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn delete(
         &self,
         req: crate::model::url_maps::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70877,9 +70856,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70894,13 +70873,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn get(
         &self,
         req: crate::model::url_maps::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMap>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMap>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70937,9 +70916,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -70954,13 +70933,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn insert(
         &self,
         req: crate::model::url_maps::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -70991,9 +70970,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71008,13 +70987,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn invalidate_cache(
         &self,
         req: crate::model::url_maps::InvalidateCacheRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71055,9 +71034,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71072,13 +71051,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn list(
         &self,
         req: crate::model::url_maps::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71127,9 +71106,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71144,13 +71123,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn patch(
         &self,
         req: crate::model::url_maps::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71191,9 +71170,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71208,13 +71187,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn test_iam_permissions(
         &self,
         req: crate::model::url_maps::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71251,9 +71230,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71268,13 +71247,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn update(
         &self,
         req: crate::model::url_maps::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71315,9 +71294,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71332,13 +71311,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn validate(
         &self,
         req: crate::model::url_maps::ValidateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UrlMapsValidateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UrlMapsValidateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71375,9 +71354,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71392,13 +71371,13 @@ impl super::stub::UrlMaps for UrlMaps {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71435,9 +71414,9 @@ impl super::stub::UrlMaps for UrlMaps {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71451,15 +71430,15 @@ impl super::stub::UrlMaps for UrlMaps {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -71482,7 +71461,7 @@ impl std::fmt::Debug for VpnGateways {
 
 #[cfg(feature = "vpn-gateways")]
 impl VpnGateways {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -71493,13 +71472,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_gateways::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGatewayAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGatewayAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71557,9 +71536,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71574,13 +71553,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn delete(
         &self,
         req: crate::model::vpn_gateways::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71631,9 +71610,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71648,13 +71627,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn get(
         &self,
         req: crate::model::vpn_gateways::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGateway>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGateway>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71701,9 +71680,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71718,13 +71697,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn get_status(
         &self,
         req: crate::model::vpn_gateways::GetStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGatewaysGetStatusResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGatewaysGetStatusResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71771,9 +71750,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71788,13 +71767,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn insert(
         &self,
         req: crate::model::vpn_gateways::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71835,9 +71814,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71852,13 +71831,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn list(
         &self,
         req: crate::model::vpn_gateways::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnGatewayList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnGatewayList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71917,9 +71896,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -71934,13 +71913,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn set_labels(
         &self,
         req: crate::model::vpn_gateways::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -71991,9 +71970,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72008,13 +71987,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn test_iam_permissions(
         &self,
         req: crate::model::vpn_gateways::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72061,9 +72040,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72078,13 +72057,13 @@ impl super::stub::VpnGateways for VpnGateways {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72131,9 +72110,9 @@ impl super::stub::VpnGateways for VpnGateways {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72147,15 +72126,15 @@ impl super::stub::VpnGateways for VpnGateways {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -72178,7 +72157,7 @@ impl std::fmt::Debug for VpnTunnels {
 
 #[cfg(feature = "vpn-tunnels")]
 impl VpnTunnels {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -72189,13 +72168,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn aggregated_list(
         &self,
         req: crate::model::vpn_tunnels::AggregatedListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnTunnelAggregatedList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnTunnelAggregatedList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72253,9 +72232,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72270,13 +72249,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn delete(
         &self,
         req: crate::model::vpn_tunnels::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72327,9 +72306,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72344,13 +72323,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn get(
         &self,
         req: crate::model::vpn_tunnels::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnTunnel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnTunnel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72397,9 +72376,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72414,13 +72393,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn insert(
         &self,
         req: crate::model::vpn_tunnels::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72461,9 +72440,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72478,13 +72457,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn list(
         &self,
         req: crate::model::vpn_tunnels::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnTunnelList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnTunnelList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72543,9 +72522,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72560,13 +72539,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn set_labels(
         &self,
         req: crate::model::vpn_tunnels::SetLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72617,9 +72596,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72634,13 +72613,13 @@ impl super::stub::VpnTunnels for VpnTunnels {
     async fn get_operation(
         &self,
         req: crate::model::region_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72687,9 +72666,9 @@ impl super::stub::VpnTunnels for VpnTunnels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72703,15 +72682,15 @@ impl super::stub::VpnTunnels for VpnTunnels {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -72734,7 +72713,7 @@ impl std::fmt::Debug for WireGroups {
 
 #[cfg(feature = "wire-groups")]
 impl WireGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -72745,13 +72724,13 @@ impl super::stub::WireGroups for WireGroups {
     async fn delete(
         &self,
         req: crate::model::wire_groups::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72806,9 +72785,9 @@ impl super::stub::WireGroups for WireGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72823,13 +72802,13 @@ impl super::stub::WireGroups for WireGroups {
     async fn get(
         &self,
         req: crate::model::wire_groups::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WireGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WireGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72880,9 +72859,9 @@ impl super::stub::WireGroups for WireGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72897,13 +72876,13 @@ impl super::stub::WireGroups for WireGroups {
     async fn insert(
         &self,
         req: crate::model::wire_groups::InsertRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -72952,9 +72931,9 @@ impl super::stub::WireGroups for WireGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -72969,13 +72948,13 @@ impl super::stub::WireGroups for WireGroups {
     async fn list(
         &self,
         req: crate::model::wire_groups::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WireGroupList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WireGroupList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73038,9 +73017,9 @@ impl super::stub::WireGroups for WireGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73055,13 +73034,13 @@ impl super::stub::WireGroups for WireGroups {
     async fn patch(
         &self,
         req: crate::model::wire_groups::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73132,9 +73111,9 @@ impl super::stub::WireGroups for WireGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73149,13 +73128,13 @@ impl super::stub::WireGroups for WireGroups {
     async fn get_operation(
         &self,
         req: crate::model::global_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73192,9 +73171,9 @@ impl super::stub::WireGroups for WireGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73208,15 +73187,15 @@ impl super::stub::WireGroups for WireGroups {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -73239,7 +73218,7 @@ impl std::fmt::Debug for ZoneOperations {
 
 #[cfg(feature = "zone-operations")]
 impl ZoneOperations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -73250,13 +73229,13 @@ impl super::stub::ZoneOperations for ZoneOperations {
     async fn delete(
         &self,
         req: crate::model::zone_operations::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73303,9 +73282,9 @@ impl super::stub::ZoneOperations for ZoneOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73314,24 +73293,25 @@ impl super::stub::ZoneOperations for ZoneOperations {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73378,9 +73358,9 @@ impl super::stub::ZoneOperations for ZoneOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73395,13 +73375,13 @@ impl super::stub::ZoneOperations for ZoneOperations {
     async fn list(
         &self,
         req: crate::model::zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OperationList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OperationList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73460,9 +73440,9 @@ impl super::stub::ZoneOperations for ZoneOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73477,13 +73457,13 @@ impl super::stub::ZoneOperations for ZoneOperations {
     async fn wait(
         &self,
         req: crate::model::zone_operations::WaitRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73530,9 +73510,9 @@ impl super::stub::ZoneOperations for ZoneOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73561,7 +73541,7 @@ impl std::fmt::Debug for Zones {
 
 #[cfg(feature = "zones")]
 impl Zones {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -73572,13 +73552,13 @@ impl super::stub::Zones for Zones {
     async fn get(
         &self,
         req: crate::model::zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Zone>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Zone>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73615,9 +73595,9 @@ impl super::stub::Zones for Zones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -73632,13 +73612,13 @@ impl super::stub::Zones for Zones {
     async fn list(
         &self,
         req: crate::model::zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ZoneList>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ZoneList>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -73687,9 +73667,9 @@ impl super::stub::Zones for Zones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/confidentialcomputing/v1/Cargo.toml b/src/generated/cloud/confidentialcomputing/v1/Cargo.toml
index 6c207f9104..6e5a06c30a 100644
--- a/src/generated/cloud/confidentialcomputing/v1/Cargo.toml
+++ b/src/generated/cloud/confidentialcomputing/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-location.workspace = true
 google-cloud-rpc.workspace      = true
 lazy_static.workspace           = true
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/builder.rs b/src/generated/cloud/confidentialcomputing/v1/src/builder.rs
index 9f5f012ded..2411f5356f 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/builder.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod confidential_computing {
     /// A builder for [ConfidentialComputing][crate::client::ConfidentialComputing].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_confidentialcomputing_v1::*;
     /// # use builder::confidential_computing::ClientBuilder;
     /// # use client::ConfidentialComputing;
@@ -30,19 +30,18 @@ pub mod confidential_computing {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConfidentialComputing;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConfidentialComputing;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod confidential_computing {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConfidentialComputing>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod confidential_computing {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod confidential_computing {
     /// # Example
     /// ```
     /// # use google_cloud_confidentialcomputing_v1::builder::confidential_computing::CreateChallenge;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_confidentialcomputing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod confidential_computing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod confidential_computing {
             (*self.0.stub)
                 .create_challenge(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateChallengeRequest::parent].
@@ -149,8 +148,8 @@ pub mod confidential_computing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateChallenge {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateChallenge {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -160,7 +159,7 @@ pub mod confidential_computing {
     /// # Example
     /// ```
     /// # use google_cloud_confidentialcomputing_v1::builder::confidential_computing::VerifyAttestation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_confidentialcomputing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -191,7 +190,7 @@ pub mod confidential_computing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -201,7 +200,7 @@ pub mod confidential_computing {
             (*self.0.stub)
                 .verify_attestation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [challenge][crate::model::VerifyAttestationRequest::challenge].
@@ -340,8 +339,8 @@ pub mod confidential_computing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for VerifyAttestation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for VerifyAttestation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -351,7 +350,7 @@ pub mod confidential_computing {
     /// # Example
     /// ```
     /// # use google_cloud_confidentialcomputing_v1::builder::confidential_computing::VerifyConfidentialSpace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_confidentialcomputing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -384,7 +383,7 @@ pub mod confidential_computing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -394,7 +393,7 @@ pub mod confidential_computing {
             (*self.0.stub)
                 .verify_confidential_space(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [challenge][crate::model::VerifyConfidentialSpaceRequest::challenge].
@@ -520,8 +519,8 @@ pub mod confidential_computing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for VerifyConfidentialSpace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for VerifyConfidentialSpace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -531,7 +530,7 @@ pub mod confidential_computing {
     /// # Example
     /// ```
     /// # use google_cloud_confidentialcomputing_v1::builder::confidential_computing::VerifyConfidentialGke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_confidentialcomputing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -562,7 +561,7 @@ pub mod confidential_computing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -572,7 +571,7 @@ pub mod confidential_computing {
             (*self.0.stub)
                 .verify_confidential_gke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [challenge][crate::model::VerifyConfidentialGkeRequest::challenge].
@@ -614,8 +613,8 @@ pub mod confidential_computing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for VerifyConfidentialGke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for VerifyConfidentialGke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -625,8 +624,8 @@ pub mod confidential_computing {
     /// # Example
     /// ```
     /// # use google_cloud_confidentialcomputing_v1::builder::confidential_computing::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_confidentialcomputing_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -660,7 +659,7 @@ pub mod confidential_computing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -670,15 +669,15 @@ pub mod confidential_computing {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -687,17 +686,17 @@ pub mod confidential_computing {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -727,8 +726,8 @@ pub mod confidential_computing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -738,7 +737,7 @@ pub mod confidential_computing {
     /// # Example
     /// ```
     /// # use google_cloud_confidentialcomputing_v1::builder::confidential_computing::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_confidentialcomputing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -769,7 +768,7 @@ pub mod confidential_computing {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -779,7 +778,7 @@ pub mod confidential_computing {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -790,8 +789,8 @@ pub mod confidential_computing {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/client.rs b/src/generated/cloud/confidentialcomputing/v1/src/client.rs
index aa698060b3..58dba6914a 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/client.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_confidentialcomputing_v1::client::ConfidentialComputing;
 /// let client = ConfidentialComputing::builder().build().await?;
 /// // use `client` to make requests to the Confidential Computing API.
@@ -66,15 +66,13 @@ impl ConfidentialComputing {
     /// Returns a builder for [ConfidentialComputing].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_confidentialcomputing_v1::client::ConfidentialComputing;
     /// let client = ConfidentialComputing::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::confidential_computing::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::confidential_computing::client::Factory,
-        )
+        crate::new_client_builder(super::builder::confidential_computing::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl ConfidentialComputing {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConfidentialComputing>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConfidentialComputing>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl ConfidentialComputing {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConfidentialComputing> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConfidentialComputing> {
         super::transport::ConfidentialComputing::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConfidentialComputing> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConfidentialComputing> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConfidentialComputing::new)
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/lib.rs b/src/generated/cloud/confidentialcomputing/v1/src/lib.rs
index 98947515f4..464469fc44 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/lib.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/model.rs b/src/generated/cloud/confidentialcomputing/v1/src/model.rs
index 56fa42d458..70af5473b6 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/model.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_rpc;
 extern crate lazy_static;
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/stub.rs b/src/generated/cloud/confidentialcomputing/v1/src/stub.rs
index 54a211b2f4..251727d67b 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/stub.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     fn create_challenge(
         &self,
         _req: crate::model::CreateChallengeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Challenge>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Challenge>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     fn verify_attestation(
         &self,
         _req: crate::model::VerifyAttestationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VerifyAttestationResponse>>,
+        Output = crate::Result<crate::Response<crate::model::VerifyAttestationResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,11 +63,9 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     fn verify_confidential_space(
         &self,
         _req: crate::model::VerifyConfidentialSpaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::VerifyConfidentialSpaceResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::VerifyConfidentialSpaceResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,11 +74,9 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     fn verify_confidential_gke(
         &self,
         _req: crate::model::VerifyConfidentialGkeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::VerifyConfidentialGkeResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::VerifyConfidentialGkeResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -90,10 +85,10 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -103,9 +98,9 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/stub/dynamic.rs b/src/generated/cloud/confidentialcomputing/v1/src/stub/dynamic.rs
index a880602e15..e8f522a6be 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/stub/dynamic.rs
@@ -20,38 +20,38 @@ pub trait ConfidentialComputing: std::fmt::Debug + Send + Sync {
     async fn create_challenge(
         &self,
         req: crate::model::CreateChallengeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Challenge>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Challenge>>;
 
     async fn verify_attestation(
         &self,
         req: crate::model::VerifyAttestationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyAttestationResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyAttestationResponse>>;
 
     async fn verify_confidential_space(
         &self,
         req: crate::model::VerifyConfidentialSpaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyConfidentialSpaceResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyConfidentialSpaceResponse>>;
 
     async fn verify_confidential_gke(
         &self,
         req: crate::model::VerifyConfidentialGkeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyConfidentialGkeResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyConfidentialGkeResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 }
 
 /// All implementations of [super::ConfidentialComputing] also implement [ConfidentialComputing].
@@ -61,8 +61,8 @@ impl<T: super::ConfidentialComputing> ConfidentialComputing for T {
     async fn create_challenge(
         &self,
         req: crate::model::CreateChallengeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Challenge>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Challenge>> {
         T::create_challenge(self, req, options).await
     }
 
@@ -70,8 +70,8 @@ impl<T: super::ConfidentialComputing> ConfidentialComputing for T {
     async fn verify_attestation(
         &self,
         req: crate::model::VerifyAttestationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyAttestationResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyAttestationResponse>> {
         T::verify_attestation(self, req, options).await
     }
 
@@ -79,8 +79,8 @@ impl<T: super::ConfidentialComputing> ConfidentialComputing for T {
     async fn verify_confidential_space(
         &self,
         req: crate::model::VerifyConfidentialSpaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyConfidentialSpaceResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyConfidentialSpaceResponse>> {
         T::verify_confidential_space(self, req, options).await
     }
 
@@ -88,8 +88,8 @@ impl<T: super::ConfidentialComputing> ConfidentialComputing for T {
     async fn verify_confidential_gke(
         &self,
         req: crate::model::VerifyConfidentialGkeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyConfidentialGkeResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyConfidentialGkeResponse>> {
         T::verify_confidential_gke(self, req, options).await
     }
 
@@ -97,9 +97,8 @@ impl<T: super::ConfidentialComputing> ConfidentialComputing for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -107,8 +106,8 @@ impl<T: super::ConfidentialComputing> ConfidentialComputing for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/tracing.rs b/src/generated/cloud/confidentialcomputing/v1/src/tracing.rs
index e8fa681a78..eff361a2c8 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/tracing.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_challenge(
         &self,
         req: crate::model::CreateChallengeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Challenge>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Challenge>> {
         self.inner.create_challenge(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn verify_attestation(
         &self,
         req: crate::model::VerifyAttestationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyAttestationResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyAttestationResponse>> {
         self.inner.verify_attestation(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn verify_confidential_space(
         &self,
         req: crate::model::VerifyConfidentialSpaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyConfidentialSpaceResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyConfidentialSpaceResponse>> {
         self.inner.verify_confidential_space(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn verify_confidential_gke(
         &self,
         req: crate::model::VerifyConfidentialGkeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyConfidentialGkeResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyConfidentialGkeResponse>> {
         self.inner.verify_confidential_gke(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/transport.rs b/src/generated/cloud/confidentialcomputing/v1/src/transport.rs
index 0ec6b68c96..66a131047a 100644
--- a/src/generated/cloud/confidentialcomputing/v1/src/transport.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ConfidentialComputing](super::stub::ConfidentialComputing) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ConfidentialComputing {
 }
 
 impl ConfidentialComputing {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
     async fn create_challenge(
         &self,
         req: crate::model::CreateChallengeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Challenge>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Challenge>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -86,9 +86,9 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -103,13 +103,13 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
     async fn verify_attestation(
         &self,
         req: crate::model::VerifyAttestationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyAttestationResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyAttestationResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
     async fn verify_confidential_space(
         &self,
         req: crate::model::VerifyConfidentialSpaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyConfidentialSpaceResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyConfidentialSpaceResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
     async fn verify_confidential_gke(
         &self,
         req: crate::model::VerifyConfidentialGkeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyConfidentialGkeResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyConfidentialGkeResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -278,9 +278,9 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -295,13 +295,13 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -331,9 +331,9 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -348,13 +348,13 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -391,9 +391,9 @@ impl super::stub::ConfidentialComputing for ConfidentialComputing {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/config/v1/Cargo.toml b/src/generated/cloud/config/v1/Cargo.toml
index bde797a1e9..15111b1c70 100644
--- a/src/generated/cloud/config/v1/Cargo.toml
+++ b/src/generated/cloud/config/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/config/v1/src/builder.rs b/src/generated/cloud/config/v1/src/builder.rs
index 02102b71a1..fe5976645b 100644
--- a/src/generated/cloud/config/v1/src/builder.rs
+++ b/src/generated/cloud/config/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod config {
     /// A builder for [Config][crate::client::Config].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_config_v1::*;
     /// # use builder::config::ClientBuilder;
     /// # use client::Config;
@@ -30,19 +30,18 @@ pub mod config {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Config;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Config;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod config {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Config>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod config {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -104,7 +103,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,14 +113,16 @@ pub mod config {
             (*self.0.stub)
                 .list_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -129,15 +130,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -175,8 +178,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -186,7 +189,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -212,7 +215,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -222,7 +225,7 @@ pub mod config {
             (*self.0.stub)
                 .get_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeploymentRequest::name].
@@ -235,8 +238,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +249,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::CreateDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -276,7 +279,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -291,7 +294,7 @@ pub mod config {
             (*self.0.stub)
                 .create_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_deployment`.
@@ -308,7 +311,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -381,8 +384,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -392,7 +395,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::UpdateDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -422,7 +425,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -437,7 +440,7 @@ pub mod config {
             (*self.0.stub)
                 .update_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_deployment`.
@@ -454,7 +457,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -529,8 +532,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -540,7 +543,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::DeleteDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -570,7 +573,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -585,7 +588,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_deployment`.
@@ -602,7 +605,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -660,8 +663,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -671,8 +674,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListRevisions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -701,7 +704,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -711,13 +714,13 @@ pub mod config {
             (*self.0.stub)
                 .list_revisions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRevisionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRevisionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -726,15 +729,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRevisionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRevisionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -772,8 +777,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRevisions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRevisions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -783,7 +788,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -809,7 +814,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -819,7 +824,7 @@ pub mod config {
             (*self.0.stub)
                 .get_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRevisionRequest::name].
@@ -832,8 +837,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -843,7 +848,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetResource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -869,7 +874,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -879,7 +884,7 @@ pub mod config {
             (*self.0.stub)
                 .get_resource(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetResourceRequest::name].
@@ -892,8 +897,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetResource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetResource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -903,8 +908,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -933,7 +938,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -943,13 +948,13 @@ pub mod config {
             (*self.0.stub)
                 .list_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListResourcesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListResourcesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -958,15 +963,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListResourcesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListResourcesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1004,8 +1011,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1015,7 +1022,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ExportDeploymentStatefile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1046,7 +1053,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1056,7 +1063,7 @@ pub mod config {
             (*self.0.stub)
                 .export_deployment_statefile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ExportDeploymentStatefileRequest::parent].
@@ -1075,8 +1082,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportDeploymentStatefile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportDeploymentStatefile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1086,7 +1093,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ExportRevisionStatefile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1117,7 +1124,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1127,7 +1134,7 @@ pub mod config {
             (*self.0.stub)
                 .export_revision_statefile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ExportRevisionStatefileRequest::parent].
@@ -1140,8 +1147,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportRevisionStatefile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportRevisionStatefile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1151,7 +1158,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ImportStatefile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1177,7 +1184,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1187,7 +1194,7 @@ pub mod config {
             (*self.0.stub)
                 .import_statefile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ImportStatefileRequest::parent].
@@ -1214,8 +1221,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportStatefile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportStatefile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1225,7 +1232,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::DeleteStatefile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1251,7 +1258,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1261,7 +1268,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_statefile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteStatefileRequest::name].
@@ -1282,8 +1289,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteStatefile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteStatefile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1293,7 +1300,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::LockDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1320,7 +1327,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1335,7 +1342,7 @@ pub mod config {
             (*self.0.stub)
                 .lock_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `lock_deployment`.
@@ -1352,7 +1359,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1389,8 +1396,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LockDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LockDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1400,7 +1407,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::UnlockDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1430,7 +1437,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1445,7 +1452,7 @@ pub mod config {
             (*self.0.stub)
                 .unlock_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `unlock_deployment`.
@@ -1462,7 +1469,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1507,8 +1514,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UnlockDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UnlockDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1518,7 +1525,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ExportLockInfo;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1544,7 +1551,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1554,7 +1561,7 @@ pub mod config {
             (*self.0.stub)
                 .export_lock_info(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ExportLockInfoRequest::name].
@@ -1567,8 +1574,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportLockInfo {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportLockInfo {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1578,7 +1585,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::CreatePreview;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1605,7 +1612,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1620,7 +1627,7 @@ pub mod config {
             (*self.0.stub)
                 .create_preview(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_preview`.
@@ -1637,7 +1644,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1708,8 +1715,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePreview {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePreview {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1719,7 +1726,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetPreview;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1745,7 +1752,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1755,7 +1762,7 @@ pub mod config {
             (*self.0.stub)
                 .get_preview(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPreviewRequest::name].
@@ -1768,8 +1775,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPreview {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPreview {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1779,8 +1786,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListPreviews;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1809,7 +1816,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1819,13 +1826,13 @@ pub mod config {
             (*self.0.stub)
                 .list_previews(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPreviewsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListPreviewsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1834,15 +1841,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPreviewsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPreviewsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1880,8 +1889,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPreviews {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPreviews {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1891,7 +1900,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::DeletePreview;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1918,7 +1927,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1933,7 +1942,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_preview(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_preview`.
@@ -1950,7 +1959,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1993,8 +2002,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePreview {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePreview {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2004,7 +2013,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ExportPreviewResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2033,7 +2042,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2043,7 +2052,7 @@ pub mod config {
             (*self.0.stub)
                 .export_preview_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ExportPreviewResultRequest::parent].
@@ -2056,8 +2065,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportPreviewResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportPreviewResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2067,8 +2076,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListTerraformVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2100,7 +2109,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2110,14 +2119,16 @@ pub mod config {
             (*self.0.stub)
                 .list_terraform_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTerraformVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTerraformVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2125,17 +2136,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTerraformVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2173,8 +2184,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTerraformVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTerraformVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2184,7 +2195,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetTerraformVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2213,7 +2224,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2223,7 +2234,7 @@ pub mod config {
             (*self.0.stub)
                 .get_terraform_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTerraformVersionRequest::name].
@@ -2236,8 +2247,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTerraformVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTerraformVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2247,8 +2258,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListResourceChanges;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2280,7 +2291,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2290,14 +2301,16 @@ pub mod config {
             (*self.0.stub)
                 .list_resource_changes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListResourceChangesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListResourceChangesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2305,17 +2318,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListResourceChangesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2353,8 +2366,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResourceChanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResourceChanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2364,7 +2377,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetResourceChange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2393,7 +2406,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2403,7 +2416,7 @@ pub mod config {
             (*self.0.stub)
                 .get_resource_change(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetResourceChangeRequest::name].
@@ -2416,8 +2429,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetResourceChange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetResourceChange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2427,8 +2440,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListResourceDrifts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2460,7 +2473,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2470,14 +2483,16 @@ pub mod config {
             (*self.0.stub)
                 .list_resource_drifts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListResourceDriftsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListResourceDriftsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2485,17 +2500,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListResourceDriftsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2533,8 +2548,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResourceDrifts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResourceDrifts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2544,7 +2559,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetResourceDrift;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2573,7 +2588,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2583,7 +2598,7 @@ pub mod config {
             (*self.0.stub)
                 .get_resource_drift(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetResourceDriftRequest::name].
@@ -2596,8 +2611,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetResourceDrift {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetResourceDrift {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2607,7 +2622,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetAutoMigrationConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2636,7 +2651,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2646,7 +2661,7 @@ pub mod config {
             (*self.0.stub)
                 .get_auto_migration_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAutoMigrationConfigRequest::name].
@@ -2659,8 +2674,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAutoMigrationConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAutoMigrationConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2670,7 +2685,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::UpdateAutoMigrationConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2702,7 +2717,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2717,7 +2732,7 @@ pub mod config {
             (*self.0.stub)
                 .update_auto_migration_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_auto_migration_config`.
@@ -2736,7 +2751,7 @@ pub mod config {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2805,8 +2820,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAutoMigrationConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAutoMigrationConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2816,8 +2831,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2849,7 +2864,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2859,15 +2874,15 @@ pub mod config {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2876,17 +2891,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2916,8 +2931,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2927,7 +2942,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2956,7 +2971,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2966,7 +2981,7 @@ pub mod config {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2977,8 +2992,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2988,7 +3003,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3017,7 +3032,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3027,7 +3042,7 @@ pub mod config {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -3080,8 +3095,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3091,7 +3106,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3120,7 +3135,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3130,7 +3145,7 @@ pub mod config {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -3161,8 +3176,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3172,7 +3187,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3203,7 +3218,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3213,7 +3228,7 @@ pub mod config {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -3239,8 +3254,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3250,8 +3265,8 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3285,7 +3300,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3295,15 +3310,15 @@ pub mod config {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3312,17 +3327,17 @@ pub mod config {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3358,8 +3373,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3369,7 +3384,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3398,7 +3413,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3408,7 +3423,7 @@ pub mod config {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3419,8 +3434,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3430,7 +3445,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3461,7 +3476,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3471,7 +3486,7 @@ pub mod config {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3482,8 +3497,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3493,7 +3508,7 @@ pub mod config {
     /// # Example
     /// ```
     /// # use google_cloud_config_v1::builder::config::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_config_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3524,7 +3539,7 @@ pub mod config {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3534,7 +3549,7 @@ pub mod config {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3545,8 +3560,8 @@ pub mod config {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/config/v1/src/client.rs b/src/generated/cloud/config/v1/src/client.rs
index a809a5dbac..94c50e92cf 100644
--- a/src/generated/cloud/config/v1/src/client.rs
+++ b/src/generated/cloud/config/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_config_v1::client::Config;
 /// let client = Config::builder().build().await?;
 /// // use `client` to make requests to the Infrastructure Manager API.
@@ -67,13 +67,13 @@ impl Config {
     /// Returns a builder for [Config].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_config_v1::client::Config;
     /// let client = Config::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::config::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::config::client::Factory)
+        crate::new_client_builder(super::builder::config::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl Config {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Config>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Config>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl Config {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Config> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Config> {
         super::transport::Config::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Config> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Config> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Config::new)
diff --git a/src/generated/cloud/config/v1/src/lib.rs b/src/generated/cloud/config/v1/src/lib.rs
index e8bfac2d8b..62a14733e6 100644
--- a/src/generated/cloud/config/v1/src/lib.rs
+++ b/src/generated/cloud/config/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/config/v1/src/model.rs b/src/generated/cloud/config/v1/src/model.rs
index 4c904c9401..93bfc739fe 100644
--- a/src/generated/cloud/config/v1/src/model.rs
+++ b/src/generated/cloud/config/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -1815,7 +1815,7 @@ impl wkt::message::Message for ListDeploymentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
     type PageItem = crate::model::Deployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2067,7 +2067,7 @@ impl wkt::message::Message for ListRevisionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRevisionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRevisionsResponse {
     type PageItem = crate::model::Revision;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5213,7 +5213,7 @@ impl wkt::message::Message for ListResourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListResourcesResponse {
     type PageItem = crate::model::Resource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7521,7 +7521,7 @@ impl wkt::message::Message for ListPreviewsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPreviewsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPreviewsResponse {
     type PageItem = crate::model::Preview;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7964,7 +7964,7 @@ impl wkt::message::Message for ListTerraformVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTerraformVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTerraformVersionsResponse {
     type PageItem = crate::model::TerraformVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9008,7 +9008,7 @@ impl wkt::message::Message for ListResourceChangesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourceChangesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListResourceChangesResponse {
     type PageItem = crate::model::ResourceChange;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9577,7 +9577,7 @@ impl wkt::message::Message for ListResourceDriftsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourceDriftsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListResourceDriftsResponse {
     type PageItem = crate::model::ResourceDrift;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/config/v1/src/stub.rs b/src/generated/cloud/config/v1/src/stub.rs
index e214977281..5947c109b9 100644
--- a/src/generated/cloud/config/v1/src/stub.rs
+++ b/src/generated/cloud/config/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_deployments(
         &self,
         _req: crate::model::ListDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_deployment(
         &self,
         _req: crate::model::GetDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn create_deployment(
         &self,
         _req: crate::model::CreateDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn update_deployment(
         &self,
         _req: crate::model::UpdateDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_deployment(
         &self,
         _req: crate::model::DeleteDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_revisions(
         &self,
         _req: crate::model::ListRevisionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRevisionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRevisionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +107,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_revision(
         &self,
         _req: crate::model::GetRevisionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Revision>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Revision>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -119,10 +117,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_resource(
         &self,
         _req: crate::model::GetResourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Resource>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Resource>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -130,9 +127,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_resources(
         &self,
         _req: crate::model::ListResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListResourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,10 +138,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn export_deployment_statefile(
         &self,
         _req: crate::model::ExportDeploymentStatefileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Statefile>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Statefile>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -152,10 +148,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn export_revision_statefile(
         &self,
         _req: crate::model::ExportRevisionStatefileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Statefile>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Statefile>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -163,10 +158,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn import_statefile(
         &self,
         _req: crate::model::ImportStatefileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Statefile>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Statefile>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -174,8 +168,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_statefile(
         &self,
         _req: crate::model::DeleteStatefileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -183,9 +177,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn lock_deployment(
         &self,
         _req: crate::model::LockDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -194,9 +188,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn unlock_deployment(
         &self,
         _req: crate::model::UnlockDeploymentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -205,10 +199,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn export_lock_info(
         &self,
         _req: crate::model::ExportLockInfoRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LockInfo>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::LockInfo>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -216,9 +209,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn create_preview(
         &self,
         _req: crate::model::CreatePreviewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -227,10 +220,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_preview(
         &self,
         _req: crate::model::GetPreviewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Preview>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Preview>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -238,9 +230,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_previews(
         &self,
         _req: crate::model::ListPreviewsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPreviewsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPreviewsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -249,9 +241,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_preview(
         &self,
         _req: crate::model::DeletePreviewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -260,9 +252,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn export_preview_result(
         &self,
         _req: crate::model::ExportPreviewResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExportPreviewResultResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ExportPreviewResultResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -271,11 +263,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_terraform_versions(
         &self,
         _req: crate::model::ListTerraformVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListTerraformVersionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListTerraformVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -284,9 +274,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_terraform_version(
         &self,
         _req: crate::model::GetTerraformVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TerraformVersion>>,
+        Output = crate::Result<crate::Response<crate::model::TerraformVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -295,9 +285,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_resource_changes(
         &self,
         _req: crate::model::ListResourceChangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListResourceChangesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListResourceChangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -306,9 +296,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_resource_change(
         &self,
         _req: crate::model::GetResourceChangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceChange>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceChange>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -317,9 +307,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_resource_drifts(
         &self,
         _req: crate::model::ListResourceDriftsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListResourceDriftsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListResourceDriftsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -328,9 +318,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_resource_drift(
         &self,
         _req: crate::model::GetResourceDriftRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceDrift>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceDrift>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -339,9 +329,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_auto_migration_config(
         &self,
         _req: crate::model::GetAutoMigrationConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutoMigrationConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AutoMigrationConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -350,9 +340,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn update_auto_migration_config(
         &self,
         _req: crate::model::UpdateAutoMigrationConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -361,10 +351,10 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -374,9 +364,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,9 +375,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -396,9 +386,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -407,10 +397,10 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -420,10 +410,10 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -433,9 +423,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -444,8 +434,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -453,8 +443,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -464,9 +454,9 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -475,8 +465,8 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/config/v1/src/stub/dynamic.rs b/src/generated/cloud/config/v1/src/stub/dynamic.rs
index 4761ef48fb..49fbef97fc 100644
--- a/src/generated/cloud/config/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/config/v1/src/stub/dynamic.rs
@@ -20,244 +20,240 @@ pub trait Config: std::fmt::Debug + Send + Sync {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>;
 
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_revisions(
         &self,
         req: crate::model::ListRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRevisionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRevisionsResponse>>;
 
     async fn get_revision(
         &self,
         req: crate::model::GetRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Revision>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Revision>>;
 
     async fn get_resource(
         &self,
         req: crate::model::GetResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Resource>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Resource>>;
 
     async fn list_resources(
         &self,
         req: crate::model::ListResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourcesResponse>>;
 
     async fn export_deployment_statefile(
         &self,
         req: crate::model::ExportDeploymentStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Statefile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Statefile>>;
 
     async fn export_revision_statefile(
         &self,
         req: crate::model::ExportRevisionStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Statefile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Statefile>>;
 
     async fn import_statefile(
         &self,
         req: crate::model::ImportStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Statefile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Statefile>>;
 
     async fn delete_statefile(
         &self,
         req: crate::model::DeleteStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn lock_deployment(
         &self,
         req: crate::model::LockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn unlock_deployment(
         &self,
         req: crate::model::UnlockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_lock_info(
         &self,
         req: crate::model::ExportLockInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LockInfo>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LockInfo>>;
 
     async fn create_preview(
         &self,
         req: crate::model::CreatePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_preview(
         &self,
         req: crate::model::GetPreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Preview>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Preview>>;
 
     async fn list_previews(
         &self,
         req: crate::model::ListPreviewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPreviewsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPreviewsResponse>>;
 
     async fn delete_preview(
         &self,
         req: crate::model::DeletePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_preview_result(
         &self,
         req: crate::model::ExportPreviewResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExportPreviewResultResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExportPreviewResultResponse>>;
 
     async fn list_terraform_versions(
         &self,
         req: crate::model::ListTerraformVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTerraformVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTerraformVersionsResponse>>;
 
     async fn get_terraform_version(
         &self,
         req: crate::model::GetTerraformVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TerraformVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TerraformVersion>>;
 
     async fn list_resource_changes(
         &self,
         req: crate::model::ListResourceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceChangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceChangesResponse>>;
 
     async fn get_resource_change(
         &self,
         req: crate::model::GetResourceChangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceChange>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceChange>>;
 
     async fn list_resource_drifts(
         &self,
         req: crate::model::ListResourceDriftsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceDriftsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceDriftsResponse>>;
 
     async fn get_resource_drift(
         &self,
         req: crate::model::GetResourceDriftRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceDrift>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceDrift>>;
 
     async fn get_auto_migration_config(
         &self,
         req: crate::model::GetAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoMigrationConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoMigrationConfig>>;
 
     async fn update_auto_migration_config(
         &self,
         req: crate::model::UpdateAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Config] also implement [Config].
@@ -267,8 +263,8 @@ impl<T: super::Config> Config for T {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         T::list_deployments(self, req, options).await
     }
 
@@ -276,8 +272,8 @@ impl<T: super::Config> Config for T {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::get_deployment(self, req, options).await
     }
 
@@ -285,8 +281,8 @@ impl<T: super::Config> Config for T {
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_deployment(self, req, options).await
     }
 
@@ -294,8 +290,8 @@ impl<T: super::Config> Config for T {
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_deployment(self, req, options).await
     }
 
@@ -303,8 +299,8 @@ impl<T: super::Config> Config for T {
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_deployment(self, req, options).await
     }
 
@@ -312,8 +308,8 @@ impl<T: super::Config> Config for T {
     async fn list_revisions(
         &self,
         req: crate::model::ListRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRevisionsResponse>> {
         T::list_revisions(self, req, options).await
     }
 
@@ -321,8 +317,8 @@ impl<T: super::Config> Config for T {
     async fn get_revision(
         &self,
         req: crate::model::GetRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Revision>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Revision>> {
         T::get_revision(self, req, options).await
     }
 
@@ -330,8 +326,8 @@ impl<T: super::Config> Config for T {
     async fn get_resource(
         &self,
         req: crate::model::GetResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Resource>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Resource>> {
         T::get_resource(self, req, options).await
     }
 
@@ -339,8 +335,8 @@ impl<T: super::Config> Config for T {
     async fn list_resources(
         &self,
         req: crate::model::ListResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourcesResponse>> {
         T::list_resources(self, req, options).await
     }
 
@@ -348,8 +344,8 @@ impl<T: super::Config> Config for T {
     async fn export_deployment_statefile(
         &self,
         req: crate::model::ExportDeploymentStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Statefile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Statefile>> {
         T::export_deployment_statefile(self, req, options).await
     }
 
@@ -357,8 +353,8 @@ impl<T: super::Config> Config for T {
     async fn export_revision_statefile(
         &self,
         req: crate::model::ExportRevisionStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Statefile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Statefile>> {
         T::export_revision_statefile(self, req, options).await
     }
 
@@ -366,8 +362,8 @@ impl<T: super::Config> Config for T {
     async fn import_statefile(
         &self,
         req: crate::model::ImportStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Statefile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Statefile>> {
         T::import_statefile(self, req, options).await
     }
 
@@ -375,8 +371,8 @@ impl<T: super::Config> Config for T {
     async fn delete_statefile(
         &self,
         req: crate::model::DeleteStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_statefile(self, req, options).await
     }
 
@@ -384,8 +380,8 @@ impl<T: super::Config> Config for T {
     async fn lock_deployment(
         &self,
         req: crate::model::LockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::lock_deployment(self, req, options).await
     }
 
@@ -393,8 +389,8 @@ impl<T: super::Config> Config for T {
     async fn unlock_deployment(
         &self,
         req: crate::model::UnlockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::unlock_deployment(self, req, options).await
     }
 
@@ -402,8 +398,8 @@ impl<T: super::Config> Config for T {
     async fn export_lock_info(
         &self,
         req: crate::model::ExportLockInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LockInfo>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LockInfo>> {
         T::export_lock_info(self, req, options).await
     }
 
@@ -411,8 +407,8 @@ impl<T: super::Config> Config for T {
     async fn create_preview(
         &self,
         req: crate::model::CreatePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_preview(self, req, options).await
     }
 
@@ -420,8 +416,8 @@ impl<T: super::Config> Config for T {
     async fn get_preview(
         &self,
         req: crate::model::GetPreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Preview>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Preview>> {
         T::get_preview(self, req, options).await
     }
 
@@ -429,8 +425,8 @@ impl<T: super::Config> Config for T {
     async fn list_previews(
         &self,
         req: crate::model::ListPreviewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPreviewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPreviewsResponse>> {
         T::list_previews(self, req, options).await
     }
 
@@ -438,8 +434,8 @@ impl<T: super::Config> Config for T {
     async fn delete_preview(
         &self,
         req: crate::model::DeletePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_preview(self, req, options).await
     }
 
@@ -447,8 +443,8 @@ impl<T: super::Config> Config for T {
     async fn export_preview_result(
         &self,
         req: crate::model::ExportPreviewResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExportPreviewResultResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExportPreviewResultResponse>> {
         T::export_preview_result(self, req, options).await
     }
 
@@ -456,8 +452,8 @@ impl<T: super::Config> Config for T {
     async fn list_terraform_versions(
         &self,
         req: crate::model::ListTerraformVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTerraformVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTerraformVersionsResponse>> {
         T::list_terraform_versions(self, req, options).await
     }
 
@@ -465,8 +461,8 @@ impl<T: super::Config> Config for T {
     async fn get_terraform_version(
         &self,
         req: crate::model::GetTerraformVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TerraformVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TerraformVersion>> {
         T::get_terraform_version(self, req, options).await
     }
 
@@ -474,8 +470,8 @@ impl<T: super::Config> Config for T {
     async fn list_resource_changes(
         &self,
         req: crate::model::ListResourceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceChangesResponse>> {
         T::list_resource_changes(self, req, options).await
     }
 
@@ -483,8 +479,8 @@ impl<T: super::Config> Config for T {
     async fn get_resource_change(
         &self,
         req: crate::model::GetResourceChangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceChange>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceChange>> {
         T::get_resource_change(self, req, options).await
     }
 
@@ -492,8 +488,8 @@ impl<T: super::Config> Config for T {
     async fn list_resource_drifts(
         &self,
         req: crate::model::ListResourceDriftsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceDriftsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceDriftsResponse>> {
         T::list_resource_drifts(self, req, options).await
     }
 
@@ -501,8 +497,8 @@ impl<T: super::Config> Config for T {
     async fn get_resource_drift(
         &self,
         req: crate::model::GetResourceDriftRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceDrift>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceDrift>> {
         T::get_resource_drift(self, req, options).await
     }
 
@@ -510,8 +506,8 @@ impl<T: super::Config> Config for T {
     async fn get_auto_migration_config(
         &self,
         req: crate::model::GetAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoMigrationConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoMigrationConfig>> {
         T::get_auto_migration_config(self, req, options).await
     }
 
@@ -519,8 +515,8 @@ impl<T: super::Config> Config for T {
     async fn update_auto_migration_config(
         &self,
         req: crate::model::UpdateAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_auto_migration_config(self, req, options).await
     }
 
@@ -528,9 +524,8 @@ impl<T: super::Config> Config for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -538,8 +533,8 @@ impl<T: super::Config> Config for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -547,8 +542,8 @@ impl<T: super::Config> Config for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -556,8 +551,8 @@ impl<T: super::Config> Config for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -565,10 +560,9 @@ impl<T: super::Config> Config for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -576,10 +570,9 @@ impl<T: super::Config> Config for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -587,8 +580,8 @@ impl<T: super::Config> Config for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -596,8 +589,8 @@ impl<T: super::Config> Config for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -605,22 +598,22 @@ impl<T: super::Config> Config for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/config/v1/src/tracing.rs b/src/generated/cloud/config/v1/src/tracing.rs
index 0e136736ae..2380bd660c 100644
--- a/src/generated/cloud/config/v1/src/tracing.rs
+++ b/src/generated/cloud/config/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         self.inner.list_deployments(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.get_deployment(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_deployment(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_deployment(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_deployment(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_revisions(
         &self,
         req: crate::model::ListRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRevisionsResponse>> {
         self.inner.list_revisions(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_revision(
         &self,
         req: crate::model::GetRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Revision>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Revision>> {
         self.inner.get_revision(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_resource(
         &self,
         req: crate::model::GetResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Resource>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Resource>> {
         self.inner.get_resource(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_resources(
         &self,
         req: crate::model::ListResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourcesResponse>> {
         self.inner.list_resources(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn export_deployment_statefile(
         &self,
         req: crate::model::ExportDeploymentStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Statefile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Statefile>> {
         self.inner.export_deployment_statefile(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn export_revision_statefile(
         &self,
         req: crate::model::ExportRevisionStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Statefile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Statefile>> {
         self.inner.export_revision_statefile(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn import_statefile(
         &self,
         req: crate::model::ImportStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Statefile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Statefile>> {
         self.inner.import_statefile(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn delete_statefile(
         &self,
         req: crate::model::DeleteStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_statefile(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn lock_deployment(
         &self,
         req: crate::model::LockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.lock_deployment(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn unlock_deployment(
         &self,
         req: crate::model::UnlockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.unlock_deployment(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn export_lock_info(
         &self,
         req: crate::model::ExportLockInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LockInfo>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LockInfo>> {
         self.inner.export_lock_info(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn create_preview(
         &self,
         req: crate::model::CreatePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_preview(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_preview(
         &self,
         req: crate::model::GetPreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Preview>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Preview>> {
         self.inner.get_preview(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn list_previews(
         &self,
         req: crate::model::ListPreviewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPreviewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPreviewsResponse>> {
         self.inner.list_previews(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn delete_preview(
         &self,
         req: crate::model::DeletePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_preview(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn export_preview_result(
         &self,
         req: crate::model::ExportPreviewResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExportPreviewResultResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExportPreviewResultResponse>> {
         self.inner.export_preview_result(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn list_terraform_versions(
         &self,
         req: crate::model::ListTerraformVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTerraformVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTerraformVersionsResponse>> {
         self.inner.list_terraform_versions(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn get_terraform_version(
         &self,
         req: crate::model::GetTerraformVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TerraformVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TerraformVersion>> {
         self.inner.get_terraform_version(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn list_resource_changes(
         &self,
         req: crate::model::ListResourceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceChangesResponse>> {
         self.inner.list_resource_changes(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn get_resource_change(
         &self,
         req: crate::model::GetResourceChangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceChange>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceChange>> {
         self.inner.get_resource_change(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn list_resource_drifts(
         &self,
         req: crate::model::ListResourceDriftsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceDriftsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceDriftsResponse>> {
         self.inner.list_resource_drifts(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn get_resource_drift(
         &self,
         req: crate::model::GetResourceDriftRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceDrift>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceDrift>> {
         self.inner.get_resource_drift(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn get_auto_migration_config(
         &self,
         req: crate::model::GetAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoMigrationConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoMigrationConfig>> {
         self.inner.get_auto_migration_config(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn update_auto_migration_config(
         &self,
         req: crate::model::UpdateAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_auto_migration_config(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -338,9 +338,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -348,9 +347,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -358,8 +356,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -367,8 +365,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -376,22 +374,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/config/v1/src/transport.rs b/src/generated/cloud/config/v1/src/transport.rs
index 2c8422bc69..bdf68ce5c0 100644
--- a/src/generated/cloud/config/v1/src/transport.rs
+++ b/src/generated/cloud/config/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Config](super::stub::Config) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Config {
 }
 
 impl Config {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Config for Config {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Config for Config {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Config for Config {
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::Config for Config {
     async fn update_deployment(
         &self,
         req: crate::model::UpdateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::Config for Config {
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -366,9 +366,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -383,13 +383,13 @@ impl super::stub::Config for Config {
     async fn list_revisions(
         &self,
         req: crate::model::ListRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRevisionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRevisionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -434,9 +434,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -451,13 +451,13 @@ impl super::stub::Config for Config {
     async fn get_revision(
         &self,
         req: crate::model::GetRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Revision>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Revision>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -502,9 +502,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -519,13 +519,13 @@ impl super::stub::Config for Config {
     async fn get_resource(
         &self,
         req: crate::model::GetResourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Resource>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Resource>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -574,9 +574,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -591,13 +591,13 @@ impl super::stub::Config for Config {
     async fn list_resources(
         &self,
         req: crate::model::ListResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -646,9 +646,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -663,13 +663,13 @@ impl super::stub::Config for Config {
     async fn export_deployment_statefile(
         &self,
         req: crate::model::ExportDeploymentStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Statefile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Statefile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -710,9 +710,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -727,13 +727,13 @@ impl super::stub::Config for Config {
     async fn export_revision_statefile(
         &self,
         req: crate::model::ExportRevisionStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Statefile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Statefile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -778,9 +778,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -795,13 +795,13 @@ impl super::stub::Config for Config {
     async fn import_statefile(
         &self,
         req: crate::model::ImportStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Statefile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Statefile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -842,9 +842,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -859,13 +859,13 @@ impl super::stub::Config for Config {
     async fn delete_statefile(
         &self,
         req: crate::model::DeleteStatefileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -906,9 +906,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -917,24 +917,25 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn lock_deployment(
         &self,
         req: crate::model::LockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -975,9 +976,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -992,13 +993,13 @@ impl super::stub::Config for Config {
     async fn unlock_deployment(
         &self,
         req: crate::model::UnlockDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1039,9 +1040,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1056,13 +1057,13 @@ impl super::stub::Config for Config {
     async fn export_lock_info(
         &self,
         req: crate::model::ExportLockInfoRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LockInfo>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LockInfo>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1103,9 +1104,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1120,13 +1121,13 @@ impl super::stub::Config for Config {
     async fn create_preview(
         &self,
         req: crate::model::CreatePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1165,9 +1166,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1182,13 +1183,13 @@ impl super::stub::Config for Config {
     async fn get_preview(
         &self,
         req: crate::model::GetPreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Preview>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Preview>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1229,9 +1230,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1246,13 +1247,13 @@ impl super::stub::Config for Config {
     async fn list_previews(
         &self,
         req: crate::model::ListPreviewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPreviewsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPreviewsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1293,9 +1294,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1310,13 +1311,13 @@ impl super::stub::Config for Config {
     async fn delete_preview(
         &self,
         req: crate::model::DeletePreviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1358,9 +1359,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1375,13 +1376,13 @@ impl super::stub::Config for Config {
     async fn export_preview_result(
         &self,
         req: crate::model::ExportPreviewResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExportPreviewResultResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExportPreviewResultResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1422,9 +1423,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1439,13 +1440,13 @@ impl super::stub::Config for Config {
     async fn list_terraform_versions(
         &self,
         req: crate::model::ListTerraformVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTerraformVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTerraformVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1486,9 +1487,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1503,13 +1504,13 @@ impl super::stub::Config for Config {
     async fn get_terraform_version(
         &self,
         req: crate::model::GetTerraformVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TerraformVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TerraformVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1550,9 +1551,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1567,13 +1568,13 @@ impl super::stub::Config for Config {
     async fn list_resource_changes(
         &self,
         req: crate::model::ListResourceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceChangesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceChangesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1618,9 +1619,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1635,13 +1636,13 @@ impl super::stub::Config for Config {
     async fn get_resource_change(
         &self,
         req: crate::model::GetResourceChangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceChange>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceChange>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1686,9 +1687,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1703,13 +1704,13 @@ impl super::stub::Config for Config {
     async fn list_resource_drifts(
         &self,
         req: crate::model::ListResourceDriftsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceDriftsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceDriftsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1754,9 +1755,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1771,13 +1772,13 @@ impl super::stub::Config for Config {
     async fn get_resource_drift(
         &self,
         req: crate::model::GetResourceDriftRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceDrift>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceDrift>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1822,9 +1823,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1839,13 +1840,13 @@ impl super::stub::Config for Config {
     async fn get_auto_migration_config(
         &self,
         req: crate::model::GetAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoMigrationConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoMigrationConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1884,9 +1885,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1901,13 +1902,13 @@ impl super::stub::Config for Config {
     async fn update_auto_migration_config(
         &self,
         req: crate::model::UpdateAutoMigrationConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1964,9 +1965,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1981,13 +1982,13 @@ impl super::stub::Config for Config {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2017,9 +2018,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2034,13 +2035,13 @@ impl super::stub::Config for Config {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2077,9 +2078,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2094,13 +2095,13 @@ impl super::stub::Config for Config {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2141,9 +2142,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2158,13 +2159,13 @@ impl super::stub::Config for Config {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2217,9 +2218,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2234,14 +2235,13 @@ impl super::stub::Config for Config {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2282,9 +2282,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2299,14 +2299,13 @@ impl super::stub::Config for Config {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2348,9 +2347,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2365,13 +2364,13 @@ impl super::stub::Config for Config {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2412,9 +2411,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2429,13 +2428,13 @@ impl super::stub::Config for Config {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2476,9 +2475,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2487,24 +2486,25 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2545,9 +2545,9 @@ impl super::stub::Config for Config {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2556,25 +2556,26 @@ impl super::stub::Config for Config {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/configdelivery/v1/Cargo.toml b/src/generated/cloud/configdelivery/v1/Cargo.toml
index f0e8ceb19d..5a624b7e6b 100644
--- a/src/generated/cloud/configdelivery/v1/Cargo.toml
+++ b/src/generated/cloud/configdelivery/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/configdelivery/v1/src/builder.rs b/src/generated/cloud/configdelivery/v1/src/builder.rs
index b51b1b89df..7a9314600c 100644
--- a/src/generated/cloud/configdelivery/v1/src/builder.rs
+++ b/src/generated/cloud/configdelivery/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod config_delivery {
     /// A builder for [ConfigDelivery][crate::client::ConfigDelivery].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_configdelivery_v1::*;
     /// # use builder::config_delivery::ClientBuilder;
     /// # use client::ConfigDelivery;
@@ -30,19 +30,18 @@ pub mod config_delivery {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConfigDelivery;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConfigDelivery;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod config_delivery {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConfigDelivery>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod config_delivery {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListResourceBundles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_resource_bundles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListResourceBundlesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListResourceBundlesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListResourceBundlesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -184,8 +185,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResourceBundles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResourceBundles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -195,7 +196,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetResourceBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -226,7 +227,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -236,7 +237,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_resource_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetResourceBundleRequest::name].
@@ -249,8 +250,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetResourceBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetResourceBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +261,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::CreateResourceBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -292,7 +293,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +308,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .create_resource_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_resource_bundle`.
@@ -324,7 +325,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -397,8 +398,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateResourceBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateResourceBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -408,7 +409,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::UpdateResourceBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -440,7 +441,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -455,7 +456,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .update_resource_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_resource_bundle`.
@@ -472,7 +473,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -551,8 +552,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateResourceBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateResourceBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -562,7 +563,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::DeleteResourceBundle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -594,7 +595,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -609,7 +610,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .delete_resource_bundle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_resource_bundle`.
@@ -621,7 +622,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -670,8 +671,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteResourceBundle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteResourceBundle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -681,8 +682,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListFleetPackages;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -716,7 +717,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -726,14 +727,16 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_fleet_packages(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFleetPackagesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFleetPackagesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -741,15 +744,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFleetPackagesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFleetPackagesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -787,8 +792,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFleetPackages {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFleetPackages {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -798,7 +803,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetFleetPackage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -826,7 +831,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -836,7 +841,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_fleet_package(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFleetPackageRequest::name].
@@ -849,8 +854,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFleetPackage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFleetPackage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -860,7 +865,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::CreateFleetPackage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -892,7 +897,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -907,7 +912,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .create_fleet_package(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_fleet_package`.
@@ -924,7 +929,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -997,8 +1002,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFleetPackage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFleetPackage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1008,7 +1013,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::UpdateFleetPackage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1040,7 +1045,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1055,7 +1060,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .update_fleet_package(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_fleet_package`.
@@ -1072,7 +1077,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1151,8 +1156,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFleetPackage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFleetPackage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1162,7 +1167,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::DeleteFleetPackage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1194,7 +1199,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1209,7 +1214,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .delete_fleet_package(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_fleet_package`.
@@ -1221,7 +1226,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1276,8 +1281,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFleetPackage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFleetPackage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1287,8 +1292,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListReleases;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1319,7 +1324,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1329,13 +1334,13 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_releases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReleasesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListReleasesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1344,15 +1349,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListReleasesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListReleasesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1390,8 +1397,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReleases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReleases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1401,7 +1408,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1429,7 +1436,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1439,7 +1446,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReleaseRequest::name].
@@ -1452,8 +1459,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1463,7 +1470,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::CreateRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1492,7 +1499,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1507,7 +1514,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .create_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_release`.
@@ -1524,7 +1531,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1597,8 +1604,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1608,7 +1615,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::UpdateRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1637,7 +1644,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1652,7 +1659,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .update_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_release`.
@@ -1669,7 +1676,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1748,8 +1755,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1759,7 +1766,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::DeleteRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1788,7 +1795,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1803,7 +1810,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .delete_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_release`.
@@ -1815,7 +1822,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1864,8 +1871,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1875,8 +1882,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListVariants;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1907,7 +1914,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1917,13 +1924,13 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_variants(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVariantsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVariantsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1932,15 +1939,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVariantsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVariantsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1978,8 +1987,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVariants {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVariants {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1989,7 +1998,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetVariant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2017,7 +2026,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2027,7 +2036,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_variant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVariantRequest::name].
@@ -2040,8 +2049,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVariant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVariant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2051,7 +2060,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::CreateVariant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2080,7 +2089,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2095,7 +2104,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .create_variant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_variant`.
@@ -2112,7 +2121,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2185,8 +2194,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVariant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVariant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2196,7 +2205,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::UpdateVariant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2225,7 +2234,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2240,7 +2249,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .update_variant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_variant`.
@@ -2257,7 +2266,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2332,8 +2341,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVariant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVariant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2343,7 +2352,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::DeleteVariant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2372,7 +2381,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2387,7 +2396,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .delete_variant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_variant`.
@@ -2399,7 +2408,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2442,8 +2451,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVariant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVariant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2453,8 +2462,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListRollouts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2485,7 +2494,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2495,13 +2504,13 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_rollouts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRolloutsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRolloutsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2510,15 +2519,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRolloutsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRolloutsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2556,8 +2567,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRollouts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRollouts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2567,7 +2578,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2595,7 +2606,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2605,7 +2616,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRolloutRequest::name].
@@ -2618,8 +2629,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2629,7 +2640,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::SuspendRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2658,7 +2669,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2673,7 +2684,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .suspend_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `suspend_rollout`.
@@ -2690,7 +2701,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2733,8 +2744,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuspendRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuspendRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2744,7 +2755,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ResumeRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2773,7 +2784,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2788,7 +2799,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .resume_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resume_rollout`.
@@ -2805,7 +2816,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2848,8 +2859,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2859,7 +2870,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::AbortRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2888,7 +2899,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2903,7 +2914,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .abort_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `abort_rollout`.
@@ -2920,7 +2931,7 @@ pub mod config_delivery {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2963,8 +2974,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AbortRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AbortRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2974,8 +2985,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3009,7 +3020,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3019,15 +3030,15 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3036,17 +3047,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3076,8 +3087,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3087,7 +3098,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3118,7 +3129,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3128,7 +3139,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3139,8 +3150,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3150,8 +3161,8 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3187,7 +3198,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3197,15 +3208,15 @@ pub mod config_delivery {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3214,17 +3225,17 @@ pub mod config_delivery {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3260,8 +3271,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3271,7 +3282,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3302,7 +3313,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3312,7 +3323,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3323,8 +3334,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3334,7 +3345,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3367,7 +3378,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3377,7 +3388,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3388,8 +3399,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3399,7 +3410,7 @@ pub mod config_delivery {
     /// # Example
     /// ```
     /// # use google_cloud_configdelivery_v1::builder::config_delivery::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_configdelivery_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3432,7 +3443,7 @@ pub mod config_delivery {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3442,7 +3453,7 @@ pub mod config_delivery {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3453,8 +3464,8 @@ pub mod config_delivery {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/configdelivery/v1/src/client.rs b/src/generated/cloud/configdelivery/v1/src/client.rs
index 2af44bcd81..42cf5f5f81 100644
--- a/src/generated/cloud/configdelivery/v1/src/client.rs
+++ b/src/generated/cloud/configdelivery/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_configdelivery_v1::client::ConfigDelivery;
 /// let client = ConfigDelivery::builder().build().await?;
 /// // use `client` to make requests to the Config Delivery API.
@@ -67,13 +67,13 @@ impl ConfigDelivery {
     /// Returns a builder for [ConfigDelivery].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_configdelivery_v1::client::ConfigDelivery;
     /// let client = ConfigDelivery::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::config_delivery::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::config_delivery::client::Factory)
+        crate::new_client_builder(super::builder::config_delivery::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl ConfigDelivery {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConfigDelivery>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConfigDelivery>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl ConfigDelivery {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConfigDelivery> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConfigDelivery> {
         super::transport::ConfigDelivery::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConfigDelivery> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConfigDelivery> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConfigDelivery::new)
diff --git a/src/generated/cloud/configdelivery/v1/src/lib.rs b/src/generated/cloud/configdelivery/v1/src/lib.rs
index f0f75f72b2..2769e6536e 100644
--- a/src/generated/cloud/configdelivery/v1/src/lib.rs
+++ b/src/generated/cloud/configdelivery/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/configdelivery/v1/src/model.rs b/src/generated/cloud/configdelivery/v1/src/model.rs
index 302dc7deab..1617055600 100644
--- a/src/generated/cloud/configdelivery/v1/src/model.rs
+++ b/src/generated/cloud/configdelivery/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -358,7 +358,7 @@ impl wkt::message::Message for ListResourceBundlesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourceBundlesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListResourceBundlesResponse {
     type PageItem = crate::model::ResourceBundle;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3569,7 +3569,7 @@ impl wkt::message::Message for ListFleetPackagesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFleetPackagesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFleetPackagesResponse {
     type PageItem = crate::model::FleetPackage;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4829,7 +4829,7 @@ impl wkt::message::Message for ListVariantsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVariantsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVariantsResponse {
     type PageItem = crate::model::Variant;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5408,7 +5408,7 @@ impl wkt::message::Message for ListReleasesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReleasesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReleasesResponse {
     type PageItem = crate::model::Release;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5944,7 +5944,7 @@ impl wkt::message::Message for ListRolloutsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRolloutsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRolloutsResponse {
     type PageItem = crate::model::Rollout;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/configdelivery/v1/src/stub.rs b/src/generated/cloud/configdelivery/v1/src/stub.rs
index 953cd43913..9b1e1ac565 100644
--- a/src/generated/cloud/configdelivery/v1/src/stub.rs
+++ b/src/generated/cloud/configdelivery/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_resource_bundles(
         &self,
         _req: crate::model::ListResourceBundlesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListResourceBundlesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListResourceBundlesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_resource_bundle(
         &self,
         _req: crate::model::GetResourceBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceBundle>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceBundle>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn create_resource_bundle(
         &self,
         _req: crate::model::CreateResourceBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn update_resource_bundle(
         &self,
         _req: crate::model::UpdateResourceBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn delete_resource_bundle(
         &self,
         _req: crate::model::DeleteResourceBundleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_fleet_packages(
         &self,
         _req: crate::model::ListFleetPackagesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFleetPackagesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFleetPackagesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +108,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_fleet_package(
         &self,
         _req: crate::model::GetFleetPackageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FleetPackage>>,
+        Output = crate::Result<crate::Response<crate::model::FleetPackage>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +119,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn create_fleet_package(
         &self,
         _req: crate::model::CreateFleetPackageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +130,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn update_fleet_package(
         &self,
         _req: crate::model::UpdateFleetPackageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +141,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn delete_fleet_package(
         &self,
         _req: crate::model::DeleteFleetPackageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +152,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_releases(
         &self,
         _req: crate::model::ListReleasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReleasesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReleasesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,10 +163,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_release(
         &self,
         _req: crate::model::GetReleaseRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Release>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Release>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -174,9 +173,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn create_release(
         &self,
         _req: crate::model::CreateReleaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,9 +184,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn update_release(
         &self,
         _req: crate::model::UpdateReleaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -196,9 +195,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn delete_release(
         &self,
         _req: crate::model::DeleteReleaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,9 +206,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_variants(
         &self,
         _req: crate::model::ListVariantsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVariantsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVariantsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -218,10 +217,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_variant(
         &self,
         _req: crate::model::GetVariantRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Variant>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Variant>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -229,9 +227,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn create_variant(
         &self,
         _req: crate::model::CreateVariantRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,9 +238,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn update_variant(
         &self,
         _req: crate::model::UpdateVariantRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -251,9 +249,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn delete_variant(
         &self,
         _req: crate::model::DeleteVariantRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -262,9 +260,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_rollouts(
         &self,
         _req: crate::model::ListRolloutsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRolloutsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRolloutsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -273,10 +271,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_rollout(
         &self,
         _req: crate::model::GetRolloutRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Rollout>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Rollout>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -284,9 +281,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn suspend_rollout(
         &self,
         _req: crate::model::SuspendRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -295,9 +292,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn resume_rollout(
         &self,
         _req: crate::model::ResumeRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -306,9 +303,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn abort_rollout(
         &self,
         _req: crate::model::AbortRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -317,10 +314,10 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -330,9 +327,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -341,10 +338,10 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -354,9 +351,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -365,8 +362,8 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -374,8 +371,8 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -385,9 +382,9 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -396,8 +393,8 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/configdelivery/v1/src/stub/dynamic.rs b/src/generated/cloud/configdelivery/v1/src/stub/dynamic.rs
index 42938f376d..df1ceae65a 100644
--- a/src/generated/cloud/configdelivery/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/configdelivery/v1/src/stub/dynamic.rs
@@ -20,200 +20,198 @@ pub trait ConfigDelivery: std::fmt::Debug + Send + Sync {
     async fn list_resource_bundles(
         &self,
         req: crate::model::ListResourceBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceBundlesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceBundlesResponse>>;
 
     async fn get_resource_bundle(
         &self,
         req: crate::model::GetResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceBundle>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceBundle>>;
 
     async fn create_resource_bundle(
         &self,
         req: crate::model::CreateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_resource_bundle(
         &self,
         req: crate::model::UpdateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_resource_bundle(
         &self,
         req: crate::model::DeleteResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_fleet_packages(
         &self,
         req: crate::model::ListFleetPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFleetPackagesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFleetPackagesResponse>>;
 
     async fn get_fleet_package(
         &self,
         req: crate::model::GetFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FleetPackage>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FleetPackage>>;
 
     async fn create_fleet_package(
         &self,
         req: crate::model::CreateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_fleet_package(
         &self,
         req: crate::model::UpdateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_fleet_package(
         &self,
         req: crate::model::DeleteFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReleasesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReleasesResponse>>;
 
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Release>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Release>>;
 
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_release(
         &self,
         req: crate::model::UpdateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_release(
         &self,
         req: crate::model::DeleteReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_variants(
         &self,
         req: crate::model::ListVariantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVariantsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVariantsResponse>>;
 
     async fn get_variant(
         &self,
         req: crate::model::GetVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Variant>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Variant>>;
 
     async fn create_variant(
         &self,
         req: crate::model::CreateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_variant(
         &self,
         req: crate::model::UpdateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_variant(
         &self,
         req: crate::model::DeleteVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRolloutsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRolloutsResponse>>;
 
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rollout>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rollout>>;
 
     async fn suspend_rollout(
         &self,
         req: crate::model::SuspendRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn resume_rollout(
         &self,
         req: crate::model::ResumeRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn abort_rollout(
         &self,
         req: crate::model::AbortRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ConfigDelivery] also implement [ConfigDelivery].
@@ -223,8 +221,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_resource_bundles(
         &self,
         req: crate::model::ListResourceBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceBundlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceBundlesResponse>> {
         T::list_resource_bundles(self, req, options).await
     }
 
@@ -232,8 +230,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_resource_bundle(
         &self,
         req: crate::model::GetResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceBundle>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceBundle>> {
         T::get_resource_bundle(self, req, options).await
     }
 
@@ -241,8 +239,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn create_resource_bundle(
         &self,
         req: crate::model::CreateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_resource_bundle(self, req, options).await
     }
 
@@ -250,8 +248,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn update_resource_bundle(
         &self,
         req: crate::model::UpdateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_resource_bundle(self, req, options).await
     }
 
@@ -259,8 +257,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn delete_resource_bundle(
         &self,
         req: crate::model::DeleteResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_resource_bundle(self, req, options).await
     }
 
@@ -268,8 +266,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_fleet_packages(
         &self,
         req: crate::model::ListFleetPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFleetPackagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFleetPackagesResponse>> {
         T::list_fleet_packages(self, req, options).await
     }
 
@@ -277,8 +275,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_fleet_package(
         &self,
         req: crate::model::GetFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FleetPackage>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FleetPackage>> {
         T::get_fleet_package(self, req, options).await
     }
 
@@ -286,8 +284,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn create_fleet_package(
         &self,
         req: crate::model::CreateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_fleet_package(self, req, options).await
     }
 
@@ -295,8 +293,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn update_fleet_package(
         &self,
         req: crate::model::UpdateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_fleet_package(self, req, options).await
     }
 
@@ -304,8 +302,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn delete_fleet_package(
         &self,
         req: crate::model::DeleteFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_fleet_package(self, req, options).await
     }
 
@@ -313,8 +311,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReleasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReleasesResponse>> {
         T::list_releases(self, req, options).await
     }
 
@@ -322,8 +320,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Release>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Release>> {
         T::get_release(self, req, options).await
     }
 
@@ -331,8 +329,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_release(self, req, options).await
     }
 
@@ -340,8 +338,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn update_release(
         &self,
         req: crate::model::UpdateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_release(self, req, options).await
     }
 
@@ -349,8 +347,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn delete_release(
         &self,
         req: crate::model::DeleteReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_release(self, req, options).await
     }
 
@@ -358,8 +356,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_variants(
         &self,
         req: crate::model::ListVariantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVariantsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVariantsResponse>> {
         T::list_variants(self, req, options).await
     }
 
@@ -367,8 +365,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_variant(
         &self,
         req: crate::model::GetVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Variant>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Variant>> {
         T::get_variant(self, req, options).await
     }
 
@@ -376,8 +374,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn create_variant(
         &self,
         req: crate::model::CreateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_variant(self, req, options).await
     }
 
@@ -385,8 +383,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn update_variant(
         &self,
         req: crate::model::UpdateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_variant(self, req, options).await
     }
 
@@ -394,8 +392,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn delete_variant(
         &self,
         req: crate::model::DeleteVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_variant(self, req, options).await
     }
 
@@ -403,8 +401,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRolloutsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRolloutsResponse>> {
         T::list_rollouts(self, req, options).await
     }
 
@@ -412,8 +410,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rollout>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rollout>> {
         T::get_rollout(self, req, options).await
     }
 
@@ -421,8 +419,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn suspend_rollout(
         &self,
         req: crate::model::SuspendRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::suspend_rollout(self, req, options).await
     }
 
@@ -430,8 +428,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn resume_rollout(
         &self,
         req: crate::model::ResumeRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::resume_rollout(self, req, options).await
     }
 
@@ -439,8 +437,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn abort_rollout(
         &self,
         req: crate::model::AbortRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::abort_rollout(self, req, options).await
     }
 
@@ -448,9 +446,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -458,8 +455,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -467,10 +464,9 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -478,8 +474,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -487,8 +483,8 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -496,22 +492,22 @@ impl<T: super::ConfigDelivery> ConfigDelivery for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/configdelivery/v1/src/tracing.rs b/src/generated/cloud/configdelivery/v1/src/tracing.rs
index b0220b3762..b838de55ee 100644
--- a/src/generated/cloud/configdelivery/v1/src/tracing.rs
+++ b/src/generated/cloud/configdelivery/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_resource_bundles(
         &self,
         req: crate::model::ListResourceBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceBundlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceBundlesResponse>> {
         self.inner.list_resource_bundles(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_resource_bundle(
         &self,
         req: crate::model::GetResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceBundle>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceBundle>> {
         self.inner.get_resource_bundle(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_resource_bundle(
         &self,
         req: crate::model::CreateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_resource_bundle(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_resource_bundle(
         &self,
         req: crate::model::UpdateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_resource_bundle(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_resource_bundle(
         &self,
         req: crate::model::DeleteResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_resource_bundle(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_fleet_packages(
         &self,
         req: crate::model::ListFleetPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFleetPackagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFleetPackagesResponse>> {
         self.inner.list_fleet_packages(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_fleet_package(
         &self,
         req: crate::model::GetFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FleetPackage>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FleetPackage>> {
         self.inner.get_fleet_package(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_fleet_package(
         &self,
         req: crate::model::CreateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_fleet_package(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_fleet_package(
         &self,
         req: crate::model::UpdateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_fleet_package(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_fleet_package(
         &self,
         req: crate::model::DeleteFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_fleet_package(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReleasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReleasesResponse>> {
         self.inner.list_releases(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Release>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Release>> {
         self.inner.get_release(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_release(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn update_release(
         &self,
         req: crate::model::UpdateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_release(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn delete_release(
         &self,
         req: crate::model::DeleteReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_release(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn list_variants(
         &self,
         req: crate::model::ListVariantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVariantsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVariantsResponse>> {
         self.inner.list_variants(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn get_variant(
         &self,
         req: crate::model::GetVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Variant>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Variant>> {
         self.inner.get_variant(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn create_variant(
         &self,
         req: crate::model::CreateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_variant(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn update_variant(
         &self,
         req: crate::model::UpdateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_variant(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn delete_variant(
         &self,
         req: crate::model::DeleteVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_variant(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRolloutsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRolloutsResponse>> {
         self.inner.list_rollouts(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rollout>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rollout>> {
         self.inner.get_rollout(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn suspend_rollout(
         &self,
         req: crate::model::SuspendRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.suspend_rollout(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn resume_rollout(
         &self,
         req: crate::model::ResumeRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.resume_rollout(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn abort_rollout(
         &self,
         req: crate::model::AbortRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.abort_rollout(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -284,9 +284,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -294,8 +293,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -303,8 +302,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -312,22 +311,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/configdelivery/v1/src/transport.rs b/src/generated/cloud/configdelivery/v1/src/transport.rs
index cb439730c7..e35ff0df0f 100644
--- a/src/generated/cloud/configdelivery/v1/src/transport.rs
+++ b/src/generated/cloud/configdelivery/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ConfigDelivery](super::stub::ConfigDelivery) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ConfigDelivery {
 }
 
 impl ConfigDelivery {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_resource_bundles(
         &self,
         req: crate::model::ListResourceBundlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceBundlesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceBundlesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_resource_bundle(
         &self,
         req: crate::model::GetResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceBundle>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceBundle>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn create_resource_bundle(
         &self,
         req: crate::model::CreateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn update_resource_bundle(
         &self,
         req: crate::model::UpdateResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn delete_resource_bundle(
         &self,
         req: crate::model::DeleteResourceBundleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -365,9 +365,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -382,13 +382,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_fleet_packages(
         &self,
         req: crate::model::ListFleetPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFleetPackagesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFleetPackagesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429,9 +429,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446,13 +446,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_fleet_package(
         &self,
         req: crate::model::GetFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FleetPackage>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FleetPackage>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -493,9 +493,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -510,13 +510,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn create_fleet_package(
         &self,
         req: crate::model::CreateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -555,9 +555,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -572,13 +572,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn update_fleet_package(
         &self,
         req: crate::model::UpdateFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -638,9 +638,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -655,13 +655,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn delete_fleet_package(
         &self,
         req: crate::model::DeleteFleetPackageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -705,9 +705,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -722,13 +722,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReleasesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReleasesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -773,9 +773,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -790,13 +790,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Release>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Release>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -841,9 +841,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -858,13 +858,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -907,9 +907,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -924,13 +924,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn update_release(
         &self,
         req: crate::model::UpdateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -994,9 +994,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1011,13 +1011,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn delete_release(
         &self,
         req: crate::model::DeleteReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1064,9 +1064,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1081,13 +1081,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_variants(
         &self,
         req: crate::model::ListVariantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVariantsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVariantsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1136,9 +1136,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1153,13 +1153,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_variant(
         &self,
         req: crate::model::GetVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Variant>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Variant>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1208,9 +1208,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1225,13 +1225,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn create_variant(
         &self,
         req: crate::model::CreateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1278,9 +1278,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1295,13 +1295,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn update_variant(
         &self,
         req: crate::model::UpdateVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1369,9 +1369,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1386,13 +1386,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn delete_variant(
         &self,
         req: crate::model::DeleteVariantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1442,9 +1442,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1459,13 +1459,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRolloutsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRolloutsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1510,9 +1510,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1527,13 +1527,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rollout>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rollout>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1578,9 +1578,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1595,13 +1595,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn suspend_rollout(
         &self,
         req: crate::model::SuspendRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1646,9 +1646,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1663,13 +1663,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn resume_rollout(
         &self,
         req: crate::model::ResumeRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1714,9 +1714,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1731,13 +1731,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn abort_rollout(
         &self,
         req: crate::model::AbortRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1782,9 +1782,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1799,13 +1799,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1835,9 +1835,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1852,13 +1852,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1895,9 +1895,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1912,14 +1912,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1961,9 +1960,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1978,13 +1977,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2025,9 +2024,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2042,13 +2041,13 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2089,9 +2088,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2100,24 +2099,25 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2158,9 +2158,9 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2169,25 +2169,26 @@ impl super::stub::ConfigDelivery for ConfigDelivery {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/connectors/v1/Cargo.toml b/src/generated/cloud/connectors/v1/Cargo.toml
index 534ff5b848..1f37c101e2 100644
--- a/src/generated/cloud/connectors/v1/Cargo.toml
+++ b/src/generated/cloud/connectors/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/connectors/v1/src/builder.rs b/src/generated/cloud/connectors/v1/src/builder.rs
index 2b54813b70..e84d7309aa 100644
--- a/src/generated/cloud/connectors/v1/src/builder.rs
+++ b/src/generated/cloud/connectors/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod connectors {
     /// A builder for [Connectors][crate::client::Connectors].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_connectors_v1::*;
     /// # use builder::connectors::ClientBuilder;
     /// # use client::Connectors;
@@ -30,19 +30,18 @@ pub mod connectors {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Connectors;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Connectors;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod connectors {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Connectors>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod connectors {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,14 +117,16 @@ pub mod connectors {
             (*self.0.stub)
                 .list_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -133,15 +134,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -185,8 +188,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -196,7 +199,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -224,7 +227,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -234,7 +237,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectionRequest::name].
@@ -253,8 +256,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -264,7 +267,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::CreateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -296,7 +299,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -311,7 +314,7 @@ pub mod connectors {
             (*self.0.stub)
                 .create_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_connection`.
@@ -328,7 +331,7 @@ pub mod connectors {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -395,8 +398,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -406,7 +409,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::UpdateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -438,7 +441,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -453,7 +456,7 @@ pub mod connectors {
             (*self.0.stub)
                 .update_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_connection`.
@@ -470,7 +473,7 @@ pub mod connectors {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -543,8 +546,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -554,7 +557,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::DeleteConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -586,7 +589,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -601,7 +604,7 @@ pub mod connectors {
             (*self.0.stub)
                 .delete_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_connection`.
@@ -613,7 +616,7 @@ pub mod connectors {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -650,8 +653,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -661,8 +664,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListProviders;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -693,7 +696,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -703,13 +706,13 @@ pub mod connectors {
             (*self.0.stub)
                 .list_providers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProvidersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListProvidersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -718,15 +721,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListProvidersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListProvidersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -752,8 +757,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProviders {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProviders {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -763,7 +768,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetProvider;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -791,7 +796,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -801,7 +806,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_provider(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProviderRequest::name].
@@ -814,8 +819,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProvider {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProvider {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -825,8 +830,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListConnectors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -857,7 +862,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -867,14 +872,16 @@ pub mod connectors {
             (*self.0.stub)
                 .list_connectors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -882,15 +889,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConnectorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConnectorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -916,8 +925,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnectors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnectors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -927,7 +936,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -955,7 +964,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -965,7 +974,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectorRequest::name].
@@ -978,8 +987,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -989,8 +998,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListConnectorVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1024,7 +1033,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1034,14 +1043,16 @@ pub mod connectors {
             (*self.0.stub)
                 .list_connector_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectorVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectorVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1049,17 +1060,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConnectorVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1091,8 +1102,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnectorVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnectorVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1102,7 +1113,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetConnectorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1133,7 +1144,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1143,7 +1154,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_connector_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectorVersionRequest::name].
@@ -1162,8 +1173,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnectorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnectorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1173,7 +1184,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetConnectionSchemaMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1206,7 +1217,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1216,7 +1227,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_connection_schema_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectionSchemaMetadataRequest::name].
@@ -1229,8 +1240,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnectionSchemaMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnectionSchemaMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1240,7 +1251,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::RefreshConnectionSchemaMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1274,7 +1285,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1289,7 +1300,7 @@ pub mod connectors {
             (*self.0.stub)
                 .refresh_connection_schema_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `refresh_connection_schema_metadata`.
@@ -1308,7 +1319,7 @@ pub mod connectors {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1345,8 +1356,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RefreshConnectionSchemaMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RefreshConnectionSchemaMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1356,8 +1367,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListRuntimeEntitySchemas;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1393,7 +1404,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1403,15 +1414,15 @@ pub mod connectors {
             (*self.0.stub)
                 .list_runtime_entity_schemas(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListRuntimeEntitySchemasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1420,17 +1431,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRuntimeEntitySchemasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1464,8 +1475,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuntimeEntitySchemas {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuntimeEntitySchemas {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1475,8 +1486,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListRuntimeActionSchemas;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1512,7 +1523,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1522,15 +1533,15 @@ pub mod connectors {
             (*self.0.stub)
                 .list_runtime_action_schemas(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListRuntimeActionSchemasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1539,17 +1550,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRuntimeActionSchemasResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1583,8 +1594,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuntimeActionSchemas {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuntimeActionSchemas {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1594,7 +1605,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetRuntimeConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1625,7 +1636,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1635,7 +1646,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_runtime_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRuntimeConfigRequest::name].
@@ -1648,8 +1659,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRuntimeConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRuntimeConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1659,7 +1670,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetGlobalSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1690,7 +1701,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1700,7 +1711,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_global_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGlobalSettingsRequest::name].
@@ -1713,8 +1724,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGlobalSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGlobalSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1724,8 +1735,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1759,7 +1770,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1769,15 +1780,15 @@ pub mod connectors {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1786,17 +1797,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1826,8 +1837,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1837,7 +1848,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1868,7 +1879,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1878,7 +1889,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1889,8 +1900,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1900,7 +1911,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1931,7 +1942,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1941,7 +1952,7 @@ pub mod connectors {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1994,8 +2005,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2005,7 +2016,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2036,7 +2047,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2046,7 +2057,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -2077,8 +2088,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2088,7 +2099,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2121,7 +2132,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2131,7 +2142,7 @@ pub mod connectors {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2157,8 +2168,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2168,8 +2179,8 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2205,7 +2216,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2215,15 +2226,15 @@ pub mod connectors {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2232,17 +2243,17 @@ pub mod connectors {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2278,8 +2289,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2289,7 +2300,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2320,7 +2331,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2330,7 +2341,7 @@ pub mod connectors {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2341,8 +2352,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2352,7 +2363,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2385,7 +2396,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2395,7 +2406,7 @@ pub mod connectors {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2406,8 +2417,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2417,7 +2428,7 @@ pub mod connectors {
     /// # Example
     /// ```
     /// # use google_cloud_connectors_v1::builder::connectors::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_connectors_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2450,7 +2461,7 @@ pub mod connectors {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2460,7 +2471,7 @@ pub mod connectors {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2471,8 +2482,8 @@ pub mod connectors {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/connectors/v1/src/client.rs b/src/generated/cloud/connectors/v1/src/client.rs
index 333f01f23f..6507dbe85e 100644
--- a/src/generated/cloud/connectors/v1/src/client.rs
+++ b/src/generated/cloud/connectors/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_connectors_v1::client::Connectors;
 /// let client = Connectors::builder().build().await?;
 /// // use `client` to make requests to the Connectors API.
@@ -66,13 +66,13 @@ impl Connectors {
     /// Returns a builder for [Connectors].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_connectors_v1::client::Connectors;
     /// let client = Connectors::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::connectors::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::connectors::client::Factory)
+        crate::new_client_builder(super::builder::connectors::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Connectors {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Connectors>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Connectors>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Connectors {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Connectors> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Connectors> {
         super::transport::Connectors::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Connectors> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Connectors> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Connectors::new)
diff --git a/src/generated/cloud/connectors/v1/src/lib.rs b/src/generated/cloud/connectors/v1/src/lib.rs
index edf2a16aa1..0370aab429 100644
--- a/src/generated/cloud/connectors/v1/src/lib.rs
+++ b/src/generated/cloud/connectors/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/connectors/v1/src/model.rs b/src/generated/cloud/connectors/v1/src/model.rs
index 3a8eb1af19..fd403f2e4b 100644
--- a/src/generated/cloud/connectors/v1/src/model.rs
+++ b/src/generated/cloud/connectors/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -4038,7 +4038,7 @@ impl wkt::message::Message for ListConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectionsResponse {
     type PageItem = crate::model::Connection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4556,7 +4556,7 @@ impl wkt::message::Message for ListRuntimeEntitySchemasResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRuntimeEntitySchemasResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRuntimeEntitySchemasResponse {
     type PageItem = crate::model::RuntimeEntitySchema;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4718,7 +4718,7 @@ impl wkt::message::Message for ListRuntimeActionSchemasResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRuntimeActionSchemasResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRuntimeActionSchemasResponse {
     type PageItem = crate::model::RuntimeActionSchema;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5394,7 +5394,7 @@ impl wkt::message::Message for ListConnectorsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectorsResponse {
     type PageItem = crate::model::Connector;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6038,7 +6038,7 @@ impl wkt::message::Message for ListConnectorVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectorVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectorVersionsResponse {
     type PageItem = crate::model::ConnectorVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7174,7 +7174,7 @@ impl wkt::message::Message for ListProvidersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProvidersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProvidersResponse {
     type PageItem = crate::model::Provider;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/connectors/v1/src/stub.rs b/src/generated/cloud/connectors/v1/src/stub.rs
index fce680cb24..342d5d6ae2 100644
--- a/src/generated/cloud/connectors/v1/src/stub.rs
+++ b/src/generated/cloud/connectors/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_connections(
         &self,
         _req: crate::model::ListConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_connection(
         &self,
         _req: crate::model::GetConnectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connection>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connection>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn create_connection(
         &self,
         _req: crate::model::CreateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn update_connection(
         &self,
         _req: crate::model::UpdateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn delete_connection(
         &self,
         _req: crate::model::DeleteConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_providers(
         &self,
         _req: crate::model::ListProvidersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListProvidersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListProvidersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +107,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_provider(
         &self,
         _req: crate::model::GetProviderRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Provider>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Provider>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -119,9 +117,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_connectors(
         &self,
         _req: crate::model::ListConnectorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,10 +128,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_connector(
         &self,
         _req: crate::model::GetConnectorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connector>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connector>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -141,11 +138,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_connector_versions(
         &self,
         _req: crate::model::ListConnectorVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConnectorVersionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConnectorVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,9 +149,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_connector_version(
         &self,
         _req: crate::model::GetConnectorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConnectorVersion>>,
+        Output = crate::Result<crate::Response<crate::model::ConnectorVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,9 +160,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_connection_schema_metadata(
         &self,
         _req: crate::model::GetConnectionSchemaMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConnectionSchemaMetadata>>,
+        Output = crate::Result<crate::Response<crate::model::ConnectionSchemaMetadata>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +171,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn refresh_connection_schema_metadata(
         &self,
         _req: crate::model::RefreshConnectionSchemaMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,11 +182,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_runtime_entity_schemas(
         &self,
         _req: crate::model::ListRuntimeEntitySchemasRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListRuntimeEntitySchemasResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListRuntimeEntitySchemasResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,11 +193,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_runtime_action_schemas(
         &self,
         _req: crate::model::ListRuntimeActionSchemasRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListRuntimeActionSchemasResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListRuntimeActionSchemasResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -213,9 +204,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_runtime_config(
         &self,
         _req: crate::model::GetRuntimeConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RuntimeConfig>>,
+        Output = crate::Result<crate::Response<crate::model::RuntimeConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -224,10 +215,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_global_settings(
         &self,
         _req: crate::model::GetGlobalSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Settings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Settings>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -235,10 +225,10 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -248,9 +238,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -259,9 +249,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -270,9 +260,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -281,10 +271,10 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -294,10 +284,10 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -307,9 +297,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -318,8 +308,8 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -327,8 +317,8 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -338,9 +328,9 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -349,8 +339,8 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/connectors/v1/src/stub/dynamic.rs b/src/generated/cloud/connectors/v1/src/stub/dynamic.rs
index a9ed966816..5bbeeeb502 100644
--- a/src/generated/cloud/connectors/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/connectors/v1/src/stub/dynamic.rs
@@ -20,172 +20,168 @@ pub trait Connectors: std::fmt::Debug + Send + Sync {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>>;
 
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>>;
 
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProvidersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProvidersResponse>>;
 
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Provider>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Provider>>;
 
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectorsResponse>>;
 
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>>;
 
     async fn list_connector_versions(
         &self,
         req: crate::model::ListConnectorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectorVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectorVersionsResponse>>;
 
     async fn get_connector_version(
         &self,
         req: crate::model::GetConnectorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectorVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectorVersion>>;
 
     async fn get_connection_schema_metadata(
         &self,
         req: crate::model::GetConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionSchemaMetadata>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionSchemaMetadata>>;
 
     async fn refresh_connection_schema_metadata(
         &self,
         req: crate::model::RefreshConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_runtime_entity_schemas(
         &self,
         req: crate::model::ListRuntimeEntitySchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimeEntitySchemasResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimeEntitySchemasResponse>>;
 
     async fn list_runtime_action_schemas(
         &self,
         req: crate::model::ListRuntimeActionSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimeActionSchemasResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimeActionSchemasResponse>>;
 
     async fn get_runtime_config(
         &self,
         req: crate::model::GetRuntimeConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuntimeConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuntimeConfig>>;
 
     async fn get_global_settings(
         &self,
         req: crate::model::GetGlobalSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Connectors] also implement [Connectors].
@@ -195,8 +191,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>> {
         T::list_connections(self, req, options).await
     }
 
@@ -204,8 +200,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>> {
         T::get_connection(self, req, options).await
     }
 
@@ -213,8 +209,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_connection(self, req, options).await
     }
 
@@ -222,8 +218,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_connection(self, req, options).await
     }
 
@@ -231,8 +227,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_connection(self, req, options).await
     }
 
@@ -240,8 +236,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProvidersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProvidersResponse>> {
         T::list_providers(self, req, options).await
     }
 
@@ -249,8 +245,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Provider>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Provider>> {
         T::get_provider(self, req, options).await
     }
 
@@ -258,8 +254,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectorsResponse>> {
         T::list_connectors(self, req, options).await
     }
 
@@ -267,8 +263,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>> {
         T::get_connector(self, req, options).await
     }
 
@@ -276,8 +272,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_connector_versions(
         &self,
         req: crate::model::ListConnectorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectorVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectorVersionsResponse>> {
         T::list_connector_versions(self, req, options).await
     }
 
@@ -285,8 +281,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_connector_version(
         &self,
         req: crate::model::GetConnectorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectorVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectorVersion>> {
         T::get_connector_version(self, req, options).await
     }
 
@@ -294,8 +290,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_connection_schema_metadata(
         &self,
         req: crate::model::GetConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionSchemaMetadata>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionSchemaMetadata>> {
         T::get_connection_schema_metadata(self, req, options).await
     }
 
@@ -303,8 +299,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn refresh_connection_schema_metadata(
         &self,
         req: crate::model::RefreshConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::refresh_connection_schema_metadata(self, req, options).await
     }
 
@@ -312,9 +308,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_runtime_entity_schemas(
         &self,
         req: crate::model::ListRuntimeEntitySchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimeEntitySchemasResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimeEntitySchemasResponse>> {
         T::list_runtime_entity_schemas(self, req, options).await
     }
 
@@ -322,9 +317,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_runtime_action_schemas(
         &self,
         req: crate::model::ListRuntimeActionSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimeActionSchemasResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimeActionSchemasResponse>> {
         T::list_runtime_action_schemas(self, req, options).await
     }
 
@@ -332,8 +326,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_runtime_config(
         &self,
         req: crate::model::GetRuntimeConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RuntimeConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RuntimeConfig>> {
         T::get_runtime_config(self, req, options).await
     }
 
@@ -341,8 +335,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_global_settings(
         &self,
         req: crate::model::GetGlobalSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>> {
         T::get_global_settings(self, req, options).await
     }
 
@@ -350,9 +344,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -360,8 +353,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -369,8 +362,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -378,8 +371,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -387,10 +380,9 @@ impl<T: super::Connectors> Connectors for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -398,10 +390,9 @@ impl<T: super::Connectors> Connectors for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -409,8 +400,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -418,8 +409,8 @@ impl<T: super::Connectors> Connectors for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -427,22 +418,22 @@ impl<T: super::Connectors> Connectors for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/connectors/v1/src/tracing.rs b/src/generated/cloud/connectors/v1/src/tracing.rs
index cf6087ee81..6bc1d89664 100644
--- a/src/generated/cloud/connectors/v1/src/tracing.rs
+++ b/src/generated/cloud/connectors/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         self.inner.list_connections(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         self.inner.get_connection(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_connection(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_connection(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_connection(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProvidersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProvidersResponse>> {
         self.inner.list_providers(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Provider>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Provider>> {
         self.inner.get_provider(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectorsResponse>> {
         self.inner.list_connectors(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         self.inner.get_connector(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_connector_versions(
         &self,
         req: crate::model::ListConnectorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectorVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectorVersionsResponse>> {
         self.inner.list_connector_versions(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_connector_version(
         &self,
         req: crate::model::GetConnectorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectorVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectorVersion>> {
         self.inner.get_connector_version(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_connection_schema_metadata(
         &self,
         req: crate::model::GetConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionSchemaMetadata>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionSchemaMetadata>> {
         self.inner
             .get_connection_schema_metadata(req, options)
             .await
@@ -151,8 +151,8 @@ where
     async fn refresh_connection_schema_metadata(
         &self,
         req: crate::model::RefreshConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .refresh_connection_schema_metadata(req, options)
             .await
@@ -162,8 +162,8 @@ where
     async fn list_runtime_entity_schemas(
         &self,
         req: crate::model::ListRuntimeEntitySchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimeEntitySchemasResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimeEntitySchemasResponse>> {
         self.inner.list_runtime_entity_schemas(req, options).await
     }
 
@@ -171,8 +171,8 @@ where
     async fn list_runtime_action_schemas(
         &self,
         req: crate::model::ListRuntimeActionSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimeActionSchemasResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimeActionSchemasResponse>> {
         self.inner.list_runtime_action_schemas(req, options).await
     }
 
@@ -180,8 +180,8 @@ where
     async fn get_runtime_config(
         &self,
         req: crate::model::GetRuntimeConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuntimeConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuntimeConfig>> {
         self.inner.get_runtime_config(req, options).await
     }
 
@@ -189,8 +189,8 @@ where
     async fn get_global_settings(
         &self,
         req: crate::model::GetGlobalSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         self.inner.get_global_settings(req, options).await
     }
 
@@ -198,8 +198,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -207,8 +207,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -216,8 +216,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -225,8 +225,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -234,9 +234,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -244,9 +243,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -254,8 +252,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -263,8 +261,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -272,22 +270,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/connectors/v1/src/transport.rs b/src/generated/cloud/connectors/v1/src/transport.rs
index b695914ea1..f5b868692a 100644
--- a/src/generated/cloud/connectors/v1/src/transport.rs
+++ b/src/generated/cloud/connectors/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Connectors](super::stub::Connectors) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Connectors {
 }
 
 impl Connectors {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -91,9 +91,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -108,13 +108,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -156,9 +156,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -173,13 +173,13 @@ impl super::stub::Connectors for Connectors {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::Connectors for Connectors {
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::Connectors for Connectors {
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -363,9 +363,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -380,13 +380,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProvidersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProvidersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Provider>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Provider>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +489,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,13 +506,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -555,9 +555,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -572,13 +572,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -623,9 +623,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -640,13 +640,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_connector_versions(
         &self,
         req: crate::model::ListConnectorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectorVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectorVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -694,9 +694,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -711,13 +711,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_connector_version(
         &self,
         req: crate::model::GetConnectorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectorVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectorVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -767,9 +767,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -784,13 +784,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_connection_schema_metadata(
         &self,
         req: crate::model::GetConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionSchemaMetadata>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionSchemaMetadata>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -833,9 +833,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -850,13 +850,13 @@ impl super::stub::Connectors for Connectors {
     async fn refresh_connection_schema_metadata(
         &self,
         req: crate::model::RefreshConnectionSchemaMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -899,9 +899,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -916,13 +916,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_runtime_entity_schemas(
         &self,
         req: crate::model::ListRuntimeEntitySchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimeEntitySchemasResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimeEntitySchemasResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -966,9 +966,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -983,13 +983,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_runtime_action_schemas(
         &self,
         req: crate::model::ListRuntimeActionSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimeActionSchemasResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimeActionSchemasResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1033,9 +1033,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1050,13 +1050,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_runtime_config(
         &self,
         req: crate::model::GetRuntimeConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RuntimeConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RuntimeConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1095,9 +1095,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1112,13 +1112,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_global_settings(
         &self,
         req: crate::model::GetGlobalSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1153,9 +1153,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1170,13 +1170,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1206,9 +1206,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1223,13 +1223,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1266,9 +1266,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1283,13 +1283,13 @@ impl super::stub::Connectors for Connectors {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1367,9 +1367,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1384,13 +1384,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1492,9 +1492,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1509,14 +1509,13 @@ impl super::stub::Connectors for Connectors {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1594,9 +1593,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1611,14 +1610,13 @@ impl super::stub::Connectors for Connectors {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1660,9 +1658,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1677,13 +1675,13 @@ impl super::stub::Connectors for Connectors {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1724,9 +1722,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1741,13 +1739,13 @@ impl super::stub::Connectors for Connectors {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1788,9 +1786,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1799,24 +1797,25 @@ impl super::stub::Connectors for Connectors {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1857,9 +1856,9 @@ impl super::stub::Connectors for Connectors {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1868,25 +1867,26 @@ impl super::stub::Connectors for Connectors {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/contactcenterinsights/v1/Cargo.toml b/src/generated/cloud/contactcenterinsights/v1/Cargo.toml
index 3a4c44b3b8..77a39903c0 100644
--- a/src/generated/cloud/contactcenterinsights/v1/Cargo.toml
+++ b/src/generated/cloud/contactcenterinsights/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 google-cloud-rpc.workspace         = true
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/builder.rs b/src/generated/cloud/contactcenterinsights/v1/src/builder.rs
index d062650116..bb04cf045d 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/builder.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod contact_center_insights {
     /// A builder for [ContactCenterInsights][crate::client::ContactCenterInsights].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_contactcenterinsights_v1::*;
     /// # use builder::contact_center_insights::ClientBuilder;
     /// # use client::ContactCenterInsights;
@@ -30,19 +30,18 @@ pub mod contact_center_insights {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ContactCenterInsights;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ContactCenterInsights;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod contact_center_insights {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ContactCenterInsights>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod contact_center_insights {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateConversationRequest::parent].
@@ -158,8 +157,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -169,7 +168,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UploadConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -201,7 +200,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -216,7 +215,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .upload_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `upload_conversation`.
@@ -235,7 +234,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -336,8 +335,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UploadConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UploadConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -347,7 +346,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -378,7 +377,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -388,7 +387,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversation][crate::model::UpdateConversationRequest::conversation].
@@ -433,8 +432,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -444,7 +443,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -472,7 +471,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -482,7 +481,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationRequest::name].
@@ -501,8 +500,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -512,8 +511,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListConversations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -547,7 +546,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -557,14 +556,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_conversations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConversationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConversationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -572,15 +573,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConversationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConversationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -624,8 +627,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -635,7 +638,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -666,7 +669,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -676,7 +679,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteConversationRequest::name].
@@ -695,8 +698,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -706,7 +709,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateAnalysis;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -735,7 +738,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -750,7 +753,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_analysis(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_analysis`.
@@ -769,7 +772,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -828,8 +831,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAnalysis {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAnalysis {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -839,7 +842,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetAnalysis;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -867,7 +870,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -877,7 +880,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_analysis(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAnalysisRequest::name].
@@ -890,8 +893,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAnalysis {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAnalysis {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -901,8 +904,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListAnalyses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -933,7 +936,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -943,13 +946,13 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_analyses(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAnalysesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAnalysesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -958,15 +961,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAnalysesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAnalysesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -998,8 +1003,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAnalyses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAnalyses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1009,7 +1014,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteAnalysis;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1037,7 +1042,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1047,7 +1052,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_analysis(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAnalysisRequest::name].
@@ -1060,8 +1065,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAnalysis {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAnalysis {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1071,7 +1076,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::BulkAnalyzeConversations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1105,7 +1110,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1120,7 +1125,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .bulk_analyze_conversations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_analyze_conversations`.
@@ -1139,7 +1144,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1210,8 +1215,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkAnalyzeConversations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkAnalyzeConversations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1221,7 +1226,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::BulkDeleteConversations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1255,7 +1260,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1270,7 +1275,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .bulk_delete_conversations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_delete_conversations`.
@@ -1289,7 +1294,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1344,8 +1349,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkDeleteConversations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkDeleteConversations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1355,7 +1360,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::IngestConversations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1387,7 +1392,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1402,7 +1407,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .ingest_conversations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `ingest_conversations`.
@@ -1421,7 +1426,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1592,8 +1597,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for IngestConversations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for IngestConversations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1603,7 +1608,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ExportInsightsData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1635,7 +1640,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1650,7 +1655,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .export_insights_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_insights_data`.
@@ -1669,7 +1674,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1762,8 +1767,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportInsightsData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportInsightsData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1773,7 +1778,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1805,7 +1810,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1820,7 +1825,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_issue_model`.
@@ -1839,7 +1844,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1898,8 +1903,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1909,7 +1914,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1940,7 +1945,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1950,7 +1955,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [issue_model][crate::model::UpdateIssueModelRequest::issue_model].
@@ -1995,8 +2000,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2006,7 +2011,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2034,7 +2039,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2044,7 +2049,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIssueModelRequest::name].
@@ -2057,8 +2062,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2068,7 +2073,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListIssueModels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2096,7 +2101,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2106,7 +2111,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_issue_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListIssueModelsRequest::parent].
@@ -2119,8 +2124,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIssueModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIssueModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2130,7 +2135,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2162,7 +2167,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2177,7 +2182,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_issue_model`.
@@ -2193,7 +2198,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2230,8 +2235,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2241,7 +2246,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeployIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2273,7 +2278,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2288,7 +2293,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .deploy_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy_issue_model`.
@@ -2307,7 +2312,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2344,8 +2349,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2355,7 +2360,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UndeployIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2387,7 +2392,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2402,7 +2407,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .undeploy_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undeploy_issue_model`.
@@ -2421,7 +2426,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2458,8 +2463,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeployIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeployIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2469,7 +2474,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ExportIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2501,7 +2506,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2516,7 +2521,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .export_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_issue_model`.
@@ -2535,7 +2540,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2603,8 +2608,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2614,7 +2619,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ImportIssueModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2646,7 +2651,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2661,7 +2666,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .import_issue_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_issue_model`.
@@ -2680,7 +2685,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2752,8 +2757,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportIssueModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportIssueModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2763,7 +2768,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetIssue;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2791,7 +2796,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2801,7 +2806,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_issue(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIssueRequest::name].
@@ -2814,8 +2819,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIssue {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIssue {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2825,7 +2830,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListIssues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2853,7 +2858,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2863,7 +2868,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_issues(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListIssuesRequest::parent].
@@ -2876,8 +2881,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIssues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIssues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2887,7 +2892,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateIssue;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2915,7 +2920,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2925,7 +2930,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_issue(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [issue][crate::model::UpdateIssueRequest::issue].
@@ -2970,8 +2975,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIssue {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIssue {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2981,7 +2986,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteIssue;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3009,7 +3014,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3019,7 +3024,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_issue(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIssueRequest::name].
@@ -3032,8 +3037,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIssue {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIssue {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3043,7 +3048,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CalculateIssueModelStats;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3076,7 +3081,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3086,7 +3091,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .calculate_issue_model_stats(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [issue_model][crate::model::CalculateIssueModelStatsRequest::issue_model].
@@ -3099,8 +3104,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CalculateIssueModelStats {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CalculateIssueModelStats {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3110,7 +3115,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreatePhraseMatcher;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3141,7 +3146,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3151,7 +3156,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_phrase_matcher(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePhraseMatcherRequest::parent].
@@ -3186,8 +3191,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePhraseMatcher {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePhraseMatcher {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3197,7 +3202,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetPhraseMatcher;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3228,7 +3233,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3238,7 +3243,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_phrase_matcher(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPhraseMatcherRequest::name].
@@ -3251,8 +3256,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPhraseMatcher {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPhraseMatcher {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3262,8 +3267,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListPhraseMatchers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3297,7 +3302,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3307,14 +3312,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_phrase_matchers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPhraseMatchersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPhraseMatchersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3322,17 +3329,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPhraseMatchersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3364,8 +3371,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPhraseMatchers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPhraseMatchers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3375,7 +3382,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeletePhraseMatcher;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3406,7 +3413,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3416,7 +3423,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_phrase_matcher(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeletePhraseMatcherRequest::name].
@@ -3429,8 +3436,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePhraseMatcher {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePhraseMatcher {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3440,7 +3447,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdatePhraseMatcher;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3471,7 +3478,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3481,7 +3488,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_phrase_matcher(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [phrase_matcher][crate::model::UpdatePhraseMatcherRequest::phrase_matcher].
@@ -3526,8 +3533,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePhraseMatcher {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePhraseMatcher {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3537,7 +3544,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CalculateStats;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3565,7 +3572,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3575,7 +3582,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .calculate_stats(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [location][crate::model::CalculateStatsRequest::location].
@@ -3594,8 +3601,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CalculateStats {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CalculateStats {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3605,7 +3612,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3633,7 +3640,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3643,7 +3650,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSettingsRequest::name].
@@ -3656,8 +3663,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3667,7 +3674,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3695,7 +3702,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3705,7 +3712,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [settings][crate::model::UpdateSettingsRequest::settings].
@@ -3754,8 +3761,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3765,7 +3772,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateAnalysisRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3796,7 +3803,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3806,7 +3813,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_analysis_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAnalysisRuleRequest::parent].
@@ -3841,8 +3848,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAnalysisRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAnalysisRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3852,7 +3859,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetAnalysisRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3880,7 +3887,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3890,7 +3897,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_analysis_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAnalysisRuleRequest::name].
@@ -3903,8 +3910,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAnalysisRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAnalysisRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3914,8 +3921,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListAnalysisRules;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3949,7 +3956,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3959,14 +3966,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_analysis_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAnalysisRulesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAnalysisRulesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3974,15 +3983,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAnalysisRulesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAnalysisRulesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4008,8 +4019,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAnalysisRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAnalysisRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4019,7 +4030,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateAnalysisRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4050,7 +4061,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4060,7 +4071,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_analysis_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [analysis_rule][crate::model::UpdateAnalysisRuleRequest::analysis_rule].
@@ -4105,8 +4116,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAnalysisRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAnalysisRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4116,7 +4127,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteAnalysisRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4147,7 +4158,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4157,7 +4168,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_analysis_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAnalysisRuleRequest::name].
@@ -4170,8 +4181,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAnalysisRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAnalysisRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4181,7 +4192,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetEncryptionSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4212,7 +4223,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4222,7 +4233,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_encryption_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEncryptionSpecRequest::name].
@@ -4235,8 +4246,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEncryptionSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEncryptionSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4246,7 +4257,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::InitializeEncryptionSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4280,7 +4291,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4295,7 +4306,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .initialize_encryption_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `initialize_encryption_spec`.
@@ -4314,7 +4325,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4365,8 +4376,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InitializeEncryptionSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InitializeEncryptionSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4376,7 +4387,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4404,7 +4415,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4414,7 +4425,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateViewRequest::parent].
@@ -4449,8 +4460,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4460,7 +4471,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4488,7 +4499,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4498,7 +4509,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetViewRequest::name].
@@ -4511,8 +4522,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4522,8 +4533,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListViews;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4554,7 +4565,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4564,13 +4575,13 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_views(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListViewsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListViewsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4579,15 +4590,15 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListViewsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListViewsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4613,8 +4624,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListViews {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListViews {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4624,7 +4635,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4652,7 +4663,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4662,7 +4673,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [view][crate::model::UpdateViewRequest::view].
@@ -4707,8 +4718,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4718,7 +4729,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteView;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4746,7 +4757,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4756,7 +4767,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_view(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteViewRequest::name].
@@ -4769,8 +4780,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteView {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteView {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4780,7 +4791,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::QueryMetrics;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4809,7 +4820,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4824,7 +4835,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .query_metrics(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `query_metrics`.
@@ -4843,7 +4854,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4928,8 +4939,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryMetrics {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryMetrics {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4939,7 +4950,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateQaQuestion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4970,7 +4981,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4980,7 +4991,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_qa_question(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateQaQuestionRequest::parent].
@@ -5021,8 +5032,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateQaQuestion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateQaQuestion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5032,7 +5043,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetQaQuestion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5060,7 +5071,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5070,7 +5081,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_qa_question(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQaQuestionRequest::name].
@@ -5083,8 +5094,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQaQuestion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQaQuestion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5094,7 +5105,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateQaQuestion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5125,7 +5136,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5135,7 +5146,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_qa_question(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [qa_question][crate::model::UpdateQaQuestionRequest::qa_question].
@@ -5184,8 +5195,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateQaQuestion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateQaQuestion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5195,7 +5206,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteQaQuestion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5226,7 +5237,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5236,7 +5247,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_qa_question(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteQaQuestionRequest::name].
@@ -5249,8 +5260,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteQaQuestion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteQaQuestion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5260,8 +5271,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListQaQuestions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5292,7 +5303,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5302,14 +5313,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_qa_questions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListQaQuestionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListQaQuestionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -5317,15 +5330,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListQaQuestionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListQaQuestionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5351,8 +5366,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQaQuestions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQaQuestions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5362,7 +5377,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateQaScorecard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5393,7 +5408,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5403,7 +5418,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_qa_scorecard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateQaScorecardRequest::parent].
@@ -5444,8 +5459,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateQaScorecard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateQaScorecard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5455,7 +5470,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetQaScorecard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5483,7 +5498,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5493,7 +5508,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_qa_scorecard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQaScorecardRequest::name].
@@ -5506,8 +5521,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQaScorecard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQaScorecard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5517,7 +5532,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateQaScorecard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5548,7 +5563,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5558,7 +5573,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_qa_scorecard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [qa_scorecard][crate::model::UpdateQaScorecardRequest::qa_scorecard].
@@ -5607,8 +5622,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateQaScorecard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateQaScorecard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5618,7 +5633,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteQaScorecard;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5649,7 +5664,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5659,7 +5674,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_qa_scorecard(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteQaScorecardRequest::name].
@@ -5678,8 +5693,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteQaScorecard {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteQaScorecard {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5689,8 +5704,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListQaScorecards;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5724,7 +5739,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5734,14 +5749,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_qa_scorecards(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListQaScorecardsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListQaScorecardsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -5749,15 +5766,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListQaScorecardsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListQaScorecardsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5783,8 +5802,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQaScorecards {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQaScorecards {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5794,7 +5813,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateQaScorecardRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5827,7 +5846,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5837,7 +5856,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_qa_scorecard_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateQaScorecardRevisionRequest::parent].
@@ -5878,8 +5897,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateQaScorecardRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateQaScorecardRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5889,7 +5908,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetQaScorecardRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5920,7 +5939,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5930,7 +5949,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_qa_scorecard_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQaScorecardRevisionRequest::name].
@@ -5943,8 +5962,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQaScorecardRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQaScorecardRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5954,7 +5973,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::TuneQaScorecardRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5988,7 +6007,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6003,7 +6022,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .tune_qa_scorecard_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `tune_qa_scorecard_revision`.
@@ -6022,7 +6041,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6073,8 +6092,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TuneQaScorecardRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TuneQaScorecardRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6084,7 +6103,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeployQaScorecardRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6117,7 +6136,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6127,7 +6146,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .deploy_qa_scorecard_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeployQaScorecardRevisionRequest::name].
@@ -6140,8 +6159,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployQaScorecardRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployQaScorecardRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6151,7 +6170,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UndeployQaScorecardRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6184,7 +6203,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6194,7 +6213,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .undeploy_qa_scorecard_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UndeployQaScorecardRevisionRequest::name].
@@ -6207,8 +6226,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeployQaScorecardRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeployQaScorecardRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6218,7 +6237,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteQaScorecardRevision;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6251,7 +6270,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6261,7 +6280,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_qa_scorecard_revision(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteQaScorecardRevisionRequest::name].
@@ -6280,8 +6299,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteQaScorecardRevision {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteQaScorecardRevision {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6291,8 +6310,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListQaScorecardRevisions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6328,7 +6347,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6338,15 +6357,15 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_qa_scorecard_revisions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListQaScorecardRevisionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6355,17 +6374,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListQaScorecardRevisionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6397,8 +6416,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQaScorecardRevisions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQaScorecardRevisions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6408,7 +6427,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CreateFeedbackLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6439,7 +6458,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6449,7 +6468,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .create_feedback_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateFeedbackLabelRequest::parent].
@@ -6490,8 +6509,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeedbackLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeedbackLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6501,8 +6520,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListFeedbackLabels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6536,7 +6555,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6546,14 +6565,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_feedback_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeedbackLabelsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFeedbackLabelsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6561,17 +6582,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListFeedbackLabelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6603,8 +6624,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeedbackLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeedbackLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6614,7 +6635,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetFeedbackLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6645,7 +6666,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6655,7 +6676,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_feedback_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeedbackLabelRequest::name].
@@ -6668,8 +6689,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeedbackLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeedbackLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6679,7 +6700,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::UpdateFeedbackLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6710,7 +6731,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6720,7 +6741,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .update_feedback_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [feedback_label][crate::model::UpdateFeedbackLabelRequest::feedback_label].
@@ -6769,8 +6790,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeedbackLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeedbackLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6780,7 +6801,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::DeleteFeedbackLabel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6811,7 +6832,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6821,7 +6842,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .delete_feedback_label(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteFeedbackLabelRequest::name].
@@ -6834,8 +6855,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeedbackLabel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeedbackLabel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6845,8 +6866,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListAllFeedbackLabels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6880,7 +6901,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6890,14 +6911,16 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_all_feedback_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAllFeedbackLabelsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAllFeedbackLabelsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6905,17 +6928,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAllFeedbackLabelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6947,8 +6970,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAllFeedbackLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAllFeedbackLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6958,7 +6981,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::BulkUploadFeedbackLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6992,7 +7015,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7007,7 +7030,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .bulk_upload_feedback_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_upload_feedback_labels`.
@@ -7026,7 +7049,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7100,8 +7123,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkUploadFeedbackLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkUploadFeedbackLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7111,7 +7134,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::BulkDownloadFeedbackLabels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7145,7 +7168,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7160,7 +7183,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .bulk_download_feedback_labels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `bulk_download_feedback_labels`.
@@ -7179,7 +7202,7 @@ pub mod contact_center_insights {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7289,8 +7312,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BulkDownloadFeedbackLabels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BulkDownloadFeedbackLabels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7300,8 +7323,8 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7337,7 +7360,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7347,15 +7370,15 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7364,17 +7387,17 @@ pub mod contact_center_insights {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7410,8 +7433,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7421,7 +7444,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7452,7 +7475,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7462,7 +7485,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7473,8 +7496,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7484,7 +7507,7 @@ pub mod contact_center_insights {
     /// # Example
     /// ```
     /// # use google_cloud_contactcenterinsights_v1::builder::contact_center_insights::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_contactcenterinsights_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7517,7 +7540,7 @@ pub mod contact_center_insights {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7527,7 +7550,7 @@ pub mod contact_center_insights {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7538,8 +7561,8 @@ pub mod contact_center_insights {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/client.rs b/src/generated/cloud/contactcenterinsights/v1/src/client.rs
index fb6bc31bc7..f3bf866915 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/client.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_contactcenterinsights_v1::client::ContactCenterInsights;
 /// let client = ContactCenterInsights::builder().build().await?;
 /// // use `client` to make requests to the Contact Center AI Insights API.
@@ -66,15 +66,13 @@ impl ContactCenterInsights {
     /// Returns a builder for [ContactCenterInsights].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_contactcenterinsights_v1::client::ContactCenterInsights;
     /// let client = ContactCenterInsights::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::contact_center_insights::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::contact_center_insights::client::Factory,
-        )
+        crate::new_client_builder(super::builder::contact_center_insights::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl ContactCenterInsights {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ContactCenterInsights>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ContactCenterInsights>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl ContactCenterInsights {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ContactCenterInsights> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ContactCenterInsights> {
         super::transport::ContactCenterInsights::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ContactCenterInsights> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ContactCenterInsights> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ContactCenterInsights::new)
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/lib.rs b/src/generated/cloud/contactcenterinsights/v1/src/lib.rs
index b5fcf88729..21111e4d11 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/lib.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/model.rs b/src/generated/cloud/contactcenterinsights/v1/src/model.rs
index e07ba42f7c..38ccae2be0 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/model.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate google_cloud_rpc;
@@ -1259,7 +1259,7 @@ impl wkt::message::Message for ListConversationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversationsResponse {
     type PageItem = crate::model::Conversation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2717,7 +2717,7 @@ impl wkt::message::Message for ListAnalysesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAnalysesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAnalysesResponse {
     type PageItem = crate::model::Analysis;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6027,7 +6027,7 @@ impl wkt::message::Message for ListPhraseMatchersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPhraseMatchersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPhraseMatchersResponse {
     type PageItem = crate::model::PhraseMatcher;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6689,7 +6689,7 @@ impl wkt::message::Message for ListAnalysisRulesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAnalysisRulesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAnalysisRulesResponse {
     type PageItem = crate::model::AnalysisRule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7203,7 +7203,7 @@ impl wkt::message::Message for ListViewsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListViewsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListViewsResponse {
     type PageItem = crate::model::View;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9585,7 +9585,7 @@ impl wkt::message::Message for ListQaQuestionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQaQuestionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQaQuestionsResponse {
     type PageItem = crate::model::QaQuestion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10863,7 +10863,7 @@ impl wkt::message::Message for ListQaScorecardsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQaScorecardsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQaScorecardsResponse {
     type PageItem = crate::model::QaScorecard;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11025,7 +11025,7 @@ impl wkt::message::Message for ListQaScorecardRevisionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQaScorecardRevisionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQaScorecardRevisionsResponse {
     type PageItem = crate::model::QaScorecardRevision;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11285,7 +11285,7 @@ impl wkt::message::Message for ListFeedbackLabelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeedbackLabelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeedbackLabelsResponse {
     type PageItem = crate::model::FeedbackLabel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11614,7 +11614,7 @@ impl wkt::message::Message for ListAllFeedbackLabelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAllFeedbackLabelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAllFeedbackLabelsResponse {
     type PageItem = crate::model::FeedbackLabel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/stub.rs b/src/generated/cloud/contactcenterinsights/v1/src/stub.rs
index 9711f7cd01..d728ecfaa0 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/stub.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_conversation(
         &self,
         _req: crate::model::CreateConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn upload_conversation(
         &self,
         _req: crate::model::UploadConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_conversation(
         &self,
         _req: crate::model::UpdateConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_conversation(
         &self,
         _req: crate::model::GetConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_conversations(
         &self,
         _req: crate::model::ListConversationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConversationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConversationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,8 +97,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_conversation(
         &self,
         _req: crate::model::DeleteConversationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,9 +106,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_analysis(
         &self,
         _req: crate::model::CreateAnalysisRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,10 +117,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_analysis(
         &self,
         _req: crate::model::GetAnalysisRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Analysis>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Analysis>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -128,9 +127,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_analyses(
         &self,
         _req: crate::model::ListAnalysesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAnalysesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAnalysesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,8 +138,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_analysis(
         &self,
         _req: crate::model::DeleteAnalysisRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -148,9 +147,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn bulk_analyze_conversations(
         &self,
         _req: crate::model::BulkAnalyzeConversationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -159,9 +158,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn bulk_delete_conversations(
         &self,
         _req: crate::model::BulkDeleteConversationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -170,9 +169,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn ingest_conversations(
         &self,
         _req: crate::model::IngestConversationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -181,9 +180,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn export_insights_data(
         &self,
         _req: crate::model::ExportInsightsDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -192,9 +191,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_issue_model(
         &self,
         _req: crate::model::CreateIssueModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -203,10 +202,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_issue_model(
         &self,
         _req: crate::model::UpdateIssueModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IssueModel>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::IssueModel>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -214,10 +212,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_issue_model(
         &self,
         _req: crate::model::GetIssueModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IssueModel>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::IssueModel>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -225,9 +222,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_issue_models(
         &self,
         _req: crate::model::ListIssueModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIssueModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIssueModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -236,9 +233,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_issue_model(
         &self,
         _req: crate::model::DeleteIssueModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -247,9 +244,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn deploy_issue_model(
         &self,
         _req: crate::model::DeployIssueModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -258,9 +255,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn undeploy_issue_model(
         &self,
         _req: crate::model::UndeployIssueModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -269,9 +266,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn export_issue_model(
         &self,
         _req: crate::model::ExportIssueModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -280,9 +277,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn import_issue_model(
         &self,
         _req: crate::model::ImportIssueModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -291,10 +288,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_issue(
         &self,
         _req: crate::model::GetIssueRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Issue>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Issue>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -302,9 +298,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_issues(
         &self,
         _req: crate::model::ListIssuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIssuesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIssuesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -313,10 +309,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_issue(
         &self,
         _req: crate::model::UpdateIssueRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Issue>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Issue>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -324,8 +319,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_issue(
         &self,
         _req: crate::model::DeleteIssueRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -333,11 +328,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn calculate_issue_model_stats(
         &self,
         _req: crate::model::CalculateIssueModelStatsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::CalculateIssueModelStatsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::CalculateIssueModelStatsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -346,9 +339,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_phrase_matcher(
         &self,
         _req: crate::model::CreatePhraseMatcherRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PhraseMatcher>>,
+        Output = crate::Result<crate::Response<crate::model::PhraseMatcher>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -357,9 +350,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_phrase_matcher(
         &self,
         _req: crate::model::GetPhraseMatcherRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PhraseMatcher>>,
+        Output = crate::Result<crate::Response<crate::model::PhraseMatcher>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -368,9 +361,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_phrase_matchers(
         &self,
         _req: crate::model::ListPhraseMatchersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPhraseMatchersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPhraseMatchersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -379,8 +372,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_phrase_matcher(
         &self,
         _req: crate::model::DeletePhraseMatcherRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -388,9 +381,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_phrase_matcher(
         &self,
         _req: crate::model::UpdatePhraseMatcherRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PhraseMatcher>>,
+        Output = crate::Result<crate::Response<crate::model::PhraseMatcher>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -399,9 +392,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn calculate_stats(
         &self,
         _req: crate::model::CalculateStatsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CalculateStatsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CalculateStatsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -410,10 +403,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_settings(
         &self,
         _req: crate::model::GetSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Settings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Settings>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -421,10 +413,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_settings(
         &self,
         _req: crate::model::UpdateSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Settings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Settings>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -432,9 +423,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_analysis_rule(
         &self,
         _req: crate::model::CreateAnalysisRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalysisRule>>,
+        Output = crate::Result<crate::Response<crate::model::AnalysisRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -443,9 +434,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_analysis_rule(
         &self,
         _req: crate::model::GetAnalysisRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalysisRule>>,
+        Output = crate::Result<crate::Response<crate::model::AnalysisRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -454,9 +445,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_analysis_rules(
         &self,
         _req: crate::model::ListAnalysisRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAnalysisRulesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAnalysisRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -465,9 +456,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_analysis_rule(
         &self,
         _req: crate::model::UpdateAnalysisRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalysisRule>>,
+        Output = crate::Result<crate::Response<crate::model::AnalysisRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -476,8 +467,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_analysis_rule(
         &self,
         _req: crate::model::DeleteAnalysisRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -485,9 +476,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_encryption_spec(
         &self,
         _req: crate::model::GetEncryptionSpecRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EncryptionSpec>>,
+        Output = crate::Result<crate::Response<crate::model::EncryptionSpec>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -496,9 +487,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn initialize_encryption_spec(
         &self,
         _req: crate::model::InitializeEncryptionSpecRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -507,10 +498,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_view(
         &self,
         _req: crate::model::CreateViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::View>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::View>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -518,10 +508,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_view(
         &self,
         _req: crate::model::GetViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::View>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::View>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -529,9 +518,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_views(
         &self,
         _req: crate::model::ListViewsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListViewsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListViewsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -540,10 +529,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_view(
         &self,
         _req: crate::model::UpdateViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::View>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::View>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -551,8 +539,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_view(
         &self,
         _req: crate::model::DeleteViewRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -560,9 +548,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn query_metrics(
         &self,
         _req: crate::model::QueryMetricsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -571,10 +559,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_qa_question(
         &self,
         _req: crate::model::CreateQaQuestionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaQuestion>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QaQuestion>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -582,10 +569,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_qa_question(
         &self,
         _req: crate::model::GetQaQuestionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaQuestion>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QaQuestion>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -593,10 +579,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_qa_question(
         &self,
         _req: crate::model::UpdateQaQuestionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaQuestion>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QaQuestion>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -604,8 +589,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_qa_question(
         &self,
         _req: crate::model::DeleteQaQuestionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -613,9 +598,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_qa_questions(
         &self,
         _req: crate::model::ListQaQuestionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListQaQuestionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListQaQuestionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -624,10 +609,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_qa_scorecard(
         &self,
         _req: crate::model::CreateQaScorecardRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecard>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QaScorecard>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -635,10 +619,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_qa_scorecard(
         &self,
         _req: crate::model::GetQaScorecardRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecard>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QaScorecard>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -646,10 +629,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_qa_scorecard(
         &self,
         _req: crate::model::UpdateQaScorecardRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecard>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QaScorecard>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -657,8 +639,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_qa_scorecard(
         &self,
         _req: crate::model::DeleteQaScorecardRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -666,9 +648,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_qa_scorecards(
         &self,
         _req: crate::model::ListQaScorecardsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListQaScorecardsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListQaScorecardsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -677,9 +659,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_qa_scorecard_revision(
         &self,
         _req: crate::model::CreateQaScorecardRevisionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>,
+        Output = crate::Result<crate::Response<crate::model::QaScorecardRevision>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -688,9 +670,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_qa_scorecard_revision(
         &self,
         _req: crate::model::GetQaScorecardRevisionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>,
+        Output = crate::Result<crate::Response<crate::model::QaScorecardRevision>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -699,9 +681,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn tune_qa_scorecard_revision(
         &self,
         _req: crate::model::TuneQaScorecardRevisionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -710,9 +692,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn deploy_qa_scorecard_revision(
         &self,
         _req: crate::model::DeployQaScorecardRevisionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>,
+        Output = crate::Result<crate::Response<crate::model::QaScorecardRevision>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -721,9 +703,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn undeploy_qa_scorecard_revision(
         &self,
         _req: crate::model::UndeployQaScorecardRevisionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>,
+        Output = crate::Result<crate::Response<crate::model::QaScorecardRevision>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -732,8 +714,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_qa_scorecard_revision(
         &self,
         _req: crate::model::DeleteQaScorecardRevisionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -741,11 +723,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_qa_scorecard_revisions(
         &self,
         _req: crate::model::ListQaScorecardRevisionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListQaScorecardRevisionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListQaScorecardRevisionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -754,9 +734,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn create_feedback_label(
         &self,
         _req: crate::model::CreateFeedbackLabelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeedbackLabel>>,
+        Output = crate::Result<crate::Response<crate::model::FeedbackLabel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -765,9 +745,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_feedback_labels(
         &self,
         _req: crate::model::ListFeedbackLabelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeedbackLabelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeedbackLabelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -776,9 +756,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_feedback_label(
         &self,
         _req: crate::model::GetFeedbackLabelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeedbackLabel>>,
+        Output = crate::Result<crate::Response<crate::model::FeedbackLabel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -787,9 +767,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn update_feedback_label(
         &self,
         _req: crate::model::UpdateFeedbackLabelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FeedbackLabel>>,
+        Output = crate::Result<crate::Response<crate::model::FeedbackLabel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -798,8 +778,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn delete_feedback_label(
         &self,
         _req: crate::model::DeleteFeedbackLabelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -807,11 +787,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_all_feedback_labels(
         &self,
         _req: crate::model::ListAllFeedbackLabelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAllFeedbackLabelsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAllFeedbackLabelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -820,9 +798,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn bulk_upload_feedback_labels(
         &self,
         _req: crate::model::BulkUploadFeedbackLabelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -831,9 +809,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn bulk_download_feedback_labels(
         &self,
         _req: crate::model::BulkDownloadFeedbackLabelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -842,10 +820,10 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -855,9 +833,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -866,8 +844,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -877,9 +855,9 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -888,8 +866,8 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/stub/dynamic.rs b/src/generated/cloud/contactcenterinsights/v1/src/stub/dynamic.rs
index 381e27220b..ff5849f559 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/stub/dynamic.rs
@@ -20,476 +20,474 @@ pub trait ContactCenterInsights: std::fmt::Debug + Send + Sync {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn upload_conversation(
         &self,
         req: crate::model::UploadConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationsResponse>>;
 
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_analysis(
         &self,
         req: crate::model::CreateAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_analysis(
         &self,
         req: crate::model::GetAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Analysis>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Analysis>>;
 
     async fn list_analyses(
         &self,
         req: crate::model::ListAnalysesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnalysesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnalysesResponse>>;
 
     async fn delete_analysis(
         &self,
         req: crate::model::DeleteAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn bulk_analyze_conversations(
         &self,
         req: crate::model::BulkAnalyzeConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn bulk_delete_conversations(
         &self,
         req: crate::model::BulkDeleteConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn ingest_conversations(
         &self,
         req: crate::model::IngestConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_insights_data(
         &self,
         req: crate::model::ExportInsightsDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_issue_model(
         &self,
         req: crate::model::CreateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_issue_model(
         &self,
         req: crate::model::UpdateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IssueModel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IssueModel>>;
 
     async fn get_issue_model(
         &self,
         req: crate::model::GetIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IssueModel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IssueModel>>;
 
     async fn list_issue_models(
         &self,
         req: crate::model::ListIssueModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIssueModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIssueModelsResponse>>;
 
     async fn delete_issue_model(
         &self,
         req: crate::model::DeleteIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn deploy_issue_model(
         &self,
         req: crate::model::DeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undeploy_issue_model(
         &self,
         req: crate::model::UndeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_issue_model(
         &self,
         req: crate::model::ExportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_issue_model(
         &self,
         req: crate::model::ImportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_issue(
         &self,
         req: crate::model::GetIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Issue>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Issue>>;
 
     async fn list_issues(
         &self,
         req: crate::model::ListIssuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIssuesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIssuesResponse>>;
 
     async fn update_issue(
         &self,
         req: crate::model::UpdateIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Issue>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Issue>>;
 
     async fn delete_issue(
         &self,
         req: crate::model::DeleteIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn calculate_issue_model_stats(
         &self,
         req: crate::model::CalculateIssueModelStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateIssueModelStatsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateIssueModelStatsResponse>>;
 
     async fn create_phrase_matcher(
         &self,
         req: crate::model::CreatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PhraseMatcher>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PhraseMatcher>>;
 
     async fn get_phrase_matcher(
         &self,
         req: crate::model::GetPhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PhraseMatcher>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PhraseMatcher>>;
 
     async fn list_phrase_matchers(
         &self,
         req: crate::model::ListPhraseMatchersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPhraseMatchersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPhraseMatchersResponse>>;
 
     async fn delete_phrase_matcher(
         &self,
         req: crate::model::DeletePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_phrase_matcher(
         &self,
         req: crate::model::UpdatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PhraseMatcher>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PhraseMatcher>>;
 
     async fn calculate_stats(
         &self,
         req: crate::model::CalculateStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateStatsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateStatsResponse>>;
 
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>>;
 
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>>;
 
     async fn create_analysis_rule(
         &self,
         req: crate::model::CreateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalysisRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalysisRule>>;
 
     async fn get_analysis_rule(
         &self,
         req: crate::model::GetAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalysisRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalysisRule>>;
 
     async fn list_analysis_rules(
         &self,
         req: crate::model::ListAnalysisRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnalysisRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnalysisRulesResponse>>;
 
     async fn update_analysis_rule(
         &self,
         req: crate::model::UpdateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalysisRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalysisRule>>;
 
     async fn delete_analysis_rule(
         &self,
         req: crate::model::DeleteAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptionSpec>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptionSpec>>;
 
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_view(
         &self,
         req: crate::model::CreateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::View>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::View>>;
 
     async fn get_view(
         &self,
         req: crate::model::GetViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::View>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::View>>;
 
     async fn list_views(
         &self,
         req: crate::model::ListViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListViewsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListViewsResponse>>;
 
     async fn update_view(
         &self,
         req: crate::model::UpdateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::View>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::View>>;
 
     async fn delete_view(
         &self,
         req: crate::model::DeleteViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn query_metrics(
         &self,
         req: crate::model::QueryMetricsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_qa_question(
         &self,
         req: crate::model::CreateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaQuestion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaQuestion>>;
 
     async fn get_qa_question(
         &self,
         req: crate::model::GetQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaQuestion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaQuestion>>;
 
     async fn update_qa_question(
         &self,
         req: crate::model::UpdateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaQuestion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaQuestion>>;
 
     async fn delete_qa_question(
         &self,
         req: crate::model::DeleteQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_qa_questions(
         &self,
         req: crate::model::ListQaQuestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQaQuestionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQaQuestionsResponse>>;
 
     async fn create_qa_scorecard(
         &self,
         req: crate::model::CreateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecard>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecard>>;
 
     async fn get_qa_scorecard(
         &self,
         req: crate::model::GetQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecard>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecard>>;
 
     async fn update_qa_scorecard(
         &self,
         req: crate::model::UpdateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecard>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecard>>;
 
     async fn delete_qa_scorecard(
         &self,
         req: crate::model::DeleteQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_qa_scorecards(
         &self,
         req: crate::model::ListQaScorecardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQaScorecardsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQaScorecardsResponse>>;
 
     async fn create_qa_scorecard_revision(
         &self,
         req: crate::model::CreateQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>>;
 
     async fn get_qa_scorecard_revision(
         &self,
         req: crate::model::GetQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>>;
 
     async fn tune_qa_scorecard_revision(
         &self,
         req: crate::model::TuneQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn deploy_qa_scorecard_revision(
         &self,
         req: crate::model::DeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>>;
 
     async fn undeploy_qa_scorecard_revision(
         &self,
         req: crate::model::UndeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>>;
 
     async fn delete_qa_scorecard_revision(
         &self,
         req: crate::model::DeleteQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_qa_scorecard_revisions(
         &self,
         req: crate::model::ListQaScorecardRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQaScorecardRevisionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQaScorecardRevisionsResponse>>;
 
     async fn create_feedback_label(
         &self,
         req: crate::model::CreateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeedbackLabel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeedbackLabel>>;
 
     async fn list_feedback_labels(
         &self,
         req: crate::model::ListFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeedbackLabelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeedbackLabelsResponse>>;
 
     async fn get_feedback_label(
         &self,
         req: crate::model::GetFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeedbackLabel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeedbackLabel>>;
 
     async fn update_feedback_label(
         &self,
         req: crate::model::UpdateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeedbackLabel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeedbackLabel>>;
 
     async fn delete_feedback_label(
         &self,
         req: crate::model::DeleteFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_all_feedback_labels(
         &self,
         req: crate::model::ListAllFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAllFeedbackLabelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAllFeedbackLabelsResponse>>;
 
     async fn bulk_upload_feedback_labels(
         &self,
         req: crate::model::BulkUploadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn bulk_download_feedback_labels(
         &self,
         req: crate::model::BulkDownloadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ContactCenterInsights] also implement [ContactCenterInsights].
@@ -499,8 +497,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::create_conversation(self, req, options).await
     }
 
@@ -508,8 +506,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn upload_conversation(
         &self,
         req: crate::model::UploadConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::upload_conversation(self, req, options).await
     }
 
@@ -517,8 +515,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::update_conversation(self, req, options).await
     }
 
@@ -526,8 +524,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::get_conversation(self, req, options).await
     }
 
@@ -535,8 +533,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationsResponse>> {
         T::list_conversations(self, req, options).await
     }
 
@@ -544,8 +542,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_conversation(self, req, options).await
     }
 
@@ -553,8 +551,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_analysis(
         &self,
         req: crate::model::CreateAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_analysis(self, req, options).await
     }
 
@@ -562,8 +560,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_analysis(
         &self,
         req: crate::model::GetAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Analysis>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Analysis>> {
         T::get_analysis(self, req, options).await
     }
 
@@ -571,8 +569,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_analyses(
         &self,
         req: crate::model::ListAnalysesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnalysesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnalysesResponse>> {
         T::list_analyses(self, req, options).await
     }
 
@@ -580,8 +578,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_analysis(
         &self,
         req: crate::model::DeleteAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_analysis(self, req, options).await
     }
 
@@ -589,8 +587,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn bulk_analyze_conversations(
         &self,
         req: crate::model::BulkAnalyzeConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::bulk_analyze_conversations(self, req, options).await
     }
 
@@ -598,8 +596,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn bulk_delete_conversations(
         &self,
         req: crate::model::BulkDeleteConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::bulk_delete_conversations(self, req, options).await
     }
 
@@ -607,8 +605,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn ingest_conversations(
         &self,
         req: crate::model::IngestConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::ingest_conversations(self, req, options).await
     }
 
@@ -616,8 +614,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn export_insights_data(
         &self,
         req: crate::model::ExportInsightsDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_insights_data(self, req, options).await
     }
 
@@ -625,8 +623,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_issue_model(
         &self,
         req: crate::model::CreateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_issue_model(self, req, options).await
     }
 
@@ -634,8 +632,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_issue_model(
         &self,
         req: crate::model::UpdateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IssueModel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IssueModel>> {
         T::update_issue_model(self, req, options).await
     }
 
@@ -643,8 +641,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_issue_model(
         &self,
         req: crate::model::GetIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IssueModel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IssueModel>> {
         T::get_issue_model(self, req, options).await
     }
 
@@ -652,8 +650,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_issue_models(
         &self,
         req: crate::model::ListIssueModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIssueModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIssueModelsResponse>> {
         T::list_issue_models(self, req, options).await
     }
 
@@ -661,8 +659,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_issue_model(
         &self,
         req: crate::model::DeleteIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_issue_model(self, req, options).await
     }
 
@@ -670,8 +668,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn deploy_issue_model(
         &self,
         req: crate::model::DeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy_issue_model(self, req, options).await
     }
 
@@ -679,8 +677,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn undeploy_issue_model(
         &self,
         req: crate::model::UndeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undeploy_issue_model(self, req, options).await
     }
 
@@ -688,8 +686,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn export_issue_model(
         &self,
         req: crate::model::ExportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_issue_model(self, req, options).await
     }
 
@@ -697,8 +695,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn import_issue_model(
         &self,
         req: crate::model::ImportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_issue_model(self, req, options).await
     }
 
@@ -706,8 +704,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_issue(
         &self,
         req: crate::model::GetIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Issue>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Issue>> {
         T::get_issue(self, req, options).await
     }
 
@@ -715,8 +713,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_issues(
         &self,
         req: crate::model::ListIssuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIssuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIssuesResponse>> {
         T::list_issues(self, req, options).await
     }
 
@@ -724,8 +722,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_issue(
         &self,
         req: crate::model::UpdateIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Issue>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Issue>> {
         T::update_issue(self, req, options).await
     }
 
@@ -733,8 +731,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_issue(
         &self,
         req: crate::model::DeleteIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_issue(self, req, options).await
     }
 
@@ -742,9 +740,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn calculate_issue_model_stats(
         &self,
         req: crate::model::CalculateIssueModelStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateIssueModelStatsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateIssueModelStatsResponse>> {
         T::calculate_issue_model_stats(self, req, options).await
     }
 
@@ -752,8 +749,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_phrase_matcher(
         &self,
         req: crate::model::CreatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PhraseMatcher>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PhraseMatcher>> {
         T::create_phrase_matcher(self, req, options).await
     }
 
@@ -761,8 +758,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_phrase_matcher(
         &self,
         req: crate::model::GetPhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PhraseMatcher>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PhraseMatcher>> {
         T::get_phrase_matcher(self, req, options).await
     }
 
@@ -770,8 +767,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_phrase_matchers(
         &self,
         req: crate::model::ListPhraseMatchersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPhraseMatchersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPhraseMatchersResponse>> {
         T::list_phrase_matchers(self, req, options).await
     }
 
@@ -779,8 +776,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_phrase_matcher(
         &self,
         req: crate::model::DeletePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_phrase_matcher(self, req, options).await
     }
 
@@ -788,8 +785,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_phrase_matcher(
         &self,
         req: crate::model::UpdatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PhraseMatcher>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PhraseMatcher>> {
         T::update_phrase_matcher(self, req, options).await
     }
 
@@ -797,8 +794,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn calculate_stats(
         &self,
         req: crate::model::CalculateStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateStatsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateStatsResponse>> {
         T::calculate_stats(self, req, options).await
     }
 
@@ -806,8 +803,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>> {
         T::get_settings(self, req, options).await
     }
 
@@ -815,8 +812,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>> {
         T::update_settings(self, req, options).await
     }
 
@@ -824,8 +821,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_analysis_rule(
         &self,
         req: crate::model::CreateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalysisRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalysisRule>> {
         T::create_analysis_rule(self, req, options).await
     }
 
@@ -833,8 +830,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_analysis_rule(
         &self,
         req: crate::model::GetAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalysisRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalysisRule>> {
         T::get_analysis_rule(self, req, options).await
     }
 
@@ -842,8 +839,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_analysis_rules(
         &self,
         req: crate::model::ListAnalysisRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnalysisRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnalysisRulesResponse>> {
         T::list_analysis_rules(self, req, options).await
     }
 
@@ -851,8 +848,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_analysis_rule(
         &self,
         req: crate::model::UpdateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalysisRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalysisRule>> {
         T::update_analysis_rule(self, req, options).await
     }
 
@@ -860,8 +857,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_analysis_rule(
         &self,
         req: crate::model::DeleteAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_analysis_rule(self, req, options).await
     }
 
@@ -869,8 +866,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptionSpec>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptionSpec>> {
         T::get_encryption_spec(self, req, options).await
     }
 
@@ -878,8 +875,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::initialize_encryption_spec(self, req, options).await
     }
 
@@ -887,8 +884,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_view(
         &self,
         req: crate::model::CreateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::View>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::View>> {
         T::create_view(self, req, options).await
     }
 
@@ -896,8 +893,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_view(
         &self,
         req: crate::model::GetViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::View>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::View>> {
         T::get_view(self, req, options).await
     }
 
@@ -905,8 +902,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_views(
         &self,
         req: crate::model::ListViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListViewsResponse>> {
         T::list_views(self, req, options).await
     }
 
@@ -914,8 +911,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_view(
         &self,
         req: crate::model::UpdateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::View>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::View>> {
         T::update_view(self, req, options).await
     }
 
@@ -923,8 +920,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_view(
         &self,
         req: crate::model::DeleteViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_view(self, req, options).await
     }
 
@@ -932,8 +929,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn query_metrics(
         &self,
         req: crate::model::QueryMetricsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::query_metrics(self, req, options).await
     }
 
@@ -941,8 +938,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_qa_question(
         &self,
         req: crate::model::CreateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaQuestion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaQuestion>> {
         T::create_qa_question(self, req, options).await
     }
 
@@ -950,8 +947,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_qa_question(
         &self,
         req: crate::model::GetQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaQuestion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaQuestion>> {
         T::get_qa_question(self, req, options).await
     }
 
@@ -959,8 +956,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_qa_question(
         &self,
         req: crate::model::UpdateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaQuestion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaQuestion>> {
         T::update_qa_question(self, req, options).await
     }
 
@@ -968,8 +965,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_qa_question(
         &self,
         req: crate::model::DeleteQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_qa_question(self, req, options).await
     }
 
@@ -977,8 +974,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_qa_questions(
         &self,
         req: crate::model::ListQaQuestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQaQuestionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQaQuestionsResponse>> {
         T::list_qa_questions(self, req, options).await
     }
 
@@ -986,8 +983,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_qa_scorecard(
         &self,
         req: crate::model::CreateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecard>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecard>> {
         T::create_qa_scorecard(self, req, options).await
     }
 
@@ -995,8 +992,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_qa_scorecard(
         &self,
         req: crate::model::GetQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecard>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecard>> {
         T::get_qa_scorecard(self, req, options).await
     }
 
@@ -1004,8 +1001,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_qa_scorecard(
         &self,
         req: crate::model::UpdateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecard>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecard>> {
         T::update_qa_scorecard(self, req, options).await
     }
 
@@ -1013,8 +1010,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_qa_scorecard(
         &self,
         req: crate::model::DeleteQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_qa_scorecard(self, req, options).await
     }
 
@@ -1022,8 +1019,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_qa_scorecards(
         &self,
         req: crate::model::ListQaScorecardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQaScorecardsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQaScorecardsResponse>> {
         T::list_qa_scorecards(self, req, options).await
     }
 
@@ -1031,8 +1028,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_qa_scorecard_revision(
         &self,
         req: crate::model::CreateQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>> {
         T::create_qa_scorecard_revision(self, req, options).await
     }
 
@@ -1040,8 +1037,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_qa_scorecard_revision(
         &self,
         req: crate::model::GetQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>> {
         T::get_qa_scorecard_revision(self, req, options).await
     }
 
@@ -1049,8 +1046,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn tune_qa_scorecard_revision(
         &self,
         req: crate::model::TuneQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::tune_qa_scorecard_revision(self, req, options).await
     }
 
@@ -1058,8 +1055,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn deploy_qa_scorecard_revision(
         &self,
         req: crate::model::DeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>> {
         T::deploy_qa_scorecard_revision(self, req, options).await
     }
 
@@ -1067,8 +1064,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn undeploy_qa_scorecard_revision(
         &self,
         req: crate::model::UndeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QaScorecardRevision>> {
         T::undeploy_qa_scorecard_revision(self, req, options).await
     }
 
@@ -1076,8 +1073,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_qa_scorecard_revision(
         &self,
         req: crate::model::DeleteQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_qa_scorecard_revision(self, req, options).await
     }
 
@@ -1085,9 +1082,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_qa_scorecard_revisions(
         &self,
         req: crate::model::ListQaScorecardRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQaScorecardRevisionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQaScorecardRevisionsResponse>> {
         T::list_qa_scorecard_revisions(self, req, options).await
     }
 
@@ -1095,8 +1091,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn create_feedback_label(
         &self,
         req: crate::model::CreateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeedbackLabel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeedbackLabel>> {
         T::create_feedback_label(self, req, options).await
     }
 
@@ -1104,8 +1100,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_feedback_labels(
         &self,
         req: crate::model::ListFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeedbackLabelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeedbackLabelsResponse>> {
         T::list_feedback_labels(self, req, options).await
     }
 
@@ -1113,8 +1109,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_feedback_label(
         &self,
         req: crate::model::GetFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeedbackLabel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeedbackLabel>> {
         T::get_feedback_label(self, req, options).await
     }
 
@@ -1122,8 +1118,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn update_feedback_label(
         &self,
         req: crate::model::UpdateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FeedbackLabel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FeedbackLabel>> {
         T::update_feedback_label(self, req, options).await
     }
 
@@ -1131,8 +1127,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn delete_feedback_label(
         &self,
         req: crate::model::DeleteFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_feedback_label(self, req, options).await
     }
 
@@ -1140,8 +1136,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_all_feedback_labels(
         &self,
         req: crate::model::ListAllFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAllFeedbackLabelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAllFeedbackLabelsResponse>> {
         T::list_all_feedback_labels(self, req, options).await
     }
 
@@ -1149,8 +1145,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn bulk_upload_feedback_labels(
         &self,
         req: crate::model::BulkUploadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::bulk_upload_feedback_labels(self, req, options).await
     }
 
@@ -1158,8 +1154,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn bulk_download_feedback_labels(
         &self,
         req: crate::model::BulkDownloadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::bulk_download_feedback_labels(self, req, options).await
     }
 
@@ -1167,10 +1163,9 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1178,8 +1173,8 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1187,22 +1182,22 @@ impl<T: super::ContactCenterInsights> ContactCenterInsights for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/tracing.rs b/src/generated/cloud/contactcenterinsights/v1/src/tracing.rs
index dd769d5ab5..51111d4b1f 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/tracing.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.create_conversation(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn upload_conversation(
         &self,
         req: crate::model::UploadConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.upload_conversation(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.update_conversation(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.get_conversation(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationsResponse>> {
         self.inner.list_conversations(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_conversation(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn create_analysis(
         &self,
         req: crate::model::CreateAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_analysis(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_analysis(
         &self,
         req: crate::model::GetAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Analysis>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Analysis>> {
         self.inner.get_analysis(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_analyses(
         &self,
         req: crate::model::ListAnalysesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnalysesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnalysesResponse>> {
         self.inner.list_analyses(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_analysis(
         &self,
         req: crate::model::DeleteAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_analysis(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn bulk_analyze_conversations(
         &self,
         req: crate::model::BulkAnalyzeConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.bulk_analyze_conversations(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn bulk_delete_conversations(
         &self,
         req: crate::model::BulkDeleteConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.bulk_delete_conversations(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn ingest_conversations(
         &self,
         req: crate::model::IngestConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.ingest_conversations(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn export_insights_data(
         &self,
         req: crate::model::ExportInsightsDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_insights_data(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn create_issue_model(
         &self,
         req: crate::model::CreateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_issue_model(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn update_issue_model(
         &self,
         req: crate::model::UpdateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IssueModel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IssueModel>> {
         self.inner.update_issue_model(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn get_issue_model(
         &self,
         req: crate::model::GetIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IssueModel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IssueModel>> {
         self.inner.get_issue_model(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn list_issue_models(
         &self,
         req: crate::model::ListIssueModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIssueModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIssueModelsResponse>> {
         self.inner.list_issue_models(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn delete_issue_model(
         &self,
         req: crate::model::DeleteIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_issue_model(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn deploy_issue_model(
         &self,
         req: crate::model::DeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy_issue_model(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn undeploy_issue_model(
         &self,
         req: crate::model::UndeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undeploy_issue_model(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn export_issue_model(
         &self,
         req: crate::model::ExportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_issue_model(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn import_issue_model(
         &self,
         req: crate::model::ImportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_issue_model(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn get_issue(
         &self,
         req: crate::model::GetIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Issue>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Issue>> {
         self.inner.get_issue(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn list_issues(
         &self,
         req: crate::model::ListIssuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIssuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIssuesResponse>> {
         self.inner.list_issues(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn update_issue(
         &self,
         req: crate::model::UpdateIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Issue>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Issue>> {
         self.inner.update_issue(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn delete_issue(
         &self,
         req: crate::model::DeleteIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_issue(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn calculate_issue_model_stats(
         &self,
         req: crate::model::CalculateIssueModelStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateIssueModelStatsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateIssueModelStatsResponse>> {
         self.inner.calculate_issue_model_stats(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn create_phrase_matcher(
         &self,
         req: crate::model::CreatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PhraseMatcher>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PhraseMatcher>> {
         self.inner.create_phrase_matcher(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn get_phrase_matcher(
         &self,
         req: crate::model::GetPhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PhraseMatcher>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PhraseMatcher>> {
         self.inner.get_phrase_matcher(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn list_phrase_matchers(
         &self,
         req: crate::model::ListPhraseMatchersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPhraseMatchersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPhraseMatchersResponse>> {
         self.inner.list_phrase_matchers(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn delete_phrase_matcher(
         &self,
         req: crate::model::DeletePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_phrase_matcher(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn update_phrase_matcher(
         &self,
         req: crate::model::UpdatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PhraseMatcher>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PhraseMatcher>> {
         self.inner.update_phrase_matcher(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn calculate_stats(
         &self,
         req: crate::model::CalculateStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateStatsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateStatsResponse>> {
         self.inner.calculate_stats(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         self.inner.get_settings(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         self.inner.update_settings(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn create_analysis_rule(
         &self,
         req: crate::model::CreateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalysisRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalysisRule>> {
         self.inner.create_analysis_rule(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn get_analysis_rule(
         &self,
         req: crate::model::GetAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalysisRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalysisRule>> {
         self.inner.get_analysis_rule(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn list_analysis_rules(
         &self,
         req: crate::model::ListAnalysisRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnalysisRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnalysisRulesResponse>> {
         self.inner.list_analysis_rules(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn update_analysis_rule(
         &self,
         req: crate::model::UpdateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalysisRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalysisRule>> {
         self.inner.update_analysis_rule(req, options).await
     }
 
@@ -401,8 +401,8 @@ where
     async fn delete_analysis_rule(
         &self,
         req: crate::model::DeleteAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_analysis_rule(req, options).await
     }
 
@@ -410,8 +410,8 @@ where
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptionSpec>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptionSpec>> {
         self.inner.get_encryption_spec(req, options).await
     }
 
@@ -419,8 +419,8 @@ where
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.initialize_encryption_spec(req, options).await
     }
 
@@ -428,8 +428,8 @@ where
     async fn create_view(
         &self,
         req: crate::model::CreateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::View>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::View>> {
         self.inner.create_view(req, options).await
     }
 
@@ -437,8 +437,8 @@ where
     async fn get_view(
         &self,
         req: crate::model::GetViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::View>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::View>> {
         self.inner.get_view(req, options).await
     }
 
@@ -446,8 +446,8 @@ where
     async fn list_views(
         &self,
         req: crate::model::ListViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListViewsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListViewsResponse>> {
         self.inner.list_views(req, options).await
     }
 
@@ -455,8 +455,8 @@ where
     async fn update_view(
         &self,
         req: crate::model::UpdateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::View>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::View>> {
         self.inner.update_view(req, options).await
     }
 
@@ -464,8 +464,8 @@ where
     async fn delete_view(
         &self,
         req: crate::model::DeleteViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_view(req, options).await
     }
 
@@ -473,8 +473,8 @@ where
     async fn query_metrics(
         &self,
         req: crate::model::QueryMetricsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.query_metrics(req, options).await
     }
 
@@ -482,8 +482,8 @@ where
     async fn create_qa_question(
         &self,
         req: crate::model::CreateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaQuestion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaQuestion>> {
         self.inner.create_qa_question(req, options).await
     }
 
@@ -491,8 +491,8 @@ where
     async fn get_qa_question(
         &self,
         req: crate::model::GetQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaQuestion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaQuestion>> {
         self.inner.get_qa_question(req, options).await
     }
 
@@ -500,8 +500,8 @@ where
     async fn update_qa_question(
         &self,
         req: crate::model::UpdateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaQuestion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaQuestion>> {
         self.inner.update_qa_question(req, options).await
     }
 
@@ -509,8 +509,8 @@ where
     async fn delete_qa_question(
         &self,
         req: crate::model::DeleteQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_qa_question(req, options).await
     }
 
@@ -518,8 +518,8 @@ where
     async fn list_qa_questions(
         &self,
         req: crate::model::ListQaQuestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQaQuestionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQaQuestionsResponse>> {
         self.inner.list_qa_questions(req, options).await
     }
 
@@ -527,8 +527,8 @@ where
     async fn create_qa_scorecard(
         &self,
         req: crate::model::CreateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecard>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecard>> {
         self.inner.create_qa_scorecard(req, options).await
     }
 
@@ -536,8 +536,8 @@ where
     async fn get_qa_scorecard(
         &self,
         req: crate::model::GetQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecard>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecard>> {
         self.inner.get_qa_scorecard(req, options).await
     }
 
@@ -545,8 +545,8 @@ where
     async fn update_qa_scorecard(
         &self,
         req: crate::model::UpdateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecard>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecard>> {
         self.inner.update_qa_scorecard(req, options).await
     }
 
@@ -554,8 +554,8 @@ where
     async fn delete_qa_scorecard(
         &self,
         req: crate::model::DeleteQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_qa_scorecard(req, options).await
     }
 
@@ -563,8 +563,8 @@ where
     async fn list_qa_scorecards(
         &self,
         req: crate::model::ListQaScorecardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQaScorecardsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQaScorecardsResponse>> {
         self.inner.list_qa_scorecards(req, options).await
     }
 
@@ -572,8 +572,8 @@ where
     async fn create_qa_scorecard_revision(
         &self,
         req: crate::model::CreateQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         self.inner.create_qa_scorecard_revision(req, options).await
     }
 
@@ -581,8 +581,8 @@ where
     async fn get_qa_scorecard_revision(
         &self,
         req: crate::model::GetQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         self.inner.get_qa_scorecard_revision(req, options).await
     }
 
@@ -590,8 +590,8 @@ where
     async fn tune_qa_scorecard_revision(
         &self,
         req: crate::model::TuneQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.tune_qa_scorecard_revision(req, options).await
     }
 
@@ -599,8 +599,8 @@ where
     async fn deploy_qa_scorecard_revision(
         &self,
         req: crate::model::DeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         self.inner.deploy_qa_scorecard_revision(req, options).await
     }
 
@@ -608,8 +608,8 @@ where
     async fn undeploy_qa_scorecard_revision(
         &self,
         req: crate::model::UndeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         self.inner
             .undeploy_qa_scorecard_revision(req, options)
             .await
@@ -619,8 +619,8 @@ where
     async fn delete_qa_scorecard_revision(
         &self,
         req: crate::model::DeleteQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_qa_scorecard_revision(req, options).await
     }
 
@@ -628,8 +628,8 @@ where
     async fn list_qa_scorecard_revisions(
         &self,
         req: crate::model::ListQaScorecardRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQaScorecardRevisionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQaScorecardRevisionsResponse>> {
         self.inner.list_qa_scorecard_revisions(req, options).await
     }
 
@@ -637,8 +637,8 @@ where
     async fn create_feedback_label(
         &self,
         req: crate::model::CreateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeedbackLabel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeedbackLabel>> {
         self.inner.create_feedback_label(req, options).await
     }
 
@@ -646,8 +646,8 @@ where
     async fn list_feedback_labels(
         &self,
         req: crate::model::ListFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeedbackLabelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeedbackLabelsResponse>> {
         self.inner.list_feedback_labels(req, options).await
     }
 
@@ -655,8 +655,8 @@ where
     async fn get_feedback_label(
         &self,
         req: crate::model::GetFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeedbackLabel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeedbackLabel>> {
         self.inner.get_feedback_label(req, options).await
     }
 
@@ -664,8 +664,8 @@ where
     async fn update_feedback_label(
         &self,
         req: crate::model::UpdateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeedbackLabel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeedbackLabel>> {
         self.inner.update_feedback_label(req, options).await
     }
 
@@ -673,8 +673,8 @@ where
     async fn delete_feedback_label(
         &self,
         req: crate::model::DeleteFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_feedback_label(req, options).await
     }
 
@@ -682,8 +682,8 @@ where
     async fn list_all_feedback_labels(
         &self,
         req: crate::model::ListAllFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAllFeedbackLabelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAllFeedbackLabelsResponse>> {
         self.inner.list_all_feedback_labels(req, options).await
     }
 
@@ -691,8 +691,8 @@ where
     async fn bulk_upload_feedback_labels(
         &self,
         req: crate::model::BulkUploadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.bulk_upload_feedback_labels(req, options).await
     }
 
@@ -700,8 +700,8 @@ where
     async fn bulk_download_feedback_labels(
         &self,
         req: crate::model::BulkDownloadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.bulk_download_feedback_labels(req, options).await
     }
 
@@ -709,9 +709,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -719,8 +718,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -728,22 +727,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/transport.rs b/src/generated/cloud/contactcenterinsights/v1/src/transport.rs
index 3312e25f60..d1cbd2e431 100644
--- a/src/generated/cloud/contactcenterinsights/v1/src/transport.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ContactCenterInsights](super::stub::ContactCenterInsights) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ContactCenterInsights {
 }
 
 impl ContactCenterInsights {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn upload_conversation(
         &self,
         req: crate::model::UploadConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -147,9 +147,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -164,13 +164,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -229,9 +229,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -246,13 +246,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -294,9 +294,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -311,13 +311,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -359,9 +359,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -376,13 +376,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -424,9 +424,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -435,24 +435,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_analysis(
         &self,
         req: crate::model::CreateAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -493,9 +494,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -510,13 +511,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_analysis(
         &self,
         req: crate::model::GetAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Analysis>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Analysis>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -561,9 +562,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -578,13 +579,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_analyses(
         &self,
         req: crate::model::ListAnalysesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnalysesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnalysesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -628,9 +629,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -645,13 +646,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_analysis(
         &self,
         req: crate::model::DeleteAnalysisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -696,9 +697,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -707,24 +708,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn bulk_analyze_conversations(
         &self,
         req: crate::model::BulkAnalyzeConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -761,9 +763,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -778,13 +780,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn bulk_delete_conversations(
         &self,
         req: crate::model::BulkDeleteConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -821,9 +823,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -838,13 +840,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn ingest_conversations(
         &self,
         req: crate::model::IngestConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -881,9 +883,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -898,13 +900,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn export_insights_data(
         &self,
         req: crate::model::ExportInsightsDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -941,9 +943,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -958,13 +960,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_issue_model(
         &self,
         req: crate::model::CreateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1001,9 +1003,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1018,13 +1020,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_issue_model(
         &self,
         req: crate::model::UpdateIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IssueModel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IssueModel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1083,9 +1085,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1100,13 +1102,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_issue_model(
         &self,
         req: crate::model::GetIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IssueModel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IssueModel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1147,9 +1149,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1164,13 +1166,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_issue_models(
         &self,
         req: crate::model::ListIssueModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIssueModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIssueModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1207,9 +1209,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1224,13 +1226,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_issue_model(
         &self,
         req: crate::model::DeleteIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1271,9 +1273,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1288,13 +1290,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn deploy_issue_model(
         &self,
         req: crate::model::DeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1335,9 +1337,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1352,13 +1354,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn undeploy_issue_model(
         &self,
         req: crate::model::UndeployIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1399,9 +1401,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1416,13 +1418,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn export_issue_model(
         &self,
         req: crate::model::ExportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1463,9 +1465,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1480,13 +1482,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn import_issue_model(
         &self,
         req: crate::model::ImportIssueModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1523,9 +1525,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1540,13 +1542,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_issue(
         &self,
         req: crate::model::GetIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Issue>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Issue>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1591,9 +1593,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1608,13 +1610,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_issues(
         &self,
         req: crate::model::ListIssuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIssuesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIssuesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1655,9 +1657,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1672,13 +1674,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_issue(
         &self,
         req: crate::model::UpdateIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Issue>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Issue>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1741,9 +1743,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1758,13 +1760,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_issue(
         &self,
         req: crate::model::DeleteIssueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1809,9 +1811,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1820,24 +1822,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn calculate_issue_model_stats(
         &self,
         req: crate::model::CalculateIssueModelStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateIssueModelStatsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateIssueModelStatsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1878,9 +1881,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1895,13 +1898,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_phrase_matcher(
         &self,
         req: crate::model::CreatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PhraseMatcher>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PhraseMatcher>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1938,9 +1941,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1955,13 +1958,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_phrase_matcher(
         &self,
         req: crate::model::GetPhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PhraseMatcher>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PhraseMatcher>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2002,9 +2005,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2019,13 +2022,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_phrase_matchers(
         &self,
         req: crate::model::ListPhraseMatchersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPhraseMatchersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPhraseMatchersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2065,9 +2068,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2082,13 +2085,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_phrase_matcher(
         &self,
         req: crate::model::DeletePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2129,9 +2132,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2140,24 +2143,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_phrase_matcher(
         &self,
         req: crate::model::UpdatePhraseMatcherRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PhraseMatcher>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PhraseMatcher>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2216,9 +2220,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2233,13 +2237,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn calculate_stats(
         &self,
         req: crate::model::CalculateStatsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateStatsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateStatsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2319,9 +2323,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2336,13 +2340,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2381,9 +2385,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2398,13 +2402,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2461,9 +2465,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2478,13 +2482,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_analysis_rule(
         &self,
         req: crate::model::CreateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalysisRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalysisRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2521,9 +2525,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2538,13 +2542,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_analysis_rule(
         &self,
         req: crate::model::GetAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalysisRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalysisRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2585,9 +2589,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2602,13 +2606,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_analysis_rules(
         &self,
         req: crate::model::ListAnalysisRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnalysisRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnalysisRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2647,9 +2651,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2664,13 +2668,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_analysis_rule(
         &self,
         req: crate::model::UpdateAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalysisRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalysisRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2729,9 +2733,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2746,13 +2750,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_analysis_rule(
         &self,
         req: crate::model::DeleteAnalysisRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2793,9 +2797,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2804,24 +2808,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptionSpec>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptionSpec>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2860,9 +2865,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2877,13 +2882,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2928,9 +2933,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2945,13 +2950,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_view(
         &self,
         req: crate::model::CreateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::View>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::View>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2988,9 +2993,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3005,13 +3010,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_view(
         &self,
         req: crate::model::GetViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::View>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::View>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3052,9 +3057,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3069,13 +3074,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_views(
         &self,
         req: crate::model::ListViewsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListViewsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListViewsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3114,9 +3119,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3131,13 +3136,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_view(
         &self,
         req: crate::model::UpdateViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::View>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::View>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3196,9 +3201,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3213,13 +3218,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_view(
         &self,
         req: crate::model::DeleteViewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3260,9 +3265,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3271,24 +3276,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn query_metrics(
         &self,
         req: crate::model::QueryMetricsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3366,9 +3372,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3383,13 +3389,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_qa_question(
         &self,
         req: crate::model::CreateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaQuestion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaQuestion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3435,9 +3441,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3452,13 +3458,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_qa_question(
         &self,
         req: crate::model::GetQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaQuestion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaQuestion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3507,9 +3513,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3524,13 +3530,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_qa_question(
         &self,
         req: crate::model::UpdateQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaQuestion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaQuestion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3597,9 +3603,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3614,13 +3620,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_qa_question(
         &self,
         req: crate::model::DeleteQaQuestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3669,9 +3675,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3680,24 +3686,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_qa_questions(
         &self,
         req: crate::model::ListQaQuestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQaQuestionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQaQuestionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3744,9 +3751,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3761,13 +3768,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_qa_scorecard(
         &self,
         req: crate::model::CreateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecard>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecard>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3805,9 +3812,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3822,13 +3829,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_qa_scorecard(
         &self,
         req: crate::model::GetQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecard>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecard>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3869,9 +3876,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3886,13 +3893,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_qa_scorecard(
         &self,
         req: crate::model::UpdateQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecard>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecard>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3951,9 +3958,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3968,13 +3975,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_qa_scorecard(
         &self,
         req: crate::model::DeleteQaScorecardRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4016,9 +4023,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4027,24 +4034,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_qa_scorecards(
         &self,
         req: crate::model::ListQaScorecardsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQaScorecardsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQaScorecardsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4083,9 +4091,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4100,13 +4108,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_qa_scorecard_revision(
         &self,
         req: crate::model::CreateQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4149,9 +4157,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4166,13 +4174,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_qa_scorecard_revision(
         &self,
         req: crate::model::GetQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4217,9 +4225,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4234,13 +4242,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn tune_qa_scorecard_revision(
         &self,
         req: crate::model::TuneQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4285,9 +4293,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4302,13 +4310,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn deploy_qa_scorecard_revision(
         &self,
         req: crate::model::DeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4353,9 +4361,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4370,13 +4378,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn undeploy_qa_scorecard_revision(
         &self,
         req: crate::model::UndeployQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QaScorecardRevision>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QaScorecardRevision>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4421,9 +4429,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4438,13 +4446,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_qa_scorecard_revision(
         &self,
         req: crate::model::DeleteQaScorecardRevisionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4490,9 +4498,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4501,24 +4509,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_qa_scorecard_revisions(
         &self,
         req: crate::model::ListQaScorecardRevisionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQaScorecardRevisionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQaScorecardRevisionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4562,9 +4571,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4579,13 +4588,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn create_feedback_label(
         &self,
         req: crate::model::CreateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeedbackLabel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeedbackLabel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4627,9 +4636,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4644,13 +4653,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_feedback_labels(
         &self,
         req: crate::model::ListFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeedbackLabelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeedbackLabelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4694,9 +4703,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4711,13 +4720,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_feedback_label(
         &self,
         req: crate::model::GetFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeedbackLabel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeedbackLabel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4762,9 +4771,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4779,13 +4788,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn update_feedback_label(
         &self,
         req: crate::model::UpdateFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FeedbackLabel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FeedbackLabel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4848,9 +4857,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4865,13 +4874,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn delete_feedback_label(
         &self,
         req: crate::model::DeleteFeedbackLabelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4916,9 +4925,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4927,24 +4936,25 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_all_feedback_labels(
         &self,
         req: crate::model::ListAllFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAllFeedbackLabelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAllFeedbackLabelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4984,9 +4994,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5001,13 +5011,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn bulk_upload_feedback_labels(
         &self,
         req: crate::model::BulkUploadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5044,9 +5054,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5061,13 +5071,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn bulk_download_feedback_labels(
         &self,
         req: crate::model::BulkDownloadFeedbackLabelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5104,9 +5114,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5121,14 +5131,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5170,9 +5179,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5187,13 +5196,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5234,9 +5243,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5251,13 +5260,13 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5298,9 +5307,9 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5309,25 +5318,26 @@ impl super::stub::ContactCenterInsights for ContactCenterInsights {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml b/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml
index f53c697a0b..74b580b86e 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml
+++ b/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/builder.rs b/src/generated/cloud/datacatalog/lineage/v1/src/builder.rs
index 31f196adbe..cc36f2a98b 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/builder.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod lineage {
     /// A builder for [Lineage][crate::client::Lineage].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_lineage_v1::*;
     /// # use builder::lineage::ClientBuilder;
     /// # use client::Lineage;
@@ -30,19 +30,18 @@ pub mod lineage {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Lineage;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Lineage;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod lineage {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Lineage>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod lineage {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::ProcessOpenLineageRunEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -105,7 +104,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -115,7 +114,7 @@ pub mod lineage {
             (*self.0.stub)
                 .process_open_lineage_run_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ProcessOpenLineageRunEventRequest::parent].
@@ -156,8 +155,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ProcessOpenLineageRunEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ProcessOpenLineageRunEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -167,7 +166,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::CreateProcess;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -193,7 +192,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -203,7 +202,7 @@ pub mod lineage {
             (*self.0.stub)
                 .create_process(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateProcessRequest::parent].
@@ -244,8 +243,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateProcess {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateProcess {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -255,7 +254,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::UpdateProcess;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -281,7 +280,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -291,7 +290,7 @@ pub mod lineage {
             (*self.0.stub)
                 .update_process(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [process][crate::model::UpdateProcessRequest::process].
@@ -342,8 +341,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateProcess {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateProcess {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -353,7 +352,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::GetProcess;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -379,7 +378,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -389,7 +388,7 @@ pub mod lineage {
             (*self.0.stub)
                 .get_process(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProcessRequest::name].
@@ -402,8 +401,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProcess {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProcess {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -413,8 +412,8 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::ListProcesses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -443,7 +442,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -453,13 +452,13 @@ pub mod lineage {
             (*self.0.stub)
                 .list_processes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProcessesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListProcessesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -468,15 +467,17 @@ pub mod lineage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListProcessesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListProcessesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -502,8 +503,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProcesses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProcesses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -513,7 +514,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::DeleteProcess;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -540,7 +541,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -555,7 +556,7 @@ pub mod lineage {
             (*self.0.stub)
                 .delete_process(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_process`.
@@ -567,7 +568,7 @@ pub mod lineage {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -610,8 +611,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteProcess {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteProcess {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -621,7 +622,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::CreateRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -647,7 +648,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -657,7 +658,7 @@ pub mod lineage {
             (*self.0.stub)
                 .create_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateRunRequest::parent].
@@ -698,8 +699,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -709,7 +710,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::UpdateRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -735,7 +736,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -745,7 +746,7 @@ pub mod lineage {
             (*self.0.stub)
                 .update_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [run][crate::model::UpdateRunRequest::run].
@@ -796,8 +797,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -807,7 +808,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::GetRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -833,7 +834,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -843,7 +844,7 @@ pub mod lineage {
             (*self.0.stub)
                 .get_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRunRequest::name].
@@ -856,8 +857,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -867,8 +868,8 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::ListRuns;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -897,7 +898,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -907,13 +908,13 @@ pub mod lineage {
             (*self.0.stub)
                 .list_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRunsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRunsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -922,15 +923,15 @@ pub mod lineage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRunsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListRunsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -956,8 +957,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -967,7 +968,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::DeleteRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -994,7 +995,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1009,7 +1010,7 @@ pub mod lineage {
             (*self.0.stub)
                 .delete_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_run`.
@@ -1021,7 +1022,7 @@ pub mod lineage {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1064,8 +1065,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1075,7 +1076,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::CreateLineageEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1104,7 +1105,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1114,7 +1115,7 @@ pub mod lineage {
             (*self.0.stub)
                 .create_lineage_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateLineageEventRequest::parent].
@@ -1155,8 +1156,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateLineageEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateLineageEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1166,7 +1167,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::GetLineageEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1192,7 +1193,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1202,7 +1203,7 @@ pub mod lineage {
             (*self.0.stub)
                 .get_lineage_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetLineageEventRequest::name].
@@ -1215,8 +1216,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLineageEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLineageEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1226,8 +1227,8 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::ListLineageEvents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1259,7 +1260,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1269,14 +1270,16 @@ pub mod lineage {
             (*self.0.stub)
                 .list_lineage_events(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListLineageEventsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListLineageEventsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1284,15 +1287,17 @@ pub mod lineage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListLineageEventsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListLineageEventsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1318,8 +1323,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLineageEvents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLineageEvents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1329,7 +1334,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::DeleteLineageEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1358,7 +1363,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1368,7 +1373,7 @@ pub mod lineage {
             (*self.0.stub)
                 .delete_lineage_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteLineageEventRequest::name].
@@ -1387,8 +1392,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteLineageEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteLineageEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1398,8 +1403,8 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::SearchLinks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1428,7 +1433,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1438,13 +1443,13 @@ pub mod lineage {
             (*self.0.stub)
                 .search_links(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchLinksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchLinksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1453,15 +1458,17 @@ pub mod lineage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchLinksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchLinksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1525,8 +1532,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchLinks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchLinks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1536,8 +1543,8 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::BatchSearchLinkProcesses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1571,7 +1578,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1581,15 +1588,15 @@ pub mod lineage {
             (*self.0.stub)
                 .batch_search_link_processes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::BatchSearchLinkProcessesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1598,17 +1605,17 @@ pub mod lineage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::BatchSearchLinkProcessesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1647,8 +1654,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchSearchLinkProcesses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchSearchLinkProcesses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1658,8 +1665,8 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1693,7 +1700,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1703,15 +1710,15 @@ pub mod lineage {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1720,17 +1727,17 @@ pub mod lineage {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1766,8 +1773,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1777,7 +1784,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1806,7 +1813,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1816,7 +1823,7 @@ pub mod lineage {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1827,8 +1834,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1838,7 +1845,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1869,7 +1876,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1879,7 +1886,7 @@ pub mod lineage {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1890,8 +1897,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1901,7 +1908,7 @@ pub mod lineage {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_lineage_v1::builder::lineage::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_lineage_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1932,7 +1939,7 @@ pub mod lineage {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1942,7 +1949,7 @@ pub mod lineage {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1953,8 +1960,8 @@ pub mod lineage {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/client.rs b/src/generated/cloud/datacatalog/lineage/v1/src/client.rs
index ed506a591a..3a6e522d58 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/client.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_datacatalog_lineage_v1::client::Lineage;
 /// let client = Lineage::builder().build().await?;
 /// // use `client` to make requests to the Data Lineage API.
@@ -71,13 +71,13 @@ impl Lineage {
     /// Returns a builder for [Lineage].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_lineage_v1::client::Lineage;
     /// let client = Lineage::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::lineage::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::lineage::client::Factory)
+        crate::new_client_builder(super::builder::lineage::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,14 +95,14 @@ impl Lineage {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Lineage>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Lineage>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -111,13 +111,13 @@ impl Lineage {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Lineage> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Lineage> {
         super::transport::Lineage::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Lineage> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Lineage> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Lineage::new)
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/lib.rs b/src/generated/cloud/datacatalog/lineage/v1/src/lib.rs
index d4a6033b20..3f38fb7379 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/lib.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/model.rs b/src/generated/cloud/datacatalog/lineage/v1/src/model.rs
index ec6ffa7214..68439b8559 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/model.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -1736,7 +1736,7 @@ impl wkt::message::Message for ListProcessesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProcessesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProcessesResponse {
     type PageItem = crate::model::Process;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2170,7 +2170,7 @@ impl wkt::message::Message for ListRunsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRunsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRunsResponse {
     type PageItem = crate::model::Run;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2493,7 +2493,7 @@ impl wkt::message::Message for ListLineageEventsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListLineageEventsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListLineageEventsResponse {
     type PageItem = crate::model::LineageEvent;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2811,7 +2811,7 @@ impl wkt::message::Message for SearchLinksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchLinksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchLinksResponse {
     type PageItem = crate::model::Link;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3170,7 +3170,7 @@ impl wkt::message::Message for BatchSearchLinkProcessesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for BatchSearchLinkProcessesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for BatchSearchLinkProcessesResponse {
     type PageItem = crate::model::ProcessLinks;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/stub.rs b/src/generated/cloud/datacatalog/lineage/v1/src/stub.rs
index 1b9a716ea4..b61fd94b86 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/stub.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn process_open_lineage_run_event(
         &self,
         _req: crate::model::ProcessOpenLineageRunEventRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ProcessOpenLineageRunEventResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ProcessOpenLineageRunEventResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,10 +53,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn create_process(
         &self,
         _req: crate::model::CreateProcessRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Process>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Process>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -66,10 +63,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn update_process(
         &self,
         _req: crate::model::UpdateProcessRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Process>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Process>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -77,10 +73,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn get_process(
         &self,
         _req: crate::model::GetProcessRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Process>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Process>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -88,9 +83,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn list_processes(
         &self,
         _req: crate::model::ListProcessesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListProcessesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListProcessesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +94,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn delete_process(
         &self,
         _req: crate::model::DeleteProcessRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +105,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn create_run(
         &self,
         _req: crate::model::CreateRunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Run>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Run>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -120,9 +115,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn update_run(
         &self,
         _req: crate::model::UpdateRunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Run>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Run>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -130,9 +125,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn get_run(
         &self,
         _req: crate::model::GetRunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Run>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Run>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -140,9 +135,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn list_runs(
         &self,
         _req: crate::model::ListRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -151,9 +146,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn delete_run(
         &self,
         _req: crate::model::DeleteRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -162,9 +157,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn create_lineage_event(
         &self,
         _req: crate::model::CreateLineageEventRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LineageEvent>>,
+        Output = crate::Result<crate::Response<crate::model::LineageEvent>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -173,9 +168,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn get_lineage_event(
         &self,
         _req: crate::model::GetLineageEventRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::LineageEvent>>,
+        Output = crate::Result<crate::Response<crate::model::LineageEvent>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -184,9 +179,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn list_lineage_events(
         &self,
         _req: crate::model::ListLineageEventsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListLineageEventsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListLineageEventsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -195,8 +190,8 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn delete_lineage_event(
         &self,
         _req: crate::model::DeleteLineageEventRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -204,9 +199,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn search_links(
         &self,
         _req: crate::model::SearchLinksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchLinksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchLinksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -215,11 +210,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn batch_search_link_processes(
         &self,
         _req: crate::model::BatchSearchLinkProcessesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::BatchSearchLinkProcessesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::BatchSearchLinkProcessesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -228,10 +221,10 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -241,9 +234,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -252,8 +245,8 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -261,8 +254,8 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -272,9 +265,9 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -283,8 +276,8 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/stub/dynamic.rs b/src/generated/cloud/datacatalog/lineage/v1/src/stub/dynamic.rs
index e4e9b6e16d..bfb1afc950 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/stub/dynamic.rs
@@ -20,140 +20,138 @@ pub trait Lineage: std::fmt::Debug + Send + Sync {
     async fn process_open_lineage_run_event(
         &self,
         req: crate::model::ProcessOpenLineageRunEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessOpenLineageRunEventResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessOpenLineageRunEventResponse>>;
 
     async fn create_process(
         &self,
         req: crate::model::CreateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Process>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Process>>;
 
     async fn update_process(
         &self,
         req: crate::model::UpdateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Process>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Process>>;
 
     async fn get_process(
         &self,
         req: crate::model::GetProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Process>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Process>>;
 
     async fn list_processes(
         &self,
         req: crate::model::ListProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessesResponse>>;
 
     async fn delete_process(
         &self,
         req: crate::model::DeleteProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_run(
         &self,
         req: crate::model::CreateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Run>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Run>>;
 
     async fn update_run(
         &self,
         req: crate::model::UpdateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Run>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Run>>;
 
     async fn get_run(
         &self,
         req: crate::model::GetRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Run>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Run>>;
 
     async fn list_runs(
         &self,
         req: crate::model::ListRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRunsResponse>>;
 
     async fn delete_run(
         &self,
         req: crate::model::DeleteRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_lineage_event(
         &self,
         req: crate::model::CreateLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageEvent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageEvent>>;
 
     async fn get_lineage_event(
         &self,
         req: crate::model::GetLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageEvent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageEvent>>;
 
     async fn list_lineage_events(
         &self,
         req: crate::model::ListLineageEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLineageEventsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLineageEventsResponse>>;
 
     async fn delete_lineage_event(
         &self,
         req: crate::model::DeleteLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn search_links(
         &self,
         req: crate::model::SearchLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchLinksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchLinksResponse>>;
 
     async fn batch_search_link_processes(
         &self,
         req: crate::model::BatchSearchLinkProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchSearchLinkProcessesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchSearchLinkProcessesResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Lineage] also implement [Lineage].
@@ -163,9 +161,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn process_open_lineage_run_event(
         &self,
         req: crate::model::ProcessOpenLineageRunEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessOpenLineageRunEventResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessOpenLineageRunEventResponse>> {
         T::process_open_lineage_run_event(self, req, options).await
     }
 
@@ -173,8 +170,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn create_process(
         &self,
         req: crate::model::CreateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Process>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Process>> {
         T::create_process(self, req, options).await
     }
 
@@ -182,8 +179,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn update_process(
         &self,
         req: crate::model::UpdateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Process>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Process>> {
         T::update_process(self, req, options).await
     }
 
@@ -191,8 +188,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn get_process(
         &self,
         req: crate::model::GetProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Process>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Process>> {
         T::get_process(self, req, options).await
     }
 
@@ -200,8 +197,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn list_processes(
         &self,
         req: crate::model::ListProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessesResponse>> {
         T::list_processes(self, req, options).await
     }
 
@@ -209,8 +206,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn delete_process(
         &self,
         req: crate::model::DeleteProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_process(self, req, options).await
     }
 
@@ -218,8 +215,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn create_run(
         &self,
         req: crate::model::CreateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Run>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Run>> {
         T::create_run(self, req, options).await
     }
 
@@ -227,8 +224,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn update_run(
         &self,
         req: crate::model::UpdateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Run>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Run>> {
         T::update_run(self, req, options).await
     }
 
@@ -236,8 +233,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn get_run(
         &self,
         req: crate::model::GetRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Run>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Run>> {
         T::get_run(self, req, options).await
     }
 
@@ -245,8 +242,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn list_runs(
         &self,
         req: crate::model::ListRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRunsResponse>> {
         T::list_runs(self, req, options).await
     }
 
@@ -254,8 +251,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn delete_run(
         &self,
         req: crate::model::DeleteRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_run(self, req, options).await
     }
 
@@ -263,8 +260,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn create_lineage_event(
         &self,
         req: crate::model::CreateLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageEvent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageEvent>> {
         T::create_lineage_event(self, req, options).await
     }
 
@@ -272,8 +269,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn get_lineage_event(
         &self,
         req: crate::model::GetLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LineageEvent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LineageEvent>> {
         T::get_lineage_event(self, req, options).await
     }
 
@@ -281,8 +278,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn list_lineage_events(
         &self,
         req: crate::model::ListLineageEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLineageEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLineageEventsResponse>> {
         T::list_lineage_events(self, req, options).await
     }
 
@@ -290,8 +287,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn delete_lineage_event(
         &self,
         req: crate::model::DeleteLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_lineage_event(self, req, options).await
     }
 
@@ -299,8 +296,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn search_links(
         &self,
         req: crate::model::SearchLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchLinksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchLinksResponse>> {
         T::search_links(self, req, options).await
     }
 
@@ -308,9 +305,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn batch_search_link_processes(
         &self,
         req: crate::model::BatchSearchLinkProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchSearchLinkProcessesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchSearchLinkProcessesResponse>> {
         T::batch_search_link_processes(self, req, options).await
     }
 
@@ -318,10 +314,9 @@ impl<T: super::Lineage> Lineage for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -329,8 +324,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -338,8 +333,8 @@ impl<T: super::Lineage> Lineage for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -347,22 +342,22 @@ impl<T: super::Lineage> Lineage for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/tracing.rs b/src/generated/cloud/datacatalog/lineage/v1/src/tracing.rs
index 2d399e5306..ddea512941 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/tracing.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn process_open_lineage_run_event(
         &self,
         req: crate::model::ProcessOpenLineageRunEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessOpenLineageRunEventResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessOpenLineageRunEventResponse>> {
         self.inner
             .process_open_lineage_run_event(req, options)
             .await
@@ -52,8 +52,8 @@ where
     async fn create_process(
         &self,
         req: crate::model::CreateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Process>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Process>> {
         self.inner.create_process(req, options).await
     }
 
@@ -61,8 +61,8 @@ where
     async fn update_process(
         &self,
         req: crate::model::UpdateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Process>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Process>> {
         self.inner.update_process(req, options).await
     }
 
@@ -70,8 +70,8 @@ where
     async fn get_process(
         &self,
         req: crate::model::GetProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Process>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Process>> {
         self.inner.get_process(req, options).await
     }
 
@@ -79,8 +79,8 @@ where
     async fn list_processes(
         &self,
         req: crate::model::ListProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessesResponse>> {
         self.inner.list_processes(req, options).await
     }
 
@@ -88,8 +88,8 @@ where
     async fn delete_process(
         &self,
         req: crate::model::DeleteProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_process(req, options).await
     }
 
@@ -97,8 +97,8 @@ where
     async fn create_run(
         &self,
         req: crate::model::CreateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Run>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Run>> {
         self.inner.create_run(req, options).await
     }
 
@@ -106,8 +106,8 @@ where
     async fn update_run(
         &self,
         req: crate::model::UpdateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Run>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Run>> {
         self.inner.update_run(req, options).await
     }
 
@@ -115,8 +115,8 @@ where
     async fn get_run(
         &self,
         req: crate::model::GetRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Run>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Run>> {
         self.inner.get_run(req, options).await
     }
 
@@ -124,8 +124,8 @@ where
     async fn list_runs(
         &self,
         req: crate::model::ListRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRunsResponse>> {
         self.inner.list_runs(req, options).await
     }
 
@@ -133,8 +133,8 @@ where
     async fn delete_run(
         &self,
         req: crate::model::DeleteRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_run(req, options).await
     }
 
@@ -142,8 +142,8 @@ where
     async fn create_lineage_event(
         &self,
         req: crate::model::CreateLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageEvent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageEvent>> {
         self.inner.create_lineage_event(req, options).await
     }
 
@@ -151,8 +151,8 @@ where
     async fn get_lineage_event(
         &self,
         req: crate::model::GetLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageEvent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageEvent>> {
         self.inner.get_lineage_event(req, options).await
     }
 
@@ -160,8 +160,8 @@ where
     async fn list_lineage_events(
         &self,
         req: crate::model::ListLineageEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLineageEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLineageEventsResponse>> {
         self.inner.list_lineage_events(req, options).await
     }
 
@@ -169,8 +169,8 @@ where
     async fn delete_lineage_event(
         &self,
         req: crate::model::DeleteLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_lineage_event(req, options).await
     }
 
@@ -178,8 +178,8 @@ where
     async fn search_links(
         &self,
         req: crate::model::SearchLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchLinksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchLinksResponse>> {
         self.inner.search_links(req, options).await
     }
 
@@ -187,8 +187,8 @@ where
     async fn batch_search_link_processes(
         &self,
         req: crate::model::BatchSearchLinkProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchSearchLinkProcessesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchSearchLinkProcessesResponse>> {
         self.inner.batch_search_link_processes(req, options).await
     }
 
@@ -196,9 +196,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -206,8 +205,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -215,8 +214,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -224,22 +223,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs b/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs
index 88f82182a0..aeebf6e8b5 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Lineage](super::stub::Lineage) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Lineage {
 }
 
 impl Lineage {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Lineage for Lineage {
     async fn process_open_lineage_run_event(
         &self,
         req: crate::model::ProcessOpenLineageRunEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessOpenLineageRunEventResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessOpenLineageRunEventResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::Lineage for Lineage {
     async fn create_process(
         &self,
         req: crate::model::CreateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Process>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Process>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148,9 +148,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -165,13 +165,13 @@ impl super::stub::Lineage for Lineage {
     async fn update_process(
         &self,
         req: crate::model::UpdateProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Process>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Process>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -231,9 +231,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -248,13 +248,13 @@ impl super::stub::Lineage for Lineage {
     async fn get_process(
         &self,
         req: crate::model::GetProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Process>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Process>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -295,9 +295,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312,13 +312,13 @@ impl super::stub::Lineage for Lineage {
     async fn list_processes(
         &self,
         req: crate::model::ListProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357,9 +357,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -374,13 +374,13 @@ impl super::stub::Lineage for Lineage {
     async fn delete_process(
         &self,
         req: crate::model::DeleteProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -422,9 +422,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -439,13 +439,13 @@ impl super::stub::Lineage for Lineage {
     async fn create_run(
         &self,
         req: crate::model::CreateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Run>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Run>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -487,9 +487,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -504,13 +504,13 @@ impl super::stub::Lineage for Lineage {
     async fn update_run(
         &self,
         req: crate::model::UpdateRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Run>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Run>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -574,9 +574,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -591,13 +591,13 @@ impl super::stub::Lineage for Lineage {
     async fn get_run(
         &self,
         req: crate::model::GetRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Run>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Run>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -642,9 +642,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -659,13 +659,13 @@ impl super::stub::Lineage for Lineage {
     async fn list_runs(
         &self,
         req: crate::model::ListRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -708,9 +708,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -725,13 +725,13 @@ impl super::stub::Lineage for Lineage {
     async fn delete_run(
         &self,
         req: crate::model::DeleteRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -777,9 +777,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -794,13 +794,13 @@ impl super::stub::Lineage for Lineage {
     async fn create_lineage_event(
         &self,
         req: crate::model::CreateLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageEvent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageEvent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -846,9 +846,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -863,13 +863,13 @@ impl super::stub::Lineage for Lineage {
     async fn get_lineage_event(
         &self,
         req: crate::model::GetLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LineageEvent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LineageEvent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -918,9 +918,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -935,13 +935,13 @@ impl super::stub::Lineage for Lineage {
     async fn list_lineage_events(
         &self,
         req: crate::model::ListLineageEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLineageEventsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLineageEventsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -988,9 +988,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1005,13 +1005,13 @@ impl super::stub::Lineage for Lineage {
     async fn delete_lineage_event(
         &self,
         req: crate::model::DeleteLineageEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1061,9 +1061,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1072,24 +1072,25 @@ impl super::stub::Lineage for Lineage {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn search_links(
         &self,
         req: crate::model::SearchLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchLinksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchLinksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1126,9 +1127,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1143,13 +1144,13 @@ impl super::stub::Lineage for Lineage {
     async fn batch_search_link_processes(
         &self,
         req: crate::model::BatchSearchLinkProcessesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchSearchLinkProcessesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchSearchLinkProcessesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1186,9 +1187,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1203,14 +1204,13 @@ impl super::stub::Lineage for Lineage {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1252,9 +1252,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1269,13 +1269,13 @@ impl super::stub::Lineage for Lineage {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1316,9 +1316,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1333,13 +1333,13 @@ impl super::stub::Lineage for Lineage {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1380,9 +1380,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1391,24 +1391,25 @@ impl super::stub::Lineage for Lineage {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1449,9 +1450,9 @@ impl super::stub::Lineage for Lineage {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1460,25 +1461,26 @@ impl super::stub::Lineage for Lineage {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/datacatalog/v1/Cargo.toml b/src/generated/cloud/datacatalog/v1/Cargo.toml
index e3cb0b4901..785b54087a 100644
--- a/src/generated/cloud/datacatalog/v1/Cargo.toml
+++ b/src/generated/cloud/datacatalog/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/datacatalog/v1/src/builder.rs b/src/generated/cloud/datacatalog/v1/src/builder.rs
index 1beaa2621e..aab008f195 100644
--- a/src/generated/cloud/datacatalog/v1/src/builder.rs
+++ b/src/generated/cloud/datacatalog/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_catalog {
     /// A builder for [DataCatalog][crate::client::DataCatalog].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_v1::*;
     /// # use builder::data_catalog::ClientBuilder;
     /// # use client::DataCatalog;
@@ -30,19 +30,18 @@ pub mod data_catalog {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataCatalog;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataCatalog;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_catalog {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataCatalog>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_catalog {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::SearchCatalog;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod data_catalog {
             (*self.0.stub)
                 .search_catalog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchCatalogResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchCatalogResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod data_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchCatalogResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchCatalogResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -199,8 +200,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchCatalog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchCatalog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -210,7 +211,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::CreateEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -241,7 +242,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -251,7 +252,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .create_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntryGroupRequest::parent].
@@ -290,8 +291,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -301,7 +302,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::GetEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -329,7 +330,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -339,7 +340,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .get_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntryGroupRequest::name].
@@ -370,8 +371,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -381,7 +382,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::UpdateEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -412,7 +413,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -422,7 +423,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .update_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entry_group][crate::model::UpdateEntryGroupRequest::entry_group].
@@ -467,8 +468,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -478,7 +479,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::DeleteEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -509,7 +510,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -519,7 +520,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .delete_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntryGroupRequest::name].
@@ -538,8 +539,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -549,8 +550,8 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ListEntryGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -581,7 +582,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -591,14 +592,16 @@ pub mod data_catalog {
             (*self.0.stub)
                 .list_entry_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntryGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEntryGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -606,15 +609,17 @@ pub mod data_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntryGroupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntryGroupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -640,8 +645,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntryGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntryGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -651,7 +656,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::CreateEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -679,7 +684,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -689,7 +694,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .create_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntryRequest::parent].
@@ -732,8 +737,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -743,7 +748,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::UpdateEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -771,7 +776,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -781,7 +786,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .update_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entry][crate::model::UpdateEntryRequest::entry].
@@ -826,8 +831,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -837,7 +842,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::DeleteEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -865,7 +870,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -875,7 +880,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .delete_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntryRequest::name].
@@ -888,8 +893,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -899,7 +904,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::GetEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -927,7 +932,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -937,7 +942,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .get_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntryRequest::name].
@@ -950,8 +955,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -961,7 +966,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::LookupEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -989,7 +994,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -999,7 +1004,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .lookup_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project][crate::model::LookupEntryRequest::project].
@@ -1067,8 +1072,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1078,8 +1083,8 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ListEntries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1110,7 +1115,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1120,13 +1125,13 @@ pub mod data_catalog {
             (*self.0.stub)
                 .list_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntriesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListEntriesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1135,15 +1140,17 @@ pub mod data_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntriesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntriesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1187,8 +1194,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1198,7 +1205,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ModifyEntryOverview;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1229,7 +1236,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1239,7 +1246,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .modify_entry_overview(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ModifyEntryOverviewRequest::name].
@@ -1274,8 +1281,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ModifyEntryOverview {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ModifyEntryOverview {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1285,7 +1292,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ModifyEntryContacts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1316,7 +1323,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1326,7 +1333,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .modify_entry_contacts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ModifyEntryContactsRequest::name].
@@ -1361,8 +1368,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ModifyEntryContacts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ModifyEntryContacts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1372,7 +1379,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::CreateTagTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1403,7 +1410,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1413,7 +1420,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .create_tag_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTagTemplateRequest::parent].
@@ -1456,8 +1463,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTagTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTagTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1467,7 +1474,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::GetTagTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1495,7 +1502,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1505,7 +1512,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .get_tag_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTagTemplateRequest::name].
@@ -1518,8 +1525,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTagTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTagTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1529,7 +1536,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::UpdateTagTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1560,7 +1567,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1570,7 +1577,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .update_tag_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tag_template][crate::model::UpdateTagTemplateRequest::tag_template].
@@ -1615,8 +1622,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTagTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTagTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1626,7 +1633,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::DeleteTagTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1657,7 +1664,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1667,7 +1674,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .delete_tag_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTagTemplateRequest::name].
@@ -1688,8 +1695,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTagTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTagTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1699,7 +1706,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::CreateTagTemplateField;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1730,7 +1737,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1740,7 +1747,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .create_tag_template_field(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTagTemplateFieldRequest::parent].
@@ -1783,8 +1790,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTagTemplateField {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTagTemplateField {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1794,7 +1801,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::UpdateTagTemplateField;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1825,7 +1832,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1835,7 +1842,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .update_tag_template_field(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateTagTemplateFieldRequest::name].
@@ -1888,8 +1895,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTagTemplateField {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTagTemplateField {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1899,7 +1906,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::RenameTagTemplateField;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1930,7 +1937,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1940,7 +1947,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .rename_tag_template_field(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameTagTemplateFieldRequest::name].
@@ -1961,8 +1968,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameTagTemplateField {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameTagTemplateField {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1972,7 +1979,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::RenameTagTemplateFieldEnumValue;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2005,7 +2012,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2015,7 +2022,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .rename_tag_template_field_enum_value(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RenameTagTemplateFieldEnumValueRequest::name].
@@ -2039,8 +2046,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RenameTagTemplateFieldEnumValue {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RenameTagTemplateFieldEnumValue {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2050,7 +2057,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::DeleteTagTemplateField;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2081,7 +2088,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2091,7 +2098,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .delete_tag_template_field(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTagTemplateFieldRequest::name].
@@ -2112,8 +2119,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTagTemplateField {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTagTemplateField {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2123,7 +2130,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::CreateTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2151,7 +2158,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2161,7 +2168,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .create_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTagRequest::parent].
@@ -2196,8 +2203,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2207,7 +2214,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::UpdateTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2235,7 +2242,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2245,7 +2252,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .update_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tag][crate::model::UpdateTagRequest::tag].
@@ -2290,8 +2297,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2301,7 +2308,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::DeleteTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2329,7 +2336,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2339,7 +2346,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .delete_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTagRequest::name].
@@ -2352,8 +2359,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2363,8 +2370,8 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ListTags;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2395,7 +2402,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2405,13 +2412,13 @@ pub mod data_catalog {
             (*self.0.stub)
                 .list_tags(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTagsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTagsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2420,15 +2427,15 @@ pub mod data_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTagsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListTagsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2454,8 +2461,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTags {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTags {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2465,7 +2472,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ReconcileTags;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2494,7 +2501,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2509,7 +2516,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .reconcile_tags(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reconcile_tags`.
@@ -2528,7 +2535,7 @@ pub mod data_catalog {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2590,8 +2597,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReconcileTags {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReconcileTags {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2601,7 +2608,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::StarEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2629,7 +2636,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2639,7 +2646,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .star_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::StarEntryRequest::name].
@@ -2652,8 +2659,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StarEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StarEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2663,7 +2670,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::UnstarEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2691,7 +2698,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2701,7 +2708,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .unstar_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UnstarEntryRequest::name].
@@ -2714,8 +2721,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UnstarEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UnstarEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2725,7 +2732,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2756,7 +2763,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2766,7 +2773,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2819,8 +2826,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2830,7 +2837,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2861,7 +2868,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2871,7 +2878,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -2902,8 +2909,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2913,7 +2920,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2946,7 +2953,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2956,7 +2963,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2982,8 +2989,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2993,7 +3000,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ImportEntries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3022,7 +3029,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3037,7 +3044,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .import_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_entries`.
@@ -3056,7 +3063,7 @@ pub mod data_catalog {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3124,8 +3131,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3135,7 +3142,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::SetConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3163,7 +3170,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3173,7 +3180,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .set_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::SetConfigRequest::name].
@@ -3230,8 +3237,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3241,7 +3248,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::RetrieveConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3269,7 +3276,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3279,7 +3286,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .retrieve_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RetrieveConfigRequest::name].
@@ -3292,8 +3299,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetrieveConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetrieveConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3303,7 +3310,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::RetrieveEffectiveConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3336,7 +3343,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3346,7 +3353,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .retrieve_effective_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RetrieveEffectiveConfigRequest::name].
@@ -3359,8 +3366,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetrieveEffectiveConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetrieveEffectiveConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3370,8 +3377,8 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3407,7 +3414,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3417,15 +3424,15 @@ pub mod data_catalog {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3434,17 +3441,17 @@ pub mod data_catalog {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3480,8 +3487,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3491,7 +3498,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3522,7 +3529,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3532,7 +3539,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3543,8 +3550,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3554,7 +3561,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3587,7 +3594,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3597,7 +3604,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3608,8 +3615,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3619,7 +3626,7 @@ pub mod data_catalog {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::data_catalog::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3652,7 +3659,7 @@ pub mod data_catalog {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3662,7 +3669,7 @@ pub mod data_catalog {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3673,8 +3680,8 @@ pub mod data_catalog {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3686,7 +3693,7 @@ pub mod policy_tag_manager {
     /// A builder for [PolicyTagManager][crate::client::PolicyTagManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_v1::*;
     /// # use builder::policy_tag_manager::ClientBuilder;
     /// # use client::PolicyTagManager;
@@ -3696,19 +3703,18 @@ pub mod policy_tag_manager {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PolicyTagManager;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PolicyTagManager;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3719,7 +3725,7 @@ pub mod policy_tag_manager {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PolicyTagManager>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3732,7 +3738,7 @@ pub mod policy_tag_manager {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3742,7 +3748,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::CreateTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3770,7 +3776,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3780,7 +3786,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .create_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTaxonomyRequest::parent].
@@ -3811,8 +3817,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3822,7 +3828,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::DeleteTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3850,7 +3856,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3860,7 +3866,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .delete_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTaxonomyRequest::name].
@@ -3873,8 +3879,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3884,7 +3890,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::UpdateTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3912,7 +3918,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3922,7 +3928,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .update_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [taxonomy][crate::model::UpdateTaxonomyRequest::taxonomy].
@@ -3963,8 +3969,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3974,8 +3980,8 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::ListTaxonomies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4006,7 +4012,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4016,14 +4022,16 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .list_taxonomies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTaxonomiesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTaxonomiesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4031,15 +4039,17 @@ pub mod policy_tag_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTaxonomiesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTaxonomiesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4071,8 +4081,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTaxonomies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTaxonomies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4082,7 +4092,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::GetTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4110,7 +4120,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4120,7 +4130,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .get_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTaxonomyRequest::name].
@@ -4133,8 +4143,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4144,7 +4154,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::CreatePolicyTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4172,7 +4182,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4182,7 +4192,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .create_policy_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePolicyTagRequest::parent].
@@ -4213,8 +4223,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePolicyTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePolicyTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4224,7 +4234,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::DeletePolicyTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4252,7 +4262,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4262,7 +4272,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .delete_policy_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeletePolicyTagRequest::name].
@@ -4275,8 +4285,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePolicyTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePolicyTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4286,7 +4296,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::UpdatePolicyTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4314,7 +4324,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4324,7 +4334,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .update_policy_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [policy_tag][crate::model::UpdatePolicyTagRequest::policy_tag].
@@ -4365,8 +4375,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePolicyTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePolicyTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4376,8 +4386,8 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::ListPolicyTags;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4408,7 +4418,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4418,14 +4428,16 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .list_policy_tags(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPolicyTagsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPolicyTagsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4433,15 +4445,17 @@ pub mod policy_tag_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPolicyTagsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPolicyTagsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4467,8 +4481,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPolicyTags {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPolicyTags {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4478,7 +4492,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::GetPolicyTag;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4506,7 +4520,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4516,7 +4530,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .get_policy_tag(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPolicyTagRequest::name].
@@ -4529,8 +4543,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPolicyTag {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPolicyTag {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4540,7 +4554,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4571,7 +4585,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4581,7 +4595,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4612,8 +4626,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4623,7 +4637,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4654,7 +4668,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4664,7 +4678,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4717,8 +4731,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4728,7 +4742,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4761,7 +4775,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4771,7 +4785,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4797,8 +4811,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4808,8 +4822,8 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4845,7 +4859,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4855,15 +4869,15 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4872,17 +4886,17 @@ pub mod policy_tag_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4918,8 +4932,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4929,7 +4943,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4960,7 +4974,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4970,7 +4984,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4981,8 +4995,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4992,7 +5006,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5025,7 +5039,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5035,7 +5049,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5046,8 +5060,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5057,7 +5071,7 @@ pub mod policy_tag_manager {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5090,7 +5104,7 @@ pub mod policy_tag_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5100,7 +5114,7 @@ pub mod policy_tag_manager {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5111,8 +5125,8 @@ pub mod policy_tag_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5124,7 +5138,7 @@ pub mod policy_tag_manager_serialization {
     /// A builder for [PolicyTagManagerSerialization][crate::client::PolicyTagManagerSerialization].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_v1::*;
     /// # use builder::policy_tag_manager_serialization::ClientBuilder;
     /// # use client::PolicyTagManagerSerialization;
@@ -5134,19 +5148,18 @@ pub mod policy_tag_manager_serialization {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PolicyTagManagerSerialization;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PolicyTagManagerSerialization;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5157,7 +5170,7 @@ pub mod policy_tag_manager_serialization {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PolicyTagManagerSerialization>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5170,7 +5183,7 @@ pub mod policy_tag_manager_serialization {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5180,7 +5193,7 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::ReplaceTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5208,7 +5221,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5218,7 +5231,7 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .replace_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ReplaceTaxonomyRequest::name].
@@ -5253,8 +5266,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReplaceTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReplaceTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5264,7 +5277,7 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::ImportTaxonomies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5295,7 +5308,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5305,7 +5318,7 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .import_taxonomies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ImportTaxonomiesRequest::parent].
@@ -5360,8 +5373,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportTaxonomies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportTaxonomies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5371,7 +5384,7 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::ExportTaxonomies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5402,7 +5415,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5412,7 +5425,7 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .export_taxonomies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ExportTaxonomiesRequest::parent].
@@ -5462,8 +5475,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportTaxonomies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportTaxonomies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5473,8 +5486,8 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5510,7 +5523,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5520,15 +5533,15 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5537,17 +5550,17 @@ pub mod policy_tag_manager_serialization {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5583,8 +5596,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5594,7 +5607,7 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5625,7 +5638,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5635,7 +5648,7 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5646,8 +5659,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5657,7 +5670,7 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5690,7 +5703,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5700,7 +5713,7 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5711,8 +5724,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5722,7 +5735,7 @@ pub mod policy_tag_manager_serialization {
     /// # Example
     /// ```
     /// # use google_cloud_datacatalog_v1::builder::policy_tag_manager_serialization::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datacatalog_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5755,7 +5768,7 @@ pub mod policy_tag_manager_serialization {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5765,7 +5778,7 @@ pub mod policy_tag_manager_serialization {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5776,8 +5789,8 @@ pub mod policy_tag_manager_serialization {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/datacatalog/v1/src/client.rs b/src/generated/cloud/datacatalog/v1/src/client.rs
index 9ec244719a..0bbf8fd2f5 100644
--- a/src/generated/cloud/datacatalog/v1/src/client.rs
+++ b/src/generated/cloud/datacatalog/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_datacatalog_v1::client::DataCatalog;
 /// let client = DataCatalog::builder().build().await?;
 /// // use `client` to make requests to the Google Cloud Data Catalog API.
@@ -70,13 +70,13 @@ impl DataCatalog {
     /// Returns a builder for [DataCatalog].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_v1::client::DataCatalog;
     /// let client = DataCatalog::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_catalog::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::data_catalog::client::Factory)
+        crate::new_client_builder(super::builder::data_catalog::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -94,14 +94,14 @@ impl DataCatalog {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataCatalog>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataCatalog>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -110,13 +110,13 @@ impl DataCatalog {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataCatalog> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataCatalog> {
         super::transport::DataCatalog::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataCatalog> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataCatalog> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataCatalog::new)
@@ -660,7 +660,7 @@ impl DataCatalog {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_datacatalog_v1::client::PolicyTagManager;
 /// let client = PolicyTagManager::builder().build().await?;
 /// // use `client` to make requests to the Google Cloud Data Catalog API.
@@ -711,15 +711,13 @@ impl PolicyTagManager {
     /// Returns a builder for [PolicyTagManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_v1::client::PolicyTagManager;
     /// let client = PolicyTagManager::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::policy_tag_manager::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::policy_tag_manager::client::Factory,
-        )
+        crate::new_client_builder(super::builder::policy_tag_manager::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -737,14 +735,14 @@ impl PolicyTagManager {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::PolicyTagManager>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::PolicyTagManager>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -754,13 +752,13 @@ impl PolicyTagManager {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PolicyTagManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PolicyTagManager> {
         super::transport::PolicyTagManager::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PolicyTagManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PolicyTagManager> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PolicyTagManager::new)
@@ -877,7 +875,7 @@ impl PolicyTagManager {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_datacatalog_v1::client::PolicyTagManagerSerialization;
 /// let client = PolicyTagManagerSerialization::builder().build().await?;
 /// // use `client` to make requests to the Google Cloud Data Catalog API.
@@ -926,15 +924,13 @@ impl PolicyTagManagerSerialization {
     /// Returns a builder for [PolicyTagManagerSerialization].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datacatalog_v1::client::PolicyTagManagerSerialization;
     /// let client = PolicyTagManagerSerialization::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::policy_tag_manager_serialization::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::policy_tag_manager_serialization::client::Factory,
-        )
+        crate::new_client_builder(super::builder::policy_tag_manager_serialization::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -952,14 +948,14 @@ impl PolicyTagManagerSerialization {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::PolicyTagManagerSerialization>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -970,13 +966,13 @@ impl PolicyTagManagerSerialization {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PolicyTagManagerSerialization> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PolicyTagManagerSerialization> {
         super::transport::PolicyTagManagerSerialization::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PolicyTagManagerSerialization> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PolicyTagManagerSerialization> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PolicyTagManagerSerialization::new)
diff --git a/src/generated/cloud/datacatalog/v1/src/lib.rs b/src/generated/cloud/datacatalog/v1/src/lib.rs
index 8d245713d8..6407d82abc 100644
--- a/src/generated/cloud/datacatalog/v1/src/lib.rs
+++ b/src/generated/cloud/datacatalog/v1/src/lib.rs
@@ -48,8 +48,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -84,3 +84,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/datacatalog/v1/src/model.rs b/src/generated/cloud/datacatalog/v1/src/model.rs
index 3efe6e0d4d..f4e5484ff4 100644
--- a/src/generated/cloud/datacatalog/v1/src/model.rs
+++ b/src/generated/cloud/datacatalog/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1415,7 +1415,7 @@ impl wkt::message::Message for SearchCatalogResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchCatalogResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchCatalogResponse {
     type PageItem = crate::model::SearchCatalogResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1884,7 +1884,7 @@ impl wkt::message::Message for ListEntryGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntryGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntryGroupsResponse {
     type PageItem = crate::model::EntryGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7875,7 +7875,7 @@ impl wkt::message::Message for ListTagsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTagsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTagsResponse {
     type PageItem = crate::model::Tag;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8453,7 +8453,7 @@ impl wkt::message::Message for ListEntriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntriesResponse {
     type PageItem = crate::model::Entry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11704,7 +11704,7 @@ impl wkt::message::Message for ListTaxonomiesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTaxonomiesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTaxonomiesResponse {
     type PageItem = crate::model::Taxonomy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12102,7 +12102,7 @@ impl wkt::message::Message for ListPolicyTagsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPolicyTagsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPolicyTagsResponse {
     type PageItem = crate::model::PolicyTag;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/datacatalog/v1/src/stub.rs b/src/generated/cloud/datacatalog/v1/src/stub.rs
index d5f6e870fa..5e8e5552fb 100644
--- a/src/generated/cloud/datacatalog/v1/src/stub.rs
+++ b/src/generated/cloud/datacatalog/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn search_catalog(
         &self,
         _req: crate::model::SearchCatalogRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchCatalogResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchCatalogResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn create_entry_group(
         &self,
         _req: crate::model::CreateEntryGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +63,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn get_entry_group(
         &self,
         _req: crate::model::GetEntryGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +73,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn update_entry_group(
         &self,
         _req: crate::model::UpdateEntryGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +83,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn delete_entry_group(
         &self,
         _req: crate::model::DeleteEntryGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +92,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn list_entry_groups(
         &self,
         _req: crate::model::ListEntryGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntryGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntryGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,10 +103,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn create_entry(
         &self,
         _req: crate::model::CreateEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -117,10 +113,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn update_entry(
         &self,
         _req: crate::model::UpdateEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -128,8 +123,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn delete_entry(
         &self,
         _req: crate::model::DeleteEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -137,10 +132,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn get_entry(
         &self,
         _req: crate::model::GetEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -148,10 +142,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn lookup_entry(
         &self,
         _req: crate::model::LookupEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -159,9 +152,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn list_entries(
         &self,
         _req: crate::model::ListEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -170,9 +163,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn modify_entry_overview(
         &self,
         _req: crate::model::ModifyEntryOverviewRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryOverview>>,
+        Output = crate::Result<crate::Response<crate::model::EntryOverview>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -181,10 +174,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn modify_entry_contacts(
         &self,
         _req: crate::model::ModifyEntryContactsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Contacts>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Contacts>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -192,10 +184,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn create_tag_template(
         &self,
         _req: crate::model::CreateTagTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplate>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TagTemplate>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -203,10 +194,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn get_tag_template(
         &self,
         _req: crate::model::GetTagTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplate>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TagTemplate>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -214,10 +204,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn update_tag_template(
         &self,
         _req: crate::model::UpdateTagTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplate>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TagTemplate>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -225,8 +214,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn delete_tag_template(
         &self,
         _req: crate::model::DeleteTagTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -234,9 +223,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn create_tag_template_field(
         &self,
         _req: crate::model::CreateTagTemplateFieldRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplateField>>,
+        Output = crate::Result<crate::Response<crate::model::TagTemplateField>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -245,9 +234,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn update_tag_template_field(
         &self,
         _req: crate::model::UpdateTagTemplateFieldRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplateField>>,
+        Output = crate::Result<crate::Response<crate::model::TagTemplateField>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -256,9 +245,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn rename_tag_template_field(
         &self,
         _req: crate::model::RenameTagTemplateFieldRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplateField>>,
+        Output = crate::Result<crate::Response<crate::model::TagTemplateField>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -267,9 +256,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn rename_tag_template_field_enum_value(
         &self,
         _req: crate::model::RenameTagTemplateFieldEnumValueRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TagTemplateField>>,
+        Output = crate::Result<crate::Response<crate::model::TagTemplateField>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -278,8 +267,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn delete_tag_template_field(
         &self,
         _req: crate::model::DeleteTagTemplateFieldRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -287,9 +276,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn create_tag(
         &self,
         _req: crate::model::CreateTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Tag>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tag>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -297,9 +286,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn update_tag(
         &self,
         _req: crate::model::UpdateTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Tag>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tag>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -307,8 +296,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn delete_tag(
         &self,
         _req: crate::model::DeleteTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -316,9 +305,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn list_tags(
         &self,
         _req: crate::model::ListTagsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTagsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTagsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -327,9 +316,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn reconcile_tags(
         &self,
         _req: crate::model::ReconcileTagsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -338,9 +327,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn star_entry(
         &self,
         _req: crate::model::StarEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StarEntryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::StarEntryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -349,9 +338,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn unstar_entry(
         &self,
         _req: crate::model::UnstarEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UnstarEntryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::UnstarEntryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -360,9 +349,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -371,9 +360,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -382,10 +371,10 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -395,9 +384,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn import_entries(
         &self,
         _req: crate::model::ImportEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -406,9 +395,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn set_config(
         &self,
         _req: crate::model::SetConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MigrationConfig>>,
+        Output = crate::Result<crate::Response<crate::model::MigrationConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -417,9 +406,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn retrieve_config(
         &self,
         _req: crate::model::RetrieveConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::OrganizationConfig>>,
+        Output = crate::Result<crate::Response<crate::model::OrganizationConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -428,9 +417,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn retrieve_effective_config(
         &self,
         _req: crate::model::RetrieveEffectiveConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MigrationConfig>>,
+        Output = crate::Result<crate::Response<crate::model::MigrationConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -439,10 +428,10 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -452,9 +441,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -463,8 +452,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -472,8 +461,8 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -483,9 +472,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -494,9 +483,9 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -516,10 +505,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn create_taxonomy(
         &self,
         _req: crate::model::CreateTaxonomyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Taxonomy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Taxonomy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -527,8 +515,8 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn delete_taxonomy(
         &self,
         _req: crate::model::DeleteTaxonomyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -536,10 +524,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn update_taxonomy(
         &self,
         _req: crate::model::UpdateTaxonomyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Taxonomy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Taxonomy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -547,9 +534,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn list_taxonomies(
         &self,
         _req: crate::model::ListTaxonomiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTaxonomiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTaxonomiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -558,10 +545,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn get_taxonomy(
         &self,
         _req: crate::model::GetTaxonomyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Taxonomy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Taxonomy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -569,10 +555,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn create_policy_tag(
         &self,
         _req: crate::model::CreatePolicyTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PolicyTag>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::PolicyTag>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -580,8 +565,8 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn delete_policy_tag(
         &self,
         _req: crate::model::DeletePolicyTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -589,10 +574,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn update_policy_tag(
         &self,
         _req: crate::model::UpdatePolicyTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PolicyTag>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::PolicyTag>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -600,9 +584,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn list_policy_tags(
         &self,
         _req: crate::model::ListPolicyTagsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPolicyTagsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPolicyTagsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -611,10 +595,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn get_policy_tag(
         &self,
         _req: crate::model::GetPolicyTagRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PolicyTag>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::PolicyTag>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -622,9 +605,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -633,9 +616,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -644,10 +627,10 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -657,10 +640,10 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -670,9 +653,9 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -681,8 +664,8 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -690,8 +673,8 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -712,10 +695,9 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn replace_taxonomy(
         &self,
         _req: crate::model::ReplaceTaxonomyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Taxonomy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Taxonomy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -723,9 +705,9 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn import_taxonomies(
         &self,
         _req: crate::model::ImportTaxonomiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImportTaxonomiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ImportTaxonomiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -734,9 +716,9 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn export_taxonomies(
         &self,
         _req: crate::model::ExportTaxonomiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ExportTaxonomiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ExportTaxonomiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -745,10 +727,10 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -758,9 +740,9 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -769,8 +751,8 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -778,8 +760,8 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/datacatalog/v1/src/stub/dynamic.rs b/src/generated/cloud/datacatalog/v1/src/stub/dynamic.rs
index f82aaa0a58..410c29cf12 100644
--- a/src/generated/cloud/datacatalog/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/datacatalog/v1/src/stub/dynamic.rs
@@ -20,262 +20,258 @@ pub trait DataCatalog: std::fmt::Debug + Send + Sync {
     async fn search_catalog(
         &self,
         req: crate::model::SearchCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchCatalogResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchCatalogResponse>>;
 
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>>;
 
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>>;
 
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>>;
 
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntryGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntryGroupsResponse>>;
 
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntriesResponse>>;
 
     async fn modify_entry_overview(
         &self,
         req: crate::model::ModifyEntryOverviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryOverview>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryOverview>>;
 
     async fn modify_entry_contacts(
         &self,
         req: crate::model::ModifyEntryContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contacts>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contacts>>;
 
     async fn create_tag_template(
         &self,
         req: crate::model::CreateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplate>>;
 
     async fn get_tag_template(
         &self,
         req: crate::model::GetTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplate>>;
 
     async fn update_tag_template(
         &self,
         req: crate::model::UpdateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplate>>;
 
     async fn delete_tag_template(
         &self,
         req: crate::model::DeleteTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_tag_template_field(
         &self,
         req: crate::model::CreateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>>;
 
     async fn update_tag_template_field(
         &self,
         req: crate::model::UpdateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>>;
 
     async fn rename_tag_template_field(
         &self,
         req: crate::model::RenameTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>>;
 
     async fn rename_tag_template_field_enum_value(
         &self,
         req: crate::model::RenameTagTemplateFieldEnumValueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>>;
 
     async fn delete_tag_template_field(
         &self,
         req: crate::model::DeleteTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_tag(
         &self,
         req: crate::model::CreateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tag>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tag>>;
 
     async fn update_tag(
         &self,
         req: crate::model::UpdateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tag>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tag>>;
 
     async fn delete_tag(
         &self,
         req: crate::model::DeleteTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_tags(
         &self,
         req: crate::model::ListTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTagsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTagsResponse>>;
 
     async fn reconcile_tags(
         &self,
         req: crate::model::ReconcileTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn star_entry(
         &self,
         req: crate::model::StarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StarEntryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StarEntryResponse>>;
 
     async fn unstar_entry(
         &self,
         req: crate::model::UnstarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UnstarEntryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UnstarEntryResponse>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn import_entries(
         &self,
         req: crate::model::ImportEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn set_config(
         &self,
         req: crate::model::SetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationConfig>>;
 
     async fn retrieve_config(
         &self,
         req: crate::model::RetrieveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OrganizationConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OrganizationConfig>>;
 
     async fn retrieve_effective_config(
         &self,
         req: crate::model::RetrieveEffectiveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationConfig>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataCatalog] also implement [DataCatalog].
@@ -285,8 +281,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn search_catalog(
         &self,
         req: crate::model::SearchCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchCatalogResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchCatalogResponse>> {
         T::search_catalog(self, req, options).await
     }
 
@@ -294,8 +290,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>> {
         T::create_entry_group(self, req, options).await
     }
 
@@ -303,8 +299,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>> {
         T::get_entry_group(self, req, options).await
     }
 
@@ -312,8 +308,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>> {
         T::update_entry_group(self, req, options).await
     }
 
@@ -321,8 +317,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_entry_group(self, req, options).await
     }
 
@@ -330,8 +326,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntryGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntryGroupsResponse>> {
         T::list_entry_groups(self, req, options).await
     }
 
@@ -339,8 +335,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::create_entry(self, req, options).await
     }
 
@@ -348,8 +344,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::update_entry(self, req, options).await
     }
 
@@ -357,8 +353,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_entry(self, req, options).await
     }
 
@@ -366,8 +362,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::get_entry(self, req, options).await
     }
 
@@ -375,8 +371,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::lookup_entry(self, req, options).await
     }
 
@@ -384,8 +380,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntriesResponse>> {
         T::list_entries(self, req, options).await
     }
 
@@ -393,8 +389,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn modify_entry_overview(
         &self,
         req: crate::model::ModifyEntryOverviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryOverview>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryOverview>> {
         T::modify_entry_overview(self, req, options).await
     }
 
@@ -402,8 +398,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn modify_entry_contacts(
         &self,
         req: crate::model::ModifyEntryContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contacts>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contacts>> {
         T::modify_entry_contacts(self, req, options).await
     }
 
@@ -411,8 +407,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn create_tag_template(
         &self,
         req: crate::model::CreateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplate>> {
         T::create_tag_template(self, req, options).await
     }
 
@@ -420,8 +416,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn get_tag_template(
         &self,
         req: crate::model::GetTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplate>> {
         T::get_tag_template(self, req, options).await
     }
 
@@ -429,8 +425,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn update_tag_template(
         &self,
         req: crate::model::UpdateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplate>> {
         T::update_tag_template(self, req, options).await
     }
 
@@ -438,8 +434,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn delete_tag_template(
         &self,
         req: crate::model::DeleteTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tag_template(self, req, options).await
     }
 
@@ -447,8 +443,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn create_tag_template_field(
         &self,
         req: crate::model::CreateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>> {
         T::create_tag_template_field(self, req, options).await
     }
 
@@ -456,8 +452,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn update_tag_template_field(
         &self,
         req: crate::model::UpdateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>> {
         T::update_tag_template_field(self, req, options).await
     }
 
@@ -465,8 +461,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn rename_tag_template_field(
         &self,
         req: crate::model::RenameTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>> {
         T::rename_tag_template_field(self, req, options).await
     }
 
@@ -474,8 +470,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn rename_tag_template_field_enum_value(
         &self,
         req: crate::model::RenameTagTemplateFieldEnumValueRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TagTemplateField>> {
         T::rename_tag_template_field_enum_value(self, req, options).await
     }
 
@@ -483,8 +479,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn delete_tag_template_field(
         &self,
         req: crate::model::DeleteTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tag_template_field(self, req, options).await
     }
 
@@ -492,8 +488,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn create_tag(
         &self,
         req: crate::model::CreateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tag>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tag>> {
         T::create_tag(self, req, options).await
     }
 
@@ -501,8 +497,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn update_tag(
         &self,
         req: crate::model::UpdateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tag>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tag>> {
         T::update_tag(self, req, options).await
     }
 
@@ -510,8 +506,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn delete_tag(
         &self,
         req: crate::model::DeleteTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tag(self, req, options).await
     }
 
@@ -519,8 +515,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn list_tags(
         &self,
         req: crate::model::ListTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTagsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTagsResponse>> {
         T::list_tags(self, req, options).await
     }
 
@@ -528,8 +524,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn reconcile_tags(
         &self,
         req: crate::model::ReconcileTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reconcile_tags(self, req, options).await
     }
 
@@ -537,8 +533,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn star_entry(
         &self,
         req: crate::model::StarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StarEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StarEntryResponse>> {
         T::star_entry(self, req, options).await
     }
 
@@ -546,8 +542,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn unstar_entry(
         &self,
         req: crate::model::UnstarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UnstarEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UnstarEntryResponse>> {
         T::unstar_entry(self, req, options).await
     }
 
@@ -555,8 +551,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -564,8 +560,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -573,10 +569,9 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -584,8 +579,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn import_entries(
         &self,
         req: crate::model::ImportEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_entries(self, req, options).await
     }
 
@@ -593,8 +588,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn set_config(
         &self,
         req: crate::model::SetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationConfig>> {
         T::set_config(self, req, options).await
     }
 
@@ -602,8 +597,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn retrieve_config(
         &self,
         req: crate::model::RetrieveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::OrganizationConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::OrganizationConfig>> {
         T::retrieve_config(self, req, options).await
     }
 
@@ -611,8 +606,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn retrieve_effective_config(
         &self,
         req: crate::model::RetrieveEffectiveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MigrationConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MigrationConfig>> {
         T::retrieve_effective_config(self, req, options).await
     }
 
@@ -620,10 +615,9 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -631,8 +625,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -640,8 +634,8 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -649,22 +643,22 @@ impl<T: super::DataCatalog> DataCatalog for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -675,108 +669,104 @@ pub trait PolicyTagManager: std::fmt::Debug + Send + Sync {
     async fn create_taxonomy(
         &self,
         req: crate::model::CreateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>>;
 
     async fn delete_taxonomy(
         &self,
         req: crate::model::DeleteTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_taxonomy(
         &self,
         req: crate::model::UpdateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>>;
 
     async fn list_taxonomies(
         &self,
         req: crate::model::ListTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTaxonomiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTaxonomiesResponse>>;
 
     async fn get_taxonomy(
         &self,
         req: crate::model::GetTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>>;
 
     async fn create_policy_tag(
         &self,
         req: crate::model::CreatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyTag>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyTag>>;
 
     async fn delete_policy_tag(
         &self,
         req: crate::model::DeletePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_policy_tag(
         &self,
         req: crate::model::UpdatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyTag>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyTag>>;
 
     async fn list_policy_tags(
         &self,
         req: crate::model::ListPolicyTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPolicyTagsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPolicyTagsResponse>>;
 
     async fn get_policy_tag(
         &self,
         req: crate::model::GetPolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyTag>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyTag>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::PolicyTagManager] also implement [PolicyTagManager].
@@ -786,8 +776,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn create_taxonomy(
         &self,
         req: crate::model::CreateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>> {
         T::create_taxonomy(self, req, options).await
     }
 
@@ -795,8 +785,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn delete_taxonomy(
         &self,
         req: crate::model::DeleteTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_taxonomy(self, req, options).await
     }
 
@@ -804,8 +794,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn update_taxonomy(
         &self,
         req: crate::model::UpdateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>> {
         T::update_taxonomy(self, req, options).await
     }
 
@@ -813,8 +803,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn list_taxonomies(
         &self,
         req: crate::model::ListTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTaxonomiesResponse>> {
         T::list_taxonomies(self, req, options).await
     }
 
@@ -822,8 +812,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn get_taxonomy(
         &self,
         req: crate::model::GetTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>> {
         T::get_taxonomy(self, req, options).await
     }
 
@@ -831,8 +821,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn create_policy_tag(
         &self,
         req: crate::model::CreatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyTag>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyTag>> {
         T::create_policy_tag(self, req, options).await
     }
 
@@ -840,8 +830,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn delete_policy_tag(
         &self,
         req: crate::model::DeletePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_policy_tag(self, req, options).await
     }
 
@@ -849,8 +839,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn update_policy_tag(
         &self,
         req: crate::model::UpdatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyTag>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyTag>> {
         T::update_policy_tag(self, req, options).await
     }
 
@@ -858,8 +848,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn list_policy_tags(
         &self,
         req: crate::model::ListPolicyTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPolicyTagsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPolicyTagsResponse>> {
         T::list_policy_tags(self, req, options).await
     }
 
@@ -867,8 +857,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn get_policy_tag(
         &self,
         req: crate::model::GetPolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyTag>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyTag>> {
         T::get_policy_tag(self, req, options).await
     }
 
@@ -876,8 +866,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -885,8 +875,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -894,10 +884,9 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -905,10 +894,9 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -916,8 +904,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -925,8 +913,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -934,8 +922,8 @@ impl<T: super::PolicyTagManager> PolicyTagManager for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -946,46 +934,44 @@ pub trait PolicyTagManagerSerialization: std::fmt::Debug + Send + Sync {
     async fn replace_taxonomy(
         &self,
         req: crate::model::ReplaceTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>>;
 
     async fn import_taxonomies(
         &self,
         req: crate::model::ImportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportTaxonomiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportTaxonomiesResponse>>;
 
     async fn export_taxonomies(
         &self,
         req: crate::model::ExportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExportTaxonomiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExportTaxonomiesResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::PolicyTagManagerSerialization] also implement [PolicyTagManagerSerialization].
@@ -995,8 +981,8 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn replace_taxonomy(
         &self,
         req: crate::model::ReplaceTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Taxonomy>> {
         T::replace_taxonomy(self, req, options).await
     }
 
@@ -1004,8 +990,8 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn import_taxonomies(
         &self,
         req: crate::model::ImportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportTaxonomiesResponse>> {
         T::import_taxonomies(self, req, options).await
     }
 
@@ -1013,8 +999,8 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn export_taxonomies(
         &self,
         req: crate::model::ExportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ExportTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ExportTaxonomiesResponse>> {
         T::export_taxonomies(self, req, options).await
     }
 
@@ -1022,10 +1008,9 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1033,8 +1018,8 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1042,8 +1027,8 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1051,8 +1036,8 @@ impl<T: super::PolicyTagManagerSerialization> PolicyTagManagerSerialization for
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/datacatalog/v1/src/tracing.rs b/src/generated/cloud/datacatalog/v1/src/tracing.rs
index 6886adecc8..47da6bd794 100644
--- a/src/generated/cloud/datacatalog/v1/src/tracing.rs
+++ b/src/generated/cloud/datacatalog/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn search_catalog(
         &self,
         req: crate::model::SearchCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchCatalogResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchCatalogResponse>> {
         self.inner.search_catalog(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         self.inner.create_entry_group(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         self.inner.get_entry_group(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         self.inner.update_entry_group(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_entry_group(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntryGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntryGroupsResponse>> {
         self.inner.list_entry_groups(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.create_entry(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.update_entry(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_entry(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.get_entry(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.lookup_entry(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntriesResponse>> {
         self.inner.list_entries(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn modify_entry_overview(
         &self,
         req: crate::model::ModifyEntryOverviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryOverview>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryOverview>> {
         self.inner.modify_entry_overview(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn modify_entry_contacts(
         &self,
         req: crate::model::ModifyEntryContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contacts>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contacts>> {
         self.inner.modify_entry_contacts(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn create_tag_template(
         &self,
         req: crate::model::CreateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplate>> {
         self.inner.create_tag_template(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn get_tag_template(
         &self,
         req: crate::model::GetTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplate>> {
         self.inner.get_tag_template(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn update_tag_template(
         &self,
         req: crate::model::UpdateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplate>> {
         self.inner.update_tag_template(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn delete_tag_template(
         &self,
         req: crate::model::DeleteTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tag_template(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn create_tag_template_field(
         &self,
         req: crate::model::CreateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         self.inner.create_tag_template_field(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn update_tag_template_field(
         &self,
         req: crate::model::UpdateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         self.inner.update_tag_template_field(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn rename_tag_template_field(
         &self,
         req: crate::model::RenameTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         self.inner.rename_tag_template_field(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn rename_tag_template_field_enum_value(
         &self,
         req: crate::model::RenameTagTemplateFieldEnumValueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         self.inner
             .rename_tag_template_field_enum_value(req, options)
             .await
@@ -241,8 +241,8 @@ where
     async fn delete_tag_template_field(
         &self,
         req: crate::model::DeleteTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tag_template_field(req, options).await
     }
 
@@ -250,8 +250,8 @@ where
     async fn create_tag(
         &self,
         req: crate::model::CreateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tag>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tag>> {
         self.inner.create_tag(req, options).await
     }
 
@@ -259,8 +259,8 @@ where
     async fn update_tag(
         &self,
         req: crate::model::UpdateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tag>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tag>> {
         self.inner.update_tag(req, options).await
     }
 
@@ -268,8 +268,8 @@ where
     async fn delete_tag(
         &self,
         req: crate::model::DeleteTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tag(req, options).await
     }
 
@@ -277,8 +277,8 @@ where
     async fn list_tags(
         &self,
         req: crate::model::ListTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTagsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTagsResponse>> {
         self.inner.list_tags(req, options).await
     }
 
@@ -286,8 +286,8 @@ where
     async fn reconcile_tags(
         &self,
         req: crate::model::ReconcileTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reconcile_tags(req, options).await
     }
 
@@ -295,8 +295,8 @@ where
     async fn star_entry(
         &self,
         req: crate::model::StarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StarEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StarEntryResponse>> {
         self.inner.star_entry(req, options).await
     }
 
@@ -304,8 +304,8 @@ where
     async fn unstar_entry(
         &self,
         req: crate::model::UnstarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UnstarEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UnstarEntryResponse>> {
         self.inner.unstar_entry(req, options).await
     }
 
@@ -313,8 +313,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -322,8 +322,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -331,9 +331,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -341,8 +340,8 @@ where
     async fn import_entries(
         &self,
         req: crate::model::ImportEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_entries(req, options).await
     }
 
@@ -350,8 +349,8 @@ where
     async fn set_config(
         &self,
         req: crate::model::SetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationConfig>> {
         self.inner.set_config(req, options).await
     }
 
@@ -359,8 +358,8 @@ where
     async fn retrieve_config(
         &self,
         req: crate::model::RetrieveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OrganizationConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OrganizationConfig>> {
         self.inner.retrieve_config(req, options).await
     }
 
@@ -368,8 +367,8 @@ where
     async fn retrieve_effective_config(
         &self,
         req: crate::model::RetrieveEffectiveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationConfig>> {
         self.inner.retrieve_effective_config(req, options).await
     }
 
@@ -377,9 +376,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -387,8 +385,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -396,8 +394,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -405,22 +403,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -451,8 +449,8 @@ where
     async fn create_taxonomy(
         &self,
         req: crate::model::CreateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         self.inner.create_taxonomy(req, options).await
     }
 
@@ -460,8 +458,8 @@ where
     async fn delete_taxonomy(
         &self,
         req: crate::model::DeleteTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_taxonomy(req, options).await
     }
 
@@ -469,8 +467,8 @@ where
     async fn update_taxonomy(
         &self,
         req: crate::model::UpdateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         self.inner.update_taxonomy(req, options).await
     }
 
@@ -478,8 +476,8 @@ where
     async fn list_taxonomies(
         &self,
         req: crate::model::ListTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTaxonomiesResponse>> {
         self.inner.list_taxonomies(req, options).await
     }
 
@@ -487,8 +485,8 @@ where
     async fn get_taxonomy(
         &self,
         req: crate::model::GetTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         self.inner.get_taxonomy(req, options).await
     }
 
@@ -496,8 +494,8 @@ where
     async fn create_policy_tag(
         &self,
         req: crate::model::CreatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyTag>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyTag>> {
         self.inner.create_policy_tag(req, options).await
     }
 
@@ -505,8 +503,8 @@ where
     async fn delete_policy_tag(
         &self,
         req: crate::model::DeletePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_policy_tag(req, options).await
     }
 
@@ -514,8 +512,8 @@ where
     async fn update_policy_tag(
         &self,
         req: crate::model::UpdatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyTag>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyTag>> {
         self.inner.update_policy_tag(req, options).await
     }
 
@@ -523,8 +521,8 @@ where
     async fn list_policy_tags(
         &self,
         req: crate::model::ListPolicyTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPolicyTagsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPolicyTagsResponse>> {
         self.inner.list_policy_tags(req, options).await
     }
 
@@ -532,8 +530,8 @@ where
     async fn get_policy_tag(
         &self,
         req: crate::model::GetPolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyTag>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyTag>> {
         self.inner.get_policy_tag(req, options).await
     }
 
@@ -541,8 +539,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -550,8 +548,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -559,9 +557,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -569,9 +566,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -579,8 +575,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -588,8 +584,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -597,8 +593,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -629,8 +625,8 @@ where
     async fn replace_taxonomy(
         &self,
         req: crate::model::ReplaceTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         self.inner.replace_taxonomy(req, options).await
     }
 
@@ -638,8 +634,8 @@ where
     async fn import_taxonomies(
         &self,
         req: crate::model::ImportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportTaxonomiesResponse>> {
         self.inner.import_taxonomies(req, options).await
     }
 
@@ -647,8 +643,8 @@ where
     async fn export_taxonomies(
         &self,
         req: crate::model::ExportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExportTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExportTaxonomiesResponse>> {
         self.inner.export_taxonomies(req, options).await
     }
 
@@ -656,9 +652,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -666,8 +661,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -675,8 +670,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -684,8 +679,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/datacatalog/v1/src/transport.rs b/src/generated/cloud/datacatalog/v1/src/transport.rs
index 18d5a30865..91323cc7d7 100644
--- a/src/generated/cloud/datacatalog/v1/src/transport.rs
+++ b/src/generated/cloud/datacatalog/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataCatalog](super::stub::DataCatalog) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataCatalog {
 }
 
 impl DataCatalog {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,11 +43,11 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn search_catalog(
         &self,
         req: crate::model::SearchCatalogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchCatalogResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchCatalogResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/catalog:search".to_string();
@@ -62,9 +62,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -79,13 +79,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -123,9 +123,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -140,13 +140,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -199,9 +199,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -216,13 +216,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -281,9 +281,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -298,13 +298,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -346,9 +346,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -357,24 +357,25 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntryGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntryGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -413,9 +414,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -430,13 +431,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -478,9 +479,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -495,13 +496,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -564,9 +565,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -581,13 +582,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -632,9 +633,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -643,24 +644,25 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -705,9 +707,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -722,11 +724,11 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/entries:lookup".to_string();
@@ -756,9 +758,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -773,13 +775,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -834,9 +836,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -851,13 +853,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn modify_entry_overview(
         &self,
         req: crate::model::ModifyEntryOverviewRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryOverview>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryOverview>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -902,9 +904,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -919,13 +921,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn modify_entry_contacts(
         &self,
         req: crate::model::ModifyEntryContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contacts>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contacts>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -970,9 +972,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -987,13 +989,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn create_tag_template(
         &self,
         req: crate::model::CreateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1031,9 +1033,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1048,13 +1050,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn get_tag_template(
         &self,
         req: crate::model::GetTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1095,9 +1097,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1112,13 +1114,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn update_tag_template(
         &self,
         req: crate::model::UpdateTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1177,9 +1179,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1194,13 +1196,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn delete_tag_template(
         &self,
         req: crate::model::DeleteTagTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1242,9 +1244,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1253,24 +1255,25 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_tag_template_field(
         &self,
         req: crate::model::CreateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1312,9 +1315,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1329,13 +1332,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn update_tag_template_field(
         &self,
         req: crate::model::UpdateTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1392,9 +1395,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1409,13 +1412,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn rename_tag_template_field(
         &self,
         req: crate::model::RenameTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1460,9 +1463,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1477,13 +1480,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn rename_tag_template_field_enum_value(
         &self,
         req: crate::model::RenameTagTemplateFieldEnumValueRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TagTemplateField>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TagTemplateField>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1532,9 +1535,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1549,13 +1552,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn delete_tag_template_field(
         &self,
         req: crate::model::DeleteTagTemplateFieldRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1601,9 +1604,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1612,24 +1615,25 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_tag(
         &self,
         req: crate::model::CreateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tag>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tag>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1711,9 +1715,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1728,13 +1732,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn update_tag(
         &self,
         req: crate::model::UpdateTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tag>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tag>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1860,9 +1864,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1877,13 +1881,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn delete_tag(
         &self,
         req: crate::model::DeleteTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1973,9 +1977,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1984,24 +1988,25 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_tags(
         &self,
         req: crate::model::ListTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTagsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTagsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2087,9 +2092,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2104,13 +2109,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn reconcile_tags(
         &self,
         req: crate::model::ReconcileTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2155,9 +2160,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2172,13 +2177,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn star_entry(
         &self,
         req: crate::model::StarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StarEntryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StarEntryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2223,9 +2228,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2240,13 +2245,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn unstar_entry(
         &self,
         req: crate::model::UnstarEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UnstarEntryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UnstarEntryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2291,9 +2296,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2308,13 +2313,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2392,9 +2397,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2409,13 +2414,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2534,9 +2539,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2551,14 +2556,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2677,9 +2681,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2694,13 +2698,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn import_entries(
         &self,
         req: crate::model::ImportEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2741,9 +2745,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2758,13 +2762,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn set_config(
         &self,
         req: crate::model::SetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2834,9 +2838,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2851,13 +2855,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn retrieve_config(
         &self,
         req: crate::model::RetrieveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::OrganizationConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::OrganizationConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2894,9 +2898,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2911,13 +2915,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn retrieve_effective_config(
         &self,
         req: crate::model::RetrieveEffectiveConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MigrationConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MigrationConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2987,9 +2991,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3004,14 +3008,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3053,9 +3056,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3070,13 +3073,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3117,9 +3120,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3134,13 +3137,13 @@ impl super::stub::DataCatalog for DataCatalog {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3181,9 +3184,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3192,24 +3195,25 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3250,9 +3254,9 @@ impl super::stub::DataCatalog for DataCatalog {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3261,25 +3265,26 @@ impl super::stub::DataCatalog for DataCatalog {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3299,7 +3304,7 @@ impl std::fmt::Debug for PolicyTagManager {
 }
 
 impl PolicyTagManager {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3309,13 +3314,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn create_taxonomy(
         &self,
         req: crate::model::CreateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3352,9 +3357,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3369,13 +3374,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn delete_taxonomy(
         &self,
         req: crate::model::DeleteTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3416,9 +3421,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3427,24 +3432,25 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_taxonomy(
         &self,
         req: crate::model::UpdateTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3503,9 +3509,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3520,13 +3526,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn list_taxonomies(
         &self,
         req: crate::model::ListTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTaxonomiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTaxonomiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3566,9 +3572,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3583,13 +3589,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn get_taxonomy(
         &self,
         req: crate::model::GetTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3630,9 +3636,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3647,13 +3653,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn create_policy_tag(
         &self,
         req: crate::model::CreatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyTag>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyTag>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3694,9 +3700,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3711,13 +3717,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn delete_policy_tag(
         &self,
         req: crate::model::DeletePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3762,9 +3768,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3773,24 +3779,25 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_policy_tag(
         &self,
         req: crate::model::UpdatePolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyTag>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyTag>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3853,9 +3860,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3870,13 +3877,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn list_policy_tags(
         &self,
         req: crate::model::ListPolicyTagsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPolicyTagsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPolicyTagsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3919,9 +3926,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3936,13 +3943,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn get_policy_tag(
         &self,
         req: crate::model::GetPolicyTagRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyTag>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyTag>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3987,9 +3994,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4004,13 +4011,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4092,9 +4099,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4109,13 +4116,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4197,9 +4204,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4214,14 +4221,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4303,9 +4309,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4320,14 +4326,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4369,9 +4374,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4386,13 +4391,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4433,9 +4438,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4450,13 +4455,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4497,9 +4502,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4508,24 +4513,25 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4566,9 +4572,9 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4577,12 +4583,13 @@ impl super::stub::PolicyTagManager for PolicyTagManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -4601,7 +4608,7 @@ impl std::fmt::Debug for PolicyTagManagerSerialization {
 }
 
 impl PolicyTagManagerSerialization {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -4611,13 +4618,13 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
     async fn replace_taxonomy(
         &self,
         req: crate::model::ReplaceTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Taxonomy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Taxonomy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4658,9 +4665,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4675,13 +4682,13 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
     async fn import_taxonomies(
         &self,
         req: crate::model::ImportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportTaxonomiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportTaxonomiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4718,9 +4725,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4735,13 +4742,13 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
     async fn export_taxonomies(
         &self,
         req: crate::model::ExportTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ExportTaxonomiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ExportTaxonomiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4788,9 +4795,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4805,14 +4812,13 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4854,9 +4860,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4871,13 +4877,13 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4918,9 +4924,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4935,13 +4941,13 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4982,9 +4988,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4993,24 +4999,25 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5051,9 +5058,9 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5062,11 +5069,12 @@ impl super::stub::PolicyTagManagerSerialization for PolicyTagManagerSerializatio
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/dataform/v1/Cargo.toml b/src/generated/cloud/dataform/v1/Cargo.toml
index 4be14faa89..4a4cec6cfa 100644
--- a/src/generated/cloud/dataform/v1/Cargo.toml
+++ b/src/generated/cloud/dataform/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-iam-v1.workspace   = true
 google-cloud-location.workspace = true
 google-cloud-rpc.workspace      = true
diff --git a/src/generated/cloud/dataform/v1/src/builder.rs b/src/generated/cloud/dataform/v1/src/builder.rs
index 28178aeea3..fd3fee9787 100644
--- a/src/generated/cloud/dataform/v1/src/builder.rs
+++ b/src/generated/cloud/dataform/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod dataform {
     /// A builder for [Dataform][crate::client::Dataform].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataform_v1::*;
     /// # use builder::dataform::ClientBuilder;
     /// # use client::Dataform;
@@ -30,19 +30,18 @@ pub mod dataform {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Dataform;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Dataform;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod dataform {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Dataform>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod dataform {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListRepositories;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -107,7 +106,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,14 +116,16 @@ pub mod dataform {
             (*self.0.stub)
                 .list_repositories(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRepositoriesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRepositoriesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -132,15 +133,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRepositoriesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRepositoriesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -178,8 +181,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRepositories {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRepositories {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -189,7 +192,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetRepository;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -215,7 +218,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -225,7 +228,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_repository(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRepositoryRequest::name].
@@ -238,8 +241,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRepository {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRepository {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -249,7 +252,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CreateRepository;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -278,7 +281,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -288,7 +291,7 @@ pub mod dataform {
             (*self.0.stub)
                 .create_repository(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateRepositoryRequest::parent].
@@ -331,8 +334,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRepository {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRepository {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -342,7 +345,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::UpdateRepository;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -371,7 +374,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -381,7 +384,7 @@ pub mod dataform {
             (*self.0.stub)
                 .update_repository(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateRepositoryRequest::update_mask].
@@ -426,8 +429,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRepository {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRepository {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -437,7 +440,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::DeleteRepository;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -466,7 +469,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -476,7 +479,7 @@ pub mod dataform {
             (*self.0.stub)
                 .delete_repository(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteRepositoryRequest::name].
@@ -495,8 +498,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRepository {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRepository {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -506,7 +509,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CommitRepositoryChanges;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -537,7 +540,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -547,7 +550,7 @@ pub mod dataform {
             (*self.0.stub)
                 .commit_repository_changes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CommitRepositoryChangesRequest::name].
@@ -600,8 +603,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CommitRepositoryChanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CommitRepositoryChanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -611,7 +614,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ReadRepositoryFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -640,7 +643,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -650,7 +653,7 @@ pub mod dataform {
             (*self.0.stub)
                 .read_repository_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ReadRepositoryFileRequest::name].
@@ -677,8 +680,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadRepositoryFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadRepositoryFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -688,8 +691,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::QueryRepositoryDirectoryContents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -723,7 +726,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -733,15 +736,15 @@ pub mod dataform {
             (*self.0.stub)
                 .query_repository_directory_contents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::QueryRepositoryDirectoryContentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -750,17 +753,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::QueryRepositoryDirectoryContentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -798,8 +801,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryRepositoryDirectoryContents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryRepositoryDirectoryContents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -809,8 +812,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::FetchRepositoryHistory;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -842,7 +845,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -852,15 +855,15 @@ pub mod dataform {
             (*self.0.stub)
                 .fetch_repository_history(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchRepositoryHistoryResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -869,17 +872,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchRepositoryHistoryResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -905,8 +908,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchRepositoryHistory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchRepositoryHistory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -916,7 +919,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ComputeRepositoryAccessTokenStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -947,7 +950,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -959,7 +962,7 @@ pub mod dataform {
             (*self.0.stub)
                 .compute_repository_access_token_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ComputeRepositoryAccessTokenStatusRequest::name].
@@ -972,8 +975,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ComputeRepositoryAccessTokenStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ComputeRepositoryAccessTokenStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -983,7 +986,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::FetchRemoteBranches;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1012,7 +1015,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1022,7 +1025,7 @@ pub mod dataform {
             (*self.0.stub)
                 .fetch_remote_branches(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchRemoteBranchesRequest::name].
@@ -1035,8 +1038,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchRemoteBranches {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchRemoteBranches {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1046,8 +1049,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListWorkspaces;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1076,7 +1079,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1086,14 +1089,16 @@ pub mod dataform {
             (*self.0.stub)
                 .list_workspaces(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWorkspacesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListWorkspacesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1101,15 +1106,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListWorkspacesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListWorkspacesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1147,8 +1154,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkspaces {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkspaces {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1158,7 +1165,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1184,7 +1191,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1194,7 +1201,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkspaceRequest::name].
@@ -1207,8 +1214,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1218,7 +1225,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CreateWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1244,7 +1251,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1254,7 +1261,7 @@ pub mod dataform {
             (*self.0.stub)
                 .create_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateWorkspaceRequest::parent].
@@ -1297,8 +1304,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1308,7 +1315,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::DeleteWorkspace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1334,7 +1341,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1344,7 +1351,7 @@ pub mod dataform {
             (*self.0.stub)
                 .delete_workspace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWorkspaceRequest::name].
@@ -1357,8 +1364,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWorkspace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWorkspace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1368,7 +1375,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::InstallNpmPackages;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1397,7 +1404,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1407,7 +1414,7 @@ pub mod dataform {
             (*self.0.stub)
                 .install_npm_packages(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::InstallNpmPackagesRequest::workspace].
@@ -1420,8 +1427,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InstallNpmPackages {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InstallNpmPackages {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1431,7 +1438,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::PullGitCommits;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1457,7 +1464,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1467,7 +1474,7 @@ pub mod dataform {
             (*self.0.stub)
                 .pull_git_commits(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::PullGitCommitsRequest::name].
@@ -1508,8 +1515,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PullGitCommits {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PullGitCommits {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1519,7 +1526,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::PushGitCommits;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1545,7 +1552,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1555,7 +1562,7 @@ pub mod dataform {
             (*self.0.stub)
                 .push_git_commits(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::PushGitCommitsRequest::name].
@@ -1574,8 +1581,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PushGitCommits {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PushGitCommits {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1585,7 +1592,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::FetchFileGitStatuses;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1614,7 +1621,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1624,7 +1631,7 @@ pub mod dataform {
             (*self.0.stub)
                 .fetch_file_git_statuses(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchFileGitStatusesRequest::name].
@@ -1637,8 +1644,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchFileGitStatuses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchFileGitStatuses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1648,7 +1655,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::FetchGitAheadBehind;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1677,7 +1684,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1687,7 +1694,7 @@ pub mod dataform {
             (*self.0.stub)
                 .fetch_git_ahead_behind(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchGitAheadBehindRequest::name].
@@ -1706,8 +1713,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchGitAheadBehind {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchGitAheadBehind {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1717,7 +1724,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CommitWorkspaceChanges;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1746,7 +1753,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1756,7 +1763,7 @@ pub mod dataform {
             (*self.0.stub)
                 .commit_workspace_changes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CommitWorkspaceChangesRequest::name].
@@ -1808,8 +1815,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CommitWorkspaceChanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CommitWorkspaceChanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1819,7 +1826,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ResetWorkspaceChanges;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1848,7 +1855,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1858,7 +1865,7 @@ pub mod dataform {
             (*self.0.stub)
                 .reset_workspace_changes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ResetWorkspaceChangesRequest::name].
@@ -1888,8 +1895,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResetWorkspaceChanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResetWorkspaceChanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1899,7 +1906,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::FetchFileDiff;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1925,7 +1932,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1935,7 +1942,7 @@ pub mod dataform {
             (*self.0.stub)
                 .fetch_file_diff(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::FetchFileDiffRequest::workspace].
@@ -1956,8 +1963,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchFileDiff {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchFileDiff {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1967,8 +1974,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::QueryDirectoryContents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2000,7 +2007,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2010,15 +2017,15 @@ pub mod dataform {
             (*self.0.stub)
                 .query_directory_contents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::QueryDirectoryContentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2027,17 +2034,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::QueryDirectoryContentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2069,8 +2076,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryDirectoryContents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryDirectoryContents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2080,8 +2087,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::SearchFiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2110,7 +2117,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2120,13 +2127,13 @@ pub mod dataform {
             (*self.0.stub)
                 .search_files(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchFilesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchFilesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2135,15 +2142,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchFilesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchFilesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2175,8 +2184,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchFiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchFiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2186,7 +2195,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::MakeDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2212,7 +2221,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2222,7 +2231,7 @@ pub mod dataform {
             (*self.0.stub)
                 .make_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::MakeDirectoryRequest::workspace].
@@ -2243,8 +2252,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MakeDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MakeDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2254,7 +2263,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::RemoveDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2280,7 +2289,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2290,7 +2299,7 @@ pub mod dataform {
             (*self.0.stub)
                 .remove_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::RemoveDirectoryRequest::workspace].
@@ -2311,8 +2320,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2322,7 +2331,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::MoveDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2348,7 +2357,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2358,7 +2367,7 @@ pub mod dataform {
             (*self.0.stub)
                 .move_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::MoveDirectoryRequest::workspace].
@@ -2387,8 +2396,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2398,7 +2407,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ReadFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2424,7 +2433,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2434,7 +2443,7 @@ pub mod dataform {
             (*self.0.stub)
                 .read_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::ReadFileRequest::workspace].
@@ -2461,8 +2470,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReadFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReadFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2472,7 +2481,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::RemoveFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2498,7 +2507,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2508,7 +2517,7 @@ pub mod dataform {
             (*self.0.stub)
                 .remove_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::RemoveFileRequest::workspace].
@@ -2529,8 +2538,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2540,7 +2549,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::MoveFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2566,7 +2575,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2576,7 +2585,7 @@ pub mod dataform {
             (*self.0.stub)
                 .move_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::MoveFileRequest::workspace].
@@ -2605,8 +2614,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2616,7 +2625,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::WriteFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2642,7 +2651,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2652,7 +2661,7 @@ pub mod dataform {
             (*self.0.stub)
                 .write_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [workspace][crate::model::WriteFileRequest::workspace].
@@ -2681,8 +2690,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WriteFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WriteFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2692,8 +2701,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListReleaseConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2725,7 +2734,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2735,14 +2744,16 @@ pub mod dataform {
             (*self.0.stub)
                 .list_release_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReleaseConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReleaseConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2750,17 +2761,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListReleaseConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2786,8 +2797,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReleaseConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReleaseConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2797,7 +2808,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetReleaseConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2826,7 +2837,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2836,7 +2847,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_release_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReleaseConfigRequest::name].
@@ -2849,8 +2860,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReleaseConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReleaseConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2860,7 +2871,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CreateReleaseConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2889,7 +2900,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2899,7 +2910,7 @@ pub mod dataform {
             (*self.0.stub)
                 .create_release_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateReleaseConfigRequest::parent].
@@ -2942,8 +2953,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReleaseConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReleaseConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2953,7 +2964,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::UpdateReleaseConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2982,7 +2993,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2992,7 +3003,7 @@ pub mod dataform {
             (*self.0.stub)
                 .update_release_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateReleaseConfigRequest::update_mask].
@@ -3037,8 +3048,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateReleaseConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateReleaseConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3048,7 +3059,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::DeleteReleaseConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3077,7 +3088,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3087,7 +3098,7 @@ pub mod dataform {
             (*self.0.stub)
                 .delete_release_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteReleaseConfigRequest::name].
@@ -3100,8 +3111,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReleaseConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReleaseConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3111,8 +3122,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListCompilationResults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3144,7 +3155,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3154,15 +3165,15 @@ pub mod dataform {
             (*self.0.stub)
                 .list_compilation_results(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListCompilationResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3171,17 +3182,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCompilationResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3219,8 +3230,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCompilationResults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCompilationResults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3230,7 +3241,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetCompilationResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3259,7 +3270,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3269,7 +3280,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_compilation_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCompilationResultRequest::name].
@@ -3282,8 +3293,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCompilationResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCompilationResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3293,7 +3304,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CreateCompilationResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3324,7 +3335,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3334,7 +3345,7 @@ pub mod dataform {
             (*self.0.stub)
                 .create_compilation_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCompilationResultRequest::parent].
@@ -3369,8 +3380,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCompilationResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCompilationResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3380,8 +3391,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::QueryCompilationResultActions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3415,7 +3426,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3425,15 +3436,15 @@ pub mod dataform {
             (*self.0.stub)
                 .query_compilation_result_actions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::QueryCompilationResultActionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3442,17 +3453,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::QueryCompilationResultActionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3484,8 +3495,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryCompilationResultActions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryCompilationResultActions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3495,8 +3506,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListWorkflowConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3528,7 +3539,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3538,14 +3549,16 @@ pub mod dataform {
             (*self.0.stub)
                 .list_workflow_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWorkflowConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListWorkflowConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3553,17 +3566,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListWorkflowConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3589,8 +3602,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkflowConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkflowConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3600,7 +3613,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetWorkflowConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3629,7 +3642,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3639,7 +3652,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_workflow_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkflowConfigRequest::name].
@@ -3652,8 +3665,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkflowConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkflowConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3663,7 +3676,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CreateWorkflowConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3692,7 +3705,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3702,7 +3715,7 @@ pub mod dataform {
             (*self.0.stub)
                 .create_workflow_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateWorkflowConfigRequest::parent].
@@ -3745,8 +3758,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWorkflowConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWorkflowConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3756,7 +3769,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::UpdateWorkflowConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3785,7 +3798,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3795,7 +3808,7 @@ pub mod dataform {
             (*self.0.stub)
                 .update_workflow_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateWorkflowConfigRequest::update_mask].
@@ -3840,8 +3853,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateWorkflowConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateWorkflowConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3851,7 +3864,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::DeleteWorkflowConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3880,7 +3893,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3890,7 +3903,7 @@ pub mod dataform {
             (*self.0.stub)
                 .delete_workflow_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWorkflowConfigRequest::name].
@@ -3903,8 +3916,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWorkflowConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWorkflowConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3914,8 +3927,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListWorkflowInvocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3949,7 +3962,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3959,15 +3972,15 @@ pub mod dataform {
             (*self.0.stub)
                 .list_workflow_invocations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListWorkflowInvocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3976,17 +3989,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListWorkflowInvocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4024,8 +4037,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkflowInvocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkflowInvocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4035,7 +4048,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetWorkflowInvocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4064,7 +4077,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4074,7 +4087,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_workflow_invocation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkflowInvocationRequest::name].
@@ -4087,8 +4100,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkflowInvocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkflowInvocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4098,7 +4111,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CreateWorkflowInvocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4129,7 +4142,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4139,7 +4152,7 @@ pub mod dataform {
             (*self.0.stub)
                 .create_workflow_invocation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateWorkflowInvocationRequest::parent].
@@ -4174,8 +4187,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWorkflowInvocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWorkflowInvocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4185,7 +4198,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::DeleteWorkflowInvocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4216,7 +4229,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4226,7 +4239,7 @@ pub mod dataform {
             (*self.0.stub)
                 .delete_workflow_invocation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWorkflowInvocationRequest::name].
@@ -4239,8 +4252,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWorkflowInvocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWorkflowInvocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4250,7 +4263,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::CancelWorkflowInvocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4281,7 +4294,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4291,7 +4304,7 @@ pub mod dataform {
             (*self.0.stub)
                 .cancel_workflow_invocation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelWorkflowInvocationRequest::name].
@@ -4304,8 +4317,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelWorkflowInvocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelWorkflowInvocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4315,8 +4328,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::QueryWorkflowInvocationActions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4350,7 +4363,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4360,15 +4373,15 @@ pub mod dataform {
             (*self.0.stub)
                 .query_workflow_invocation_actions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::QueryWorkflowInvocationActionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4377,17 +4390,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::QueryWorkflowInvocationActionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4413,8 +4426,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryWorkflowInvocationActions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryWorkflowInvocationActions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4424,7 +4437,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4450,7 +4463,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4460,7 +4473,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConfigRequest::name].
@@ -4473,8 +4486,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4484,7 +4497,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::UpdateConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4510,7 +4523,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4520,7 +4533,7 @@ pub mod dataform {
             (*self.0.stub)
                 .update_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [config][crate::model::UpdateConfigRequest::config].
@@ -4565,8 +4578,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4576,8 +4589,8 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4609,7 +4622,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4619,15 +4632,15 @@ pub mod dataform {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4636,17 +4649,17 @@ pub mod dataform {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4676,8 +4689,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4687,7 +4700,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4716,7 +4729,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4726,7 +4739,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4737,8 +4750,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4748,7 +4761,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4777,7 +4790,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4787,7 +4800,7 @@ pub mod dataform {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4840,8 +4853,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4851,7 +4864,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4880,7 +4893,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4890,7 +4903,7 @@ pub mod dataform {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4921,8 +4934,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4932,7 +4945,7 @@ pub mod dataform {
     /// # Example
     /// ```
     /// # use google_cloud_dataform_v1::builder::dataform::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataform_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4963,7 +4976,7 @@ pub mod dataform {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4973,7 +4986,7 @@ pub mod dataform {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4999,8 +5012,8 @@ pub mod dataform {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/dataform/v1/src/client.rs b/src/generated/cloud/dataform/v1/src/client.rs
index 572d8d7d01..62c47e3712 100644
--- a/src/generated/cloud/dataform/v1/src/client.rs
+++ b/src/generated/cloud/dataform/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataform_v1::client::Dataform;
 /// let client = Dataform::builder().build().await?;
 /// // use `client` to make requests to the Dataform API.
@@ -67,13 +67,13 @@ impl Dataform {
     /// Returns a builder for [Dataform].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataform_v1::client::Dataform;
     /// let client = Dataform::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dataform::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::dataform::client::Factory)
+        crate::new_client_builder(super::builder::dataform::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl Dataform {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Dataform>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Dataform>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl Dataform {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Dataform> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Dataform> {
         super::transport::Dataform::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Dataform> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Dataform> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Dataform::new)
diff --git a/src/generated/cloud/dataform/v1/src/lib.rs b/src/generated/cloud/dataform/v1/src/lib.rs
index e973adf867..3e6f652ef8 100644
--- a/src/generated/cloud/dataform/v1/src/lib.rs
+++ b/src/generated/cloud/dataform/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/dataform/v1/src/model.rs b/src/generated/cloud/dataform/v1/src/model.rs
index e0d8e85f65..c77bda1b7a 100644
--- a/src/generated/cloud/dataform/v1/src/model.rs
+++ b/src/generated/cloud/dataform/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_rpc;
@@ -1028,7 +1028,7 @@ impl wkt::message::Message for ListRepositoriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRepositoriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRepositoriesResponse {
     type PageItem = crate::model::Repository;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1953,7 +1953,9 @@ impl wkt::message::Message for QueryRepositoryDirectoryContentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for QueryRepositoryDirectoryContentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for QueryRepositoryDirectoryContentsResponse
+{
     type PageItem = crate::model::DirectoryEntry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2098,7 +2100,7 @@ impl wkt::message::Message for FetchRepositoryHistoryResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FetchRepositoryHistoryResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for FetchRepositoryHistoryResponse {
     type PageItem = crate::model::CommitLogEntry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2927,7 +2929,7 @@ impl wkt::message::Message for ListWorkspacesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkspacesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkspacesResponse {
     type PageItem = crate::model::Workspace;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4167,7 +4169,7 @@ impl wkt::message::Message for QueryDirectoryContentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for QueryDirectoryContentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for QueryDirectoryContentsResponse {
     type PageItem = crate::model::DirectoryEntry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4448,7 +4450,7 @@ impl wkt::message::Message for SearchFilesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchFilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchFilesResponse {
     type PageItem = crate::model::SearchResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5843,7 +5845,7 @@ impl wkt::message::Message for ListReleaseConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReleaseConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReleaseConfigsResponse {
     type PageItem = crate::model::ReleaseConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7118,7 +7120,7 @@ impl wkt::message::Message for ListCompilationResultsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCompilationResultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCompilationResultsResponse {
     type PageItem = crate::model::CompilationResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9902,7 +9904,9 @@ impl wkt::message::Message for QueryCompilationResultActionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for QueryCompilationResultActionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for QueryCompilationResultActionsResponse
+{
     type PageItem = crate::model::CompilationResultAction;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10663,7 +10667,7 @@ impl wkt::message::Message for ListWorkflowConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkflowConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkflowConfigsResponse {
     type PageItem = crate::model::WorkflowConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11599,7 +11603,7 @@ impl wkt::message::Message for ListWorkflowInvocationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkflowInvocationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkflowInvocationsResponse {
     type PageItem = crate::model::WorkflowInvocation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13192,7 +13196,9 @@ impl wkt::message::Message for QueryWorkflowInvocationActionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for QueryWorkflowInvocationActionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for QueryWorkflowInvocationActionsResponse
+{
     type PageItem = crate::model::WorkflowInvocationAction;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/dataform/v1/src/stub.rs b/src/generated/cloud/dataform/v1/src/stub.rs
index 896b272354..e3d7b24ee2 100644
--- a/src/generated/cloud/dataform/v1/src/stub.rs
+++ b/src/generated/cloud/dataform/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_repositories(
         &self,
         _req: crate::model::ListRepositoriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRepositoriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRepositoriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_repository(
         &self,
         _req: crate::model::GetRepositoryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Repository>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Repository>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +63,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn create_repository(
         &self,
         _req: crate::model::CreateRepositoryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Repository>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Repository>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +73,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn update_repository(
         &self,
         _req: crate::model::UpdateRepositoryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Repository>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Repository>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +83,8 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn delete_repository(
         &self,
         _req: crate::model::DeleteRepositoryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,11 +92,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn commit_repository_changes(
         &self,
         _req: crate::model::CommitRepositoryChangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::CommitRepositoryChangesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::CommitRepositoryChangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +103,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn read_repository_file(
         &self,
         _req: crate::model::ReadRepositoryFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReadRepositoryFileResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReadRepositoryFileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,10 +114,10 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn query_repository_directory_contents(
         &self,
         _req: crate::model::QueryRepositoryDirectoryContentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::QueryRepositoryDirectoryContentsResponse>,
+            crate::Response<crate::model::QueryRepositoryDirectoryContentsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -132,11 +127,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn fetch_repository_history(
         &self,
         _req: crate::model::FetchRepositoryHistoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchRepositoryHistoryResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchRepositoryHistoryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,10 +138,10 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn compute_repository_access_token_status(
         &self,
         _req: crate::model::ComputeRepositoryAccessTokenStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>,
+            crate::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -158,9 +151,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn fetch_remote_branches(
         &self,
         _req: crate::model::FetchRemoteBranchesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchRemoteBranchesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchRemoteBranchesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -169,9 +162,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_workspaces(
         &self,
         _req: crate::model::ListWorkspacesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWorkspacesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWorkspacesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -180,10 +173,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_workspace(
         &self,
         _req: crate::model::GetWorkspaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Workspace>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Workspace>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -191,10 +183,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn create_workspace(
         &self,
         _req: crate::model::CreateWorkspaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Workspace>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Workspace>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -202,8 +193,8 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn delete_workspace(
         &self,
         _req: crate::model::DeleteWorkspaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -211,9 +202,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn install_npm_packages(
         &self,
         _req: crate::model::InstallNpmPackagesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstallNpmPackagesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::InstallNpmPackagesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -222,9 +213,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn pull_git_commits(
         &self,
         _req: crate::model::PullGitCommitsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PullGitCommitsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PullGitCommitsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -233,9 +224,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn push_git_commits(
         &self,
         _req: crate::model::PushGitCommitsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PushGitCommitsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PushGitCommitsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -244,9 +235,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn fetch_file_git_statuses(
         &self,
         _req: crate::model::FetchFileGitStatusesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchFileGitStatusesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchFileGitStatusesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -255,9 +246,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn fetch_git_ahead_behind(
         &self,
         _req: crate::model::FetchGitAheadBehindRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchGitAheadBehindResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchGitAheadBehindResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -266,11 +257,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn commit_workspace_changes(
         &self,
         _req: crate::model::CommitWorkspaceChangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::CommitWorkspaceChangesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::CommitWorkspaceChangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -279,11 +268,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn reset_workspace_changes(
         &self,
         _req: crate::model::ResetWorkspaceChangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResetWorkspaceChangesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResetWorkspaceChangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -292,9 +279,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn fetch_file_diff(
         &self,
         _req: crate::model::FetchFileDiffRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchFileDiffResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchFileDiffResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -303,11 +290,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn query_directory_contents(
         &self,
         _req: crate::model::QueryDirectoryContentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::QueryDirectoryContentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::QueryDirectoryContentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -316,9 +301,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn search_files(
         &self,
         _req: crate::model::SearchFilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchFilesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchFilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -327,9 +312,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn make_directory(
         &self,
         _req: crate::model::MakeDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MakeDirectoryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::MakeDirectoryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -338,9 +323,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn remove_directory(
         &self,
         _req: crate::model::RemoveDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RemoveDirectoryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RemoveDirectoryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -349,9 +334,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn move_directory(
         &self,
         _req: crate::model::MoveDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MoveDirectoryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::MoveDirectoryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -360,9 +345,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn read_file(
         &self,
         _req: crate::model::ReadFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReadFileResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReadFileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -371,9 +356,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn remove_file(
         &self,
         _req: crate::model::RemoveFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RemoveFileResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RemoveFileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -382,9 +367,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn move_file(
         &self,
         _req: crate::model::MoveFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MoveFileResponse>>,
+        Output = crate::Result<crate::Response<crate::model::MoveFileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -393,9 +378,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn write_file(
         &self,
         _req: crate::model::WriteFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WriteFileResponse>>,
+        Output = crate::Result<crate::Response<crate::model::WriteFileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -404,9 +389,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_release_configs(
         &self,
         _req: crate::model::ListReleaseConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReleaseConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReleaseConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -415,9 +400,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_release_config(
         &self,
         _req: crate::model::GetReleaseConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReleaseConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ReleaseConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -426,9 +411,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn create_release_config(
         &self,
         _req: crate::model::CreateReleaseConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReleaseConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ReleaseConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -437,9 +422,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn update_release_config(
         &self,
         _req: crate::model::UpdateReleaseConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReleaseConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ReleaseConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -448,8 +433,8 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn delete_release_config(
         &self,
         _req: crate::model::DeleteReleaseConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -457,11 +442,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_compilation_results(
         &self,
         _req: crate::model::ListCompilationResultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListCompilationResultsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListCompilationResultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -470,9 +453,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_compilation_result(
         &self,
         _req: crate::model::GetCompilationResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CompilationResult>>,
+        Output = crate::Result<crate::Response<crate::model::CompilationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -481,9 +464,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn create_compilation_result(
         &self,
         _req: crate::model::CreateCompilationResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CompilationResult>>,
+        Output = crate::Result<crate::Response<crate::model::CompilationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -492,10 +475,10 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn query_compilation_result_actions(
         &self,
         _req: crate::model::QueryCompilationResultActionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::QueryCompilationResultActionsResponse>,
+            crate::Response<crate::model::QueryCompilationResultActionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -505,9 +488,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_workflow_configs(
         &self,
         _req: crate::model::ListWorkflowConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWorkflowConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWorkflowConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -516,9 +499,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_workflow_config(
         &self,
         _req: crate::model::GetWorkflowConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowConfig>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -527,9 +510,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn create_workflow_config(
         &self,
         _req: crate::model::CreateWorkflowConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowConfig>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -538,9 +521,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn update_workflow_config(
         &self,
         _req: crate::model::UpdateWorkflowConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowConfig>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -549,8 +532,8 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn delete_workflow_config(
         &self,
         _req: crate::model::DeleteWorkflowConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -558,11 +541,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_workflow_invocations(
         &self,
         _req: crate::model::ListWorkflowInvocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListWorkflowInvocationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListWorkflowInvocationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -571,9 +552,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_workflow_invocation(
         &self,
         _req: crate::model::GetWorkflowInvocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowInvocation>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowInvocation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -582,9 +563,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn create_workflow_invocation(
         &self,
         _req: crate::model::CreateWorkflowInvocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowInvocation>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowInvocation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -593,8 +574,8 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn delete_workflow_invocation(
         &self,
         _req: crate::model::DeleteWorkflowInvocationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -602,11 +583,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn cancel_workflow_invocation(
         &self,
         _req: crate::model::CancelWorkflowInvocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::CancelWorkflowInvocationResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::CancelWorkflowInvocationResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -615,10 +594,10 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn query_workflow_invocation_actions(
         &self,
         _req: crate::model::QueryWorkflowInvocationActionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::QueryWorkflowInvocationActionsResponse>,
+            crate::Response<crate::model::QueryWorkflowInvocationActionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -628,10 +607,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_config(
         &self,
         _req: crate::model::GetConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Config>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Config>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -639,10 +617,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn update_config(
         &self,
         _req: crate::model::UpdateConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Config>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Config>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -650,10 +627,10 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -663,9 +640,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -674,9 +651,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -685,9 +662,9 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -696,10 +673,10 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
diff --git a/src/generated/cloud/dataform/v1/src/stub/dynamic.rs b/src/generated/cloud/dataform/v1/src/stub/dynamic.rs
index 673a7538ec..a13a4290d2 100644
--- a/src/generated/cloud/dataform/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/dataform/v1/src/stub/dynamic.rs
@@ -20,362 +20,356 @@ pub trait Dataform: std::fmt::Debug + Send + Sync {
     async fn list_repositories(
         &self,
         req: crate::model::ListRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRepositoriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRepositoriesResponse>>;
 
     async fn get_repository(
         &self,
         req: crate::model::GetRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Repository>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Repository>>;
 
     async fn create_repository(
         &self,
         req: crate::model::CreateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Repository>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Repository>>;
 
     async fn update_repository(
         &self,
         req: crate::model::UpdateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Repository>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Repository>>;
 
     async fn delete_repository(
         &self,
         req: crate::model::DeleteRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn commit_repository_changes(
         &self,
         req: crate::model::CommitRepositoryChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitRepositoryChangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitRepositoryChangesResponse>>;
 
     async fn read_repository_file(
         &self,
         req: crate::model::ReadRepositoryFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadRepositoryFileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadRepositoryFileResponse>>;
 
     async fn query_repository_directory_contents(
         &self,
         req: crate::model::QueryRepositoryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::QueryRepositoryDirectoryContentsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryRepositoryDirectoryContentsResponse>>;
 
     async fn fetch_repository_history(
         &self,
         req: crate::model::FetchRepositoryHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchRepositoryHistoryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchRepositoryHistoryResponse>>;
 
     async fn compute_repository_access_token_status(
         &self,
         req: crate::model::ComputeRepositoryAccessTokenStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>>;
 
     async fn fetch_remote_branches(
         &self,
         req: crate::model::FetchRemoteBranchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchRemoteBranchesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchRemoteBranchesResponse>>;
 
     async fn list_workspaces(
         &self,
         req: crate::model::ListWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkspacesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkspacesResponse>>;
 
     async fn get_workspace(
         &self,
         req: crate::model::GetWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workspace>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workspace>>;
 
     async fn create_workspace(
         &self,
         req: crate::model::CreateWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workspace>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workspace>>;
 
     async fn delete_workspace(
         &self,
         req: crate::model::DeleteWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn install_npm_packages(
         &self,
         req: crate::model::InstallNpmPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstallNpmPackagesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstallNpmPackagesResponse>>;
 
     async fn pull_git_commits(
         &self,
         req: crate::model::PullGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PullGitCommitsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PullGitCommitsResponse>>;
 
     async fn push_git_commits(
         &self,
         req: crate::model::PushGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PushGitCommitsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PushGitCommitsResponse>>;
 
     async fn fetch_file_git_statuses(
         &self,
         req: crate::model::FetchFileGitStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchFileGitStatusesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchFileGitStatusesResponse>>;
 
     async fn fetch_git_ahead_behind(
         &self,
         req: crate::model::FetchGitAheadBehindRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchGitAheadBehindResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchGitAheadBehindResponse>>;
 
     async fn commit_workspace_changes(
         &self,
         req: crate::model::CommitWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitWorkspaceChangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitWorkspaceChangesResponse>>;
 
     async fn reset_workspace_changes(
         &self,
         req: crate::model::ResetWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResetWorkspaceChangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResetWorkspaceChangesResponse>>;
 
     async fn fetch_file_diff(
         &self,
         req: crate::model::FetchFileDiffRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchFileDiffResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchFileDiffResponse>>;
 
     async fn query_directory_contents(
         &self,
         req: crate::model::QueryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryDirectoryContentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryDirectoryContentsResponse>>;
 
     async fn search_files(
         &self,
         req: crate::model::SearchFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchFilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchFilesResponse>>;
 
     async fn make_directory(
         &self,
         req: crate::model::MakeDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MakeDirectoryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MakeDirectoryResponse>>;
 
     async fn remove_directory(
         &self,
         req: crate::model::RemoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveDirectoryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveDirectoryResponse>>;
 
     async fn move_directory(
         &self,
         req: crate::model::MoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MoveDirectoryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MoveDirectoryResponse>>;
 
     async fn read_file(
         &self,
         req: crate::model::ReadFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadFileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadFileResponse>>;
 
     async fn remove_file(
         &self,
         req: crate::model::RemoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveFileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveFileResponse>>;
 
     async fn move_file(
         &self,
         req: crate::model::MoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MoveFileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MoveFileResponse>>;
 
     async fn write_file(
         &self,
         req: crate::model::WriteFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteFileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteFileResponse>>;
 
     async fn list_release_configs(
         &self,
         req: crate::model::ListReleaseConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReleaseConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReleaseConfigsResponse>>;
 
     async fn get_release_config(
         &self,
         req: crate::model::GetReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReleaseConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReleaseConfig>>;
 
     async fn create_release_config(
         &self,
         req: crate::model::CreateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReleaseConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReleaseConfig>>;
 
     async fn update_release_config(
         &self,
         req: crate::model::UpdateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReleaseConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReleaseConfig>>;
 
     async fn delete_release_config(
         &self,
         req: crate::model::DeleteReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_compilation_results(
         &self,
         req: crate::model::ListCompilationResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCompilationResultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCompilationResultsResponse>>;
 
     async fn get_compilation_result(
         &self,
         req: crate::model::GetCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompilationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompilationResult>>;
 
     async fn create_compilation_result(
         &self,
         req: crate::model::CreateCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompilationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompilationResult>>;
 
     async fn query_compilation_result_actions(
         &self,
         req: crate::model::QueryCompilationResultActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryCompilationResultActionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryCompilationResultActionsResponse>>;
 
     async fn list_workflow_configs(
         &self,
         req: crate::model::ListWorkflowConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkflowConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkflowConfigsResponse>>;
 
     async fn get_workflow_config(
         &self,
         req: crate::model::GetWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowConfig>>;
 
     async fn create_workflow_config(
         &self,
         req: crate::model::CreateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowConfig>>;
 
     async fn update_workflow_config(
         &self,
         req: crate::model::UpdateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowConfig>>;
 
     async fn delete_workflow_config(
         &self,
         req: crate::model::DeleteWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_workflow_invocations(
         &self,
         req: crate::model::ListWorkflowInvocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkflowInvocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkflowInvocationsResponse>>;
 
     async fn get_workflow_invocation(
         &self,
         req: crate::model::GetWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowInvocation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowInvocation>>;
 
     async fn create_workflow_invocation(
         &self,
         req: crate::model::CreateWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowInvocation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowInvocation>>;
 
     async fn delete_workflow_invocation(
         &self,
         req: crate::model::DeleteWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_workflow_invocation(
         &self,
         req: crate::model::CancelWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CancelWorkflowInvocationResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CancelWorkflowInvocationResponse>>;
 
     async fn query_workflow_invocation_actions(
         &self,
         req: crate::model::QueryWorkflowInvocationActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryWorkflowInvocationActionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryWorkflowInvocationActionsResponse>>;
 
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Config>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Config>>;
 
     async fn update_config(
         &self,
         req: crate::model::UpdateConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Config>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Config>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 }
 
 /// All implementations of [super::Dataform] also implement [Dataform].
@@ -385,8 +379,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_repositories(
         &self,
         req: crate::model::ListRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRepositoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRepositoriesResponse>> {
         T::list_repositories(self, req, options).await
     }
 
@@ -394,8 +388,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_repository(
         &self,
         req: crate::model::GetRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Repository>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Repository>> {
         T::get_repository(self, req, options).await
     }
 
@@ -403,8 +397,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn create_repository(
         &self,
         req: crate::model::CreateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Repository>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Repository>> {
         T::create_repository(self, req, options).await
     }
 
@@ -412,8 +406,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn update_repository(
         &self,
         req: crate::model::UpdateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Repository>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Repository>> {
         T::update_repository(self, req, options).await
     }
 
@@ -421,8 +415,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn delete_repository(
         &self,
         req: crate::model::DeleteRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_repository(self, req, options).await
     }
 
@@ -430,8 +424,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn commit_repository_changes(
         &self,
         req: crate::model::CommitRepositoryChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitRepositoryChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitRepositoryChangesResponse>> {
         T::commit_repository_changes(self, req, options).await
     }
 
@@ -439,8 +433,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn read_repository_file(
         &self,
         req: crate::model::ReadRepositoryFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadRepositoryFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadRepositoryFileResponse>> {
         T::read_repository_file(self, req, options).await
     }
 
@@ -448,10 +442,9 @@ impl<T: super::Dataform> Dataform for T {
     async fn query_repository_directory_contents(
         &self,
         req: crate::model::QueryRepositoryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::QueryRepositoryDirectoryContentsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryRepositoryDirectoryContentsResponse>>
+    {
         T::query_repository_directory_contents(self, req, options).await
     }
 
@@ -459,8 +452,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn fetch_repository_history(
         &self,
         req: crate::model::FetchRepositoryHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchRepositoryHistoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchRepositoryHistoryResponse>> {
         T::fetch_repository_history(self, req, options).await
     }
 
@@ -468,10 +461,9 @@ impl<T: super::Dataform> Dataform for T {
     async fn compute_repository_access_token_status(
         &self,
         req: crate::model::ComputeRepositoryAccessTokenStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>>
+    {
         T::compute_repository_access_token_status(self, req, options).await
     }
 
@@ -479,8 +471,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn fetch_remote_branches(
         &self,
         req: crate::model::FetchRemoteBranchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchRemoteBranchesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchRemoteBranchesResponse>> {
         T::fetch_remote_branches(self, req, options).await
     }
 
@@ -488,8 +480,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_workspaces(
         &self,
         req: crate::model::ListWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkspacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkspacesResponse>> {
         T::list_workspaces(self, req, options).await
     }
 
@@ -497,8 +489,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_workspace(
         &self,
         req: crate::model::GetWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workspace>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workspace>> {
         T::get_workspace(self, req, options).await
     }
 
@@ -506,8 +498,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn create_workspace(
         &self,
         req: crate::model::CreateWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Workspace>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Workspace>> {
         T::create_workspace(self, req, options).await
     }
 
@@ -515,8 +507,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn delete_workspace(
         &self,
         req: crate::model::DeleteWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_workspace(self, req, options).await
     }
 
@@ -524,8 +516,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn install_npm_packages(
         &self,
         req: crate::model::InstallNpmPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstallNpmPackagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstallNpmPackagesResponse>> {
         T::install_npm_packages(self, req, options).await
     }
 
@@ -533,8 +525,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn pull_git_commits(
         &self,
         req: crate::model::PullGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PullGitCommitsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PullGitCommitsResponse>> {
         T::pull_git_commits(self, req, options).await
     }
 
@@ -542,8 +534,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn push_git_commits(
         &self,
         req: crate::model::PushGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PushGitCommitsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PushGitCommitsResponse>> {
         T::push_git_commits(self, req, options).await
     }
 
@@ -551,8 +543,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn fetch_file_git_statuses(
         &self,
         req: crate::model::FetchFileGitStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchFileGitStatusesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchFileGitStatusesResponse>> {
         T::fetch_file_git_statuses(self, req, options).await
     }
 
@@ -560,8 +552,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn fetch_git_ahead_behind(
         &self,
         req: crate::model::FetchGitAheadBehindRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchGitAheadBehindResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchGitAheadBehindResponse>> {
         T::fetch_git_ahead_behind(self, req, options).await
     }
 
@@ -569,8 +561,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn commit_workspace_changes(
         &self,
         req: crate::model::CommitWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CommitWorkspaceChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CommitWorkspaceChangesResponse>> {
         T::commit_workspace_changes(self, req, options).await
     }
 
@@ -578,8 +570,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn reset_workspace_changes(
         &self,
         req: crate::model::ResetWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResetWorkspaceChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResetWorkspaceChangesResponse>> {
         T::reset_workspace_changes(self, req, options).await
     }
 
@@ -587,8 +579,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn fetch_file_diff(
         &self,
         req: crate::model::FetchFileDiffRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchFileDiffResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchFileDiffResponse>> {
         T::fetch_file_diff(self, req, options).await
     }
 
@@ -596,8 +588,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn query_directory_contents(
         &self,
         req: crate::model::QueryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryDirectoryContentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryDirectoryContentsResponse>> {
         T::query_directory_contents(self, req, options).await
     }
 
@@ -605,8 +597,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn search_files(
         &self,
         req: crate::model::SearchFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchFilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchFilesResponse>> {
         T::search_files(self, req, options).await
     }
 
@@ -614,8 +606,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn make_directory(
         &self,
         req: crate::model::MakeDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MakeDirectoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MakeDirectoryResponse>> {
         T::make_directory(self, req, options).await
     }
 
@@ -623,8 +615,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn remove_directory(
         &self,
         req: crate::model::RemoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveDirectoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveDirectoryResponse>> {
         T::remove_directory(self, req, options).await
     }
 
@@ -632,8 +624,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn move_directory(
         &self,
         req: crate::model::MoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MoveDirectoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MoveDirectoryResponse>> {
         T::move_directory(self, req, options).await
     }
 
@@ -641,8 +633,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn read_file(
         &self,
         req: crate::model::ReadFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReadFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReadFileResponse>> {
         T::read_file(self, req, options).await
     }
 
@@ -650,8 +642,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn remove_file(
         &self,
         req: crate::model::RemoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveFileResponse>> {
         T::remove_file(self, req, options).await
     }
 
@@ -659,8 +651,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn move_file(
         &self,
         req: crate::model::MoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MoveFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MoveFileResponse>> {
         T::move_file(self, req, options).await
     }
 
@@ -668,8 +660,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn write_file(
         &self,
         req: crate::model::WriteFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WriteFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WriteFileResponse>> {
         T::write_file(self, req, options).await
     }
 
@@ -677,8 +669,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_release_configs(
         &self,
         req: crate::model::ListReleaseConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReleaseConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReleaseConfigsResponse>> {
         T::list_release_configs(self, req, options).await
     }
 
@@ -686,8 +678,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_release_config(
         &self,
         req: crate::model::GetReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReleaseConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReleaseConfig>> {
         T::get_release_config(self, req, options).await
     }
 
@@ -695,8 +687,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn create_release_config(
         &self,
         req: crate::model::CreateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReleaseConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReleaseConfig>> {
         T::create_release_config(self, req, options).await
     }
 
@@ -704,8 +696,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn update_release_config(
         &self,
         req: crate::model::UpdateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReleaseConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReleaseConfig>> {
         T::update_release_config(self, req, options).await
     }
 
@@ -713,8 +705,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn delete_release_config(
         &self,
         req: crate::model::DeleteReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_release_config(self, req, options).await
     }
 
@@ -722,8 +714,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_compilation_results(
         &self,
         req: crate::model::ListCompilationResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCompilationResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCompilationResultsResponse>> {
         T::list_compilation_results(self, req, options).await
     }
 
@@ -731,8 +723,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_compilation_result(
         &self,
         req: crate::model::GetCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompilationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompilationResult>> {
         T::get_compilation_result(self, req, options).await
     }
 
@@ -740,8 +732,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn create_compilation_result(
         &self,
         req: crate::model::CreateCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompilationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompilationResult>> {
         T::create_compilation_result(self, req, options).await
     }
 
@@ -749,9 +741,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn query_compilation_result_actions(
         &self,
         req: crate::model::QueryCompilationResultActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryCompilationResultActionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryCompilationResultActionsResponse>> {
         T::query_compilation_result_actions(self, req, options).await
     }
 
@@ -759,8 +750,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_workflow_configs(
         &self,
         req: crate::model::ListWorkflowConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkflowConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkflowConfigsResponse>> {
         T::list_workflow_configs(self, req, options).await
     }
 
@@ -768,8 +759,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_workflow_config(
         &self,
         req: crate::model::GetWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowConfig>> {
         T::get_workflow_config(self, req, options).await
     }
 
@@ -777,8 +768,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn create_workflow_config(
         &self,
         req: crate::model::CreateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowConfig>> {
         T::create_workflow_config(self, req, options).await
     }
 
@@ -786,8 +777,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn update_workflow_config(
         &self,
         req: crate::model::UpdateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowConfig>> {
         T::update_workflow_config(self, req, options).await
     }
 
@@ -795,8 +786,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn delete_workflow_config(
         &self,
         req: crate::model::DeleteWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_workflow_config(self, req, options).await
     }
 
@@ -804,8 +795,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_workflow_invocations(
         &self,
         req: crate::model::ListWorkflowInvocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkflowInvocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkflowInvocationsResponse>> {
         T::list_workflow_invocations(self, req, options).await
     }
 
@@ -813,8 +804,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_workflow_invocation(
         &self,
         req: crate::model::GetWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowInvocation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowInvocation>> {
         T::get_workflow_invocation(self, req, options).await
     }
 
@@ -822,8 +813,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn create_workflow_invocation(
         &self,
         req: crate::model::CreateWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowInvocation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowInvocation>> {
         T::create_workflow_invocation(self, req, options).await
     }
 
@@ -831,8 +822,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn delete_workflow_invocation(
         &self,
         req: crate::model::DeleteWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_workflow_invocation(self, req, options).await
     }
 
@@ -840,9 +831,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn cancel_workflow_invocation(
         &self,
         req: crate::model::CancelWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CancelWorkflowInvocationResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CancelWorkflowInvocationResponse>> {
         T::cancel_workflow_invocation(self, req, options).await
     }
 
@@ -850,9 +840,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn query_workflow_invocation_actions(
         &self,
         req: crate::model::QueryWorkflowInvocationActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryWorkflowInvocationActionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryWorkflowInvocationActionsResponse>> {
         T::query_workflow_invocation_actions(self, req, options).await
     }
 
@@ -860,8 +849,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Config>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Config>> {
         T::get_config(self, req, options).await
     }
 
@@ -869,8 +858,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn update_config(
         &self,
         req: crate::model::UpdateConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Config>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Config>> {
         T::update_config(self, req, options).await
     }
 
@@ -878,9 +867,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -888,8 +876,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -897,8 +885,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -906,8 +894,8 @@ impl<T: super::Dataform> Dataform for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -915,10 +903,9 @@ impl<T: super::Dataform> Dataform for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/dataform/v1/src/tracing.rs b/src/generated/cloud/dataform/v1/src/tracing.rs
index 42995ff8fa..858a7eccac 100644
--- a/src/generated/cloud/dataform/v1/src/tracing.rs
+++ b/src/generated/cloud/dataform/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_repositories(
         &self,
         req: crate::model::ListRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRepositoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRepositoriesResponse>> {
         self.inner.list_repositories(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_repository(
         &self,
         req: crate::model::GetRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Repository>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Repository>> {
         self.inner.get_repository(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_repository(
         &self,
         req: crate::model::CreateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Repository>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Repository>> {
         self.inner.create_repository(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_repository(
         &self,
         req: crate::model::UpdateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Repository>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Repository>> {
         self.inner.update_repository(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_repository(
         &self,
         req: crate::model::DeleteRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_repository(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn commit_repository_changes(
         &self,
         req: crate::model::CommitRepositoryChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitRepositoryChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitRepositoryChangesResponse>> {
         self.inner.commit_repository_changes(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn read_repository_file(
         &self,
         req: crate::model::ReadRepositoryFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadRepositoryFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadRepositoryFileResponse>> {
         self.inner.read_repository_file(req, options).await
     }
 
@@ -104,9 +104,8 @@ where
     async fn query_repository_directory_contents(
         &self,
         req: crate::model::QueryRepositoryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryRepositoryDirectoryContentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryRepositoryDirectoryContentsResponse>> {
         self.inner
             .query_repository_directory_contents(req, options)
             .await
@@ -116,8 +115,8 @@ where
     async fn fetch_repository_history(
         &self,
         req: crate::model::FetchRepositoryHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchRepositoryHistoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchRepositoryHistoryResponse>> {
         self.inner.fetch_repository_history(req, options).await
     }
 
@@ -125,9 +124,8 @@ where
     async fn compute_repository_access_token_status(
         &self,
         req: crate::model::ComputeRepositoryAccessTokenStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>> {
         self.inner
             .compute_repository_access_token_status(req, options)
             .await
@@ -137,8 +135,8 @@ where
     async fn fetch_remote_branches(
         &self,
         req: crate::model::FetchRemoteBranchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchRemoteBranchesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchRemoteBranchesResponse>> {
         self.inner.fetch_remote_branches(req, options).await
     }
 
@@ -146,8 +144,8 @@ where
     async fn list_workspaces(
         &self,
         req: crate::model::ListWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkspacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkspacesResponse>> {
         self.inner.list_workspaces(req, options).await
     }
 
@@ -155,8 +153,8 @@ where
     async fn get_workspace(
         &self,
         req: crate::model::GetWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workspace>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workspace>> {
         self.inner.get_workspace(req, options).await
     }
 
@@ -164,8 +162,8 @@ where
     async fn create_workspace(
         &self,
         req: crate::model::CreateWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workspace>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workspace>> {
         self.inner.create_workspace(req, options).await
     }
 
@@ -173,8 +171,8 @@ where
     async fn delete_workspace(
         &self,
         req: crate::model::DeleteWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_workspace(req, options).await
     }
 
@@ -182,8 +180,8 @@ where
     async fn install_npm_packages(
         &self,
         req: crate::model::InstallNpmPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstallNpmPackagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstallNpmPackagesResponse>> {
         self.inner.install_npm_packages(req, options).await
     }
 
@@ -191,8 +189,8 @@ where
     async fn pull_git_commits(
         &self,
         req: crate::model::PullGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PullGitCommitsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PullGitCommitsResponse>> {
         self.inner.pull_git_commits(req, options).await
     }
 
@@ -200,8 +198,8 @@ where
     async fn push_git_commits(
         &self,
         req: crate::model::PushGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PushGitCommitsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PushGitCommitsResponse>> {
         self.inner.push_git_commits(req, options).await
     }
 
@@ -209,8 +207,8 @@ where
     async fn fetch_file_git_statuses(
         &self,
         req: crate::model::FetchFileGitStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchFileGitStatusesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchFileGitStatusesResponse>> {
         self.inner.fetch_file_git_statuses(req, options).await
     }
 
@@ -218,8 +216,8 @@ where
     async fn fetch_git_ahead_behind(
         &self,
         req: crate::model::FetchGitAheadBehindRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchGitAheadBehindResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchGitAheadBehindResponse>> {
         self.inner.fetch_git_ahead_behind(req, options).await
     }
 
@@ -227,8 +225,8 @@ where
     async fn commit_workspace_changes(
         &self,
         req: crate::model::CommitWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitWorkspaceChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitWorkspaceChangesResponse>> {
         self.inner.commit_workspace_changes(req, options).await
     }
 
@@ -236,8 +234,8 @@ where
     async fn reset_workspace_changes(
         &self,
         req: crate::model::ResetWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResetWorkspaceChangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResetWorkspaceChangesResponse>> {
         self.inner.reset_workspace_changes(req, options).await
     }
 
@@ -245,8 +243,8 @@ where
     async fn fetch_file_diff(
         &self,
         req: crate::model::FetchFileDiffRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchFileDiffResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchFileDiffResponse>> {
         self.inner.fetch_file_diff(req, options).await
     }
 
@@ -254,8 +252,8 @@ where
     async fn query_directory_contents(
         &self,
         req: crate::model::QueryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryDirectoryContentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryDirectoryContentsResponse>> {
         self.inner.query_directory_contents(req, options).await
     }
 
@@ -263,8 +261,8 @@ where
     async fn search_files(
         &self,
         req: crate::model::SearchFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchFilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchFilesResponse>> {
         self.inner.search_files(req, options).await
     }
 
@@ -272,8 +270,8 @@ where
     async fn make_directory(
         &self,
         req: crate::model::MakeDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MakeDirectoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MakeDirectoryResponse>> {
         self.inner.make_directory(req, options).await
     }
 
@@ -281,8 +279,8 @@ where
     async fn remove_directory(
         &self,
         req: crate::model::RemoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveDirectoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveDirectoryResponse>> {
         self.inner.remove_directory(req, options).await
     }
 
@@ -290,8 +288,8 @@ where
     async fn move_directory(
         &self,
         req: crate::model::MoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MoveDirectoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MoveDirectoryResponse>> {
         self.inner.move_directory(req, options).await
     }
 
@@ -299,8 +297,8 @@ where
     async fn read_file(
         &self,
         req: crate::model::ReadFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadFileResponse>> {
         self.inner.read_file(req, options).await
     }
 
@@ -308,8 +306,8 @@ where
     async fn remove_file(
         &self,
         req: crate::model::RemoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveFileResponse>> {
         self.inner.remove_file(req, options).await
     }
 
@@ -317,8 +315,8 @@ where
     async fn move_file(
         &self,
         req: crate::model::MoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MoveFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MoveFileResponse>> {
         self.inner.move_file(req, options).await
     }
 
@@ -326,8 +324,8 @@ where
     async fn write_file(
         &self,
         req: crate::model::WriteFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteFileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteFileResponse>> {
         self.inner.write_file(req, options).await
     }
 
@@ -335,8 +333,8 @@ where
     async fn list_release_configs(
         &self,
         req: crate::model::ListReleaseConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReleaseConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReleaseConfigsResponse>> {
         self.inner.list_release_configs(req, options).await
     }
 
@@ -344,8 +342,8 @@ where
     async fn get_release_config(
         &self,
         req: crate::model::GetReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReleaseConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReleaseConfig>> {
         self.inner.get_release_config(req, options).await
     }
 
@@ -353,8 +351,8 @@ where
     async fn create_release_config(
         &self,
         req: crate::model::CreateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReleaseConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReleaseConfig>> {
         self.inner.create_release_config(req, options).await
     }
 
@@ -362,8 +360,8 @@ where
     async fn update_release_config(
         &self,
         req: crate::model::UpdateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReleaseConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReleaseConfig>> {
         self.inner.update_release_config(req, options).await
     }
 
@@ -371,8 +369,8 @@ where
     async fn delete_release_config(
         &self,
         req: crate::model::DeleteReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_release_config(req, options).await
     }
 
@@ -380,8 +378,8 @@ where
     async fn list_compilation_results(
         &self,
         req: crate::model::ListCompilationResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCompilationResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCompilationResultsResponse>> {
         self.inner.list_compilation_results(req, options).await
     }
 
@@ -389,8 +387,8 @@ where
     async fn get_compilation_result(
         &self,
         req: crate::model::GetCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompilationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompilationResult>> {
         self.inner.get_compilation_result(req, options).await
     }
 
@@ -398,8 +396,8 @@ where
     async fn create_compilation_result(
         &self,
         req: crate::model::CreateCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompilationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompilationResult>> {
         self.inner.create_compilation_result(req, options).await
     }
 
@@ -407,8 +405,8 @@ where
     async fn query_compilation_result_actions(
         &self,
         req: crate::model::QueryCompilationResultActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryCompilationResultActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryCompilationResultActionsResponse>> {
         self.inner
             .query_compilation_result_actions(req, options)
             .await
@@ -418,8 +416,8 @@ where
     async fn list_workflow_configs(
         &self,
         req: crate::model::ListWorkflowConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkflowConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkflowConfigsResponse>> {
         self.inner.list_workflow_configs(req, options).await
     }
 
@@ -427,8 +425,8 @@ where
     async fn get_workflow_config(
         &self,
         req: crate::model::GetWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowConfig>> {
         self.inner.get_workflow_config(req, options).await
     }
 
@@ -436,8 +434,8 @@ where
     async fn create_workflow_config(
         &self,
         req: crate::model::CreateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowConfig>> {
         self.inner.create_workflow_config(req, options).await
     }
 
@@ -445,8 +443,8 @@ where
     async fn update_workflow_config(
         &self,
         req: crate::model::UpdateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowConfig>> {
         self.inner.update_workflow_config(req, options).await
     }
 
@@ -454,8 +452,8 @@ where
     async fn delete_workflow_config(
         &self,
         req: crate::model::DeleteWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_workflow_config(req, options).await
     }
 
@@ -463,8 +461,8 @@ where
     async fn list_workflow_invocations(
         &self,
         req: crate::model::ListWorkflowInvocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkflowInvocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkflowInvocationsResponse>> {
         self.inner.list_workflow_invocations(req, options).await
     }
 
@@ -472,8 +470,8 @@ where
     async fn get_workflow_invocation(
         &self,
         req: crate::model::GetWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowInvocation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowInvocation>> {
         self.inner.get_workflow_invocation(req, options).await
     }
 
@@ -481,8 +479,8 @@ where
     async fn create_workflow_invocation(
         &self,
         req: crate::model::CreateWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowInvocation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowInvocation>> {
         self.inner.create_workflow_invocation(req, options).await
     }
 
@@ -490,8 +488,8 @@ where
     async fn delete_workflow_invocation(
         &self,
         req: crate::model::DeleteWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_workflow_invocation(req, options).await
     }
 
@@ -499,8 +497,8 @@ where
     async fn cancel_workflow_invocation(
         &self,
         req: crate::model::CancelWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CancelWorkflowInvocationResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CancelWorkflowInvocationResponse>> {
         self.inner.cancel_workflow_invocation(req, options).await
     }
 
@@ -508,8 +506,8 @@ where
     async fn query_workflow_invocation_actions(
         &self,
         req: crate::model::QueryWorkflowInvocationActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryWorkflowInvocationActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryWorkflowInvocationActionsResponse>> {
         self.inner
             .query_workflow_invocation_actions(req, options)
             .await
@@ -519,8 +517,8 @@ where
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Config>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Config>> {
         self.inner.get_config(req, options).await
     }
 
@@ -528,8 +526,8 @@ where
     async fn update_config(
         &self,
         req: crate::model::UpdateConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Config>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Config>> {
         self.inner.update_config(req, options).await
     }
 
@@ -537,8 +535,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -546,8 +544,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -555,8 +553,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -564,8 +562,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -573,9 +571,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 }
diff --git a/src/generated/cloud/dataform/v1/src/transport.rs b/src/generated/cloud/dataform/v1/src/transport.rs
index 589a0a0b47..c295b05dab 100644
--- a/src/generated/cloud/dataform/v1/src/transport.rs
+++ b/src/generated/cloud/dataform/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Dataform](super::stub::Dataform) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Dataform {
 }
 
 impl Dataform {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Dataform for Dataform {
     async fn list_repositories(
         &self,
         req: crate::model::ListRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRepositoriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRepositoriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_repository(
         &self,
         req: crate::model::GetRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Repository>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Repository>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Dataform for Dataform {
     async fn create_repository(
         &self,
         req: crate::model::CreateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Repository>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Repository>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::Dataform for Dataform {
     async fn update_repository(
         &self,
         req: crate::model::UpdateRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Repository>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Repository>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::Dataform for Dataform {
     async fn delete_repository(
         &self,
         req: crate::model::DeleteRepositoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -362,9 +362,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -373,24 +373,25 @@ impl super::stub::Dataform for Dataform {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn commit_repository_changes(
         &self,
         req: crate::model::CommitRepositoryChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitRepositoryChangesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitRepositoryChangesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431,9 +432,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,13 +449,13 @@ impl super::stub::Dataform for Dataform {
     async fn read_repository_file(
         &self,
         req: crate::model::ReadRepositoryFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadRepositoryFileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadRepositoryFileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -497,9 +498,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -514,14 +515,13 @@ impl super::stub::Dataform for Dataform {
     async fn query_repository_directory_contents(
         &self,
         req: crate::model::QueryRepositoryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryRepositoryDirectoryContentsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryRepositoryDirectoryContentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -566,9 +566,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -583,13 +583,13 @@ impl super::stub::Dataform for Dataform {
     async fn fetch_repository_history(
         &self,
         req: crate::model::FetchRepositoryHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchRepositoryHistoryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchRepositoryHistoryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -632,9 +632,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -649,14 +649,13 @@ impl super::stub::Dataform for Dataform {
     async fn compute_repository_access_token_status(
         &self,
         req: crate::model::ComputeRepositoryAccessTokenStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ComputeRepositoryAccessTokenStatusResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -697,9 +696,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -714,13 +713,13 @@ impl super::stub::Dataform for Dataform {
     async fn fetch_remote_branches(
         &self,
         req: crate::model::FetchRemoteBranchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchRemoteBranchesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchRemoteBranchesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -761,9 +760,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -778,13 +777,13 @@ impl super::stub::Dataform for Dataform {
     async fn list_workspaces(
         &self,
         req: crate::model::ListWorkspacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkspacesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkspacesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -829,9 +828,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -846,13 +845,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_workspace(
         &self,
         req: crate::model::GetWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workspace>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workspace>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -897,9 +896,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -914,13 +913,13 @@ impl super::stub::Dataform for Dataform {
     async fn create_workspace(
         &self,
         req: crate::model::CreateWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Workspace>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Workspace>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -962,9 +961,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -979,13 +978,13 @@ impl super::stub::Dataform for Dataform {
     async fn delete_workspace(
         &self,
         req: crate::model::DeleteWorkspaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1030,9 +1029,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1041,24 +1040,25 @@ impl super::stub::Dataform for Dataform {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn install_npm_packages(
         &self,
         req: crate::model::InstallNpmPackagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstallNpmPackagesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstallNpmPackagesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1103,9 +1103,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1120,13 +1120,13 @@ impl super::stub::Dataform for Dataform {
     async fn pull_git_commits(
         &self,
         req: crate::model::PullGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PullGitCommitsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PullGitCommitsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1171,9 +1171,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1188,13 +1188,13 @@ impl super::stub::Dataform for Dataform {
     async fn push_git_commits(
         &self,
         req: crate::model::PushGitCommitsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PushGitCommitsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PushGitCommitsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1239,9 +1239,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1256,13 +1256,13 @@ impl super::stub::Dataform for Dataform {
     async fn fetch_file_git_statuses(
         &self,
         req: crate::model::FetchFileGitStatusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchFileGitStatusesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchFileGitStatusesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1307,9 +1307,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1324,13 +1324,13 @@ impl super::stub::Dataform for Dataform {
     async fn fetch_git_ahead_behind(
         &self,
         req: crate::model::FetchGitAheadBehindRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchGitAheadBehindResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchGitAheadBehindResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1376,9 +1376,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1393,13 +1393,13 @@ impl super::stub::Dataform for Dataform {
     async fn commit_workspace_changes(
         &self,
         req: crate::model::CommitWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CommitWorkspaceChangesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CommitWorkspaceChangesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1444,9 +1444,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1461,13 +1461,13 @@ impl super::stub::Dataform for Dataform {
     async fn reset_workspace_changes(
         &self,
         req: crate::model::ResetWorkspaceChangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResetWorkspaceChangesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResetWorkspaceChangesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1512,9 +1512,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1529,13 +1529,13 @@ impl super::stub::Dataform for Dataform {
     async fn fetch_file_diff(
         &self,
         req: crate::model::FetchFileDiffRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchFileDiffResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchFileDiffResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1581,9 +1581,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1598,13 +1598,13 @@ impl super::stub::Dataform for Dataform {
     async fn query_directory_contents(
         &self,
         req: crate::model::QueryDirectoryContentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryDirectoryContentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryDirectoryContentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1652,9 +1652,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1669,13 +1669,13 @@ impl super::stub::Dataform for Dataform {
     async fn search_files(
         &self,
         req: crate::model::SearchFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchFilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchFilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1723,9 +1723,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1740,13 +1740,13 @@ impl super::stub::Dataform for Dataform {
     async fn make_directory(
         &self,
         req: crate::model::MakeDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MakeDirectoryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MakeDirectoryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1791,9 +1791,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1808,13 +1808,13 @@ impl super::stub::Dataform for Dataform {
     async fn remove_directory(
         &self,
         req: crate::model::RemoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveDirectoryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveDirectoryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1859,9 +1859,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1876,13 +1876,13 @@ impl super::stub::Dataform for Dataform {
     async fn move_directory(
         &self,
         req: crate::model::MoveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MoveDirectoryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MoveDirectoryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1927,9 +1927,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1944,13 +1944,13 @@ impl super::stub::Dataform for Dataform {
     async fn read_file(
         &self,
         req: crate::model::ReadFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReadFileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReadFileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1997,9 +1997,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2014,13 +2014,13 @@ impl super::stub::Dataform for Dataform {
     async fn remove_file(
         &self,
         req: crate::model::RemoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveFileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveFileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2065,9 +2065,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2082,13 +2082,13 @@ impl super::stub::Dataform for Dataform {
     async fn move_file(
         &self,
         req: crate::model::MoveFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MoveFileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MoveFileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2133,9 +2133,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2150,13 +2150,13 @@ impl super::stub::Dataform for Dataform {
     async fn write_file(
         &self,
         req: crate::model::WriteFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WriteFileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WriteFileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2201,9 +2201,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2218,13 +2218,13 @@ impl super::stub::Dataform for Dataform {
     async fn list_release_configs(
         &self,
         req: crate::model::ListReleaseConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReleaseConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReleaseConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2267,9 +2267,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2284,13 +2284,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_release_config(
         &self,
         req: crate::model::GetReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReleaseConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReleaseConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2335,9 +2335,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2352,13 +2352,13 @@ impl super::stub::Dataform for Dataform {
     async fn create_release_config(
         &self,
         req: crate::model::CreateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReleaseConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReleaseConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2400,9 +2400,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2417,13 +2417,13 @@ impl super::stub::Dataform for Dataform {
     async fn update_release_config(
         &self,
         req: crate::model::UpdateReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReleaseConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReleaseConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2486,9 +2486,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2503,13 +2503,13 @@ impl super::stub::Dataform for Dataform {
     async fn delete_release_config(
         &self,
         req: crate::model::DeleteReleaseConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2554,9 +2554,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2565,24 +2565,25 @@ impl super::stub::Dataform for Dataform {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_compilation_results(
         &self,
         req: crate::model::ListCompilationResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCompilationResultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCompilationResultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2627,9 +2628,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2644,13 +2645,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_compilation_result(
         &self,
         req: crate::model::GetCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompilationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompilationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2695,9 +2696,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2712,13 +2713,13 @@ impl super::stub::Dataform for Dataform {
     async fn create_compilation_result(
         &self,
         req: crate::model::CreateCompilationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompilationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompilationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2759,9 +2760,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2776,13 +2777,13 @@ impl super::stub::Dataform for Dataform {
     async fn query_compilation_result_actions(
         &self,
         req: crate::model::QueryCompilationResultActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryCompilationResultActionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryCompilationResultActionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2830,9 +2831,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2847,13 +2848,13 @@ impl super::stub::Dataform for Dataform {
     async fn list_workflow_configs(
         &self,
         req: crate::model::ListWorkflowConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkflowConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkflowConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2896,9 +2897,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2913,13 +2914,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_workflow_config(
         &self,
         req: crate::model::GetWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2964,9 +2965,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2981,13 +2982,13 @@ impl super::stub::Dataform for Dataform {
     async fn create_workflow_config(
         &self,
         req: crate::model::CreateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3029,9 +3030,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3046,13 +3047,13 @@ impl super::stub::Dataform for Dataform {
     async fn update_workflow_config(
         &self,
         req: crate::model::UpdateWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3115,9 +3116,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3132,13 +3133,13 @@ impl super::stub::Dataform for Dataform {
     async fn delete_workflow_config(
         &self,
         req: crate::model::DeleteWorkflowConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3183,9 +3184,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3194,24 +3195,25 @@ impl super::stub::Dataform for Dataform {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_workflow_invocations(
         &self,
         req: crate::model::ListWorkflowInvocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkflowInvocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkflowInvocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3256,9 +3258,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3273,13 +3275,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_workflow_invocation(
         &self,
         req: crate::model::GetWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowInvocation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowInvocation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3324,9 +3326,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3341,13 +3343,13 @@ impl super::stub::Dataform for Dataform {
     async fn create_workflow_invocation(
         &self,
         req: crate::model::CreateWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowInvocation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowInvocation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3388,9 +3390,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3405,13 +3407,13 @@ impl super::stub::Dataform for Dataform {
     async fn delete_workflow_invocation(
         &self,
         req: crate::model::DeleteWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3456,9 +3458,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3467,24 +3469,25 @@ impl super::stub::Dataform for Dataform {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_workflow_invocation(
         &self,
         req: crate::model::CancelWorkflowInvocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CancelWorkflowInvocationResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CancelWorkflowInvocationResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3529,9 +3532,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3546,13 +3549,13 @@ impl super::stub::Dataform for Dataform {
     async fn query_workflow_invocation_actions(
         &self,
         req: crate::model::QueryWorkflowInvocationActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryWorkflowInvocationActionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryWorkflowInvocationActionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3599,9 +3602,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3616,13 +3619,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Config>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Config>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3661,9 +3664,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3678,13 +3681,13 @@ impl super::stub::Dataform for Dataform {
     async fn update_config(
         &self,
         req: crate::model::UpdateConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Config>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Config>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3741,9 +3744,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3758,13 +3761,13 @@ impl super::stub::Dataform for Dataform {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3794,9 +3797,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3811,13 +3814,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3854,9 +3857,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3871,13 +3874,13 @@ impl super::stub::Dataform for Dataform {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3959,9 +3962,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3976,13 +3979,13 @@ impl super::stub::Dataform for Dataform {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4088,9 +4091,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4105,14 +4108,13 @@ impl super::stub::Dataform for Dataform {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4194,9 +4196,9 @@ impl super::stub::Dataform for Dataform {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/datafusion/v1/Cargo.toml b/src/generated/cloud/datafusion/v1/Cargo.toml
index 2e8bb8b535..fd6f81f0b5 100644
--- a/src/generated/cloud/datafusion/v1/Cargo.toml
+++ b/src/generated/cloud/datafusion/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/datafusion/v1/src/builder.rs b/src/generated/cloud/datafusion/v1/src/builder.rs
index 58eb27ae81..a82d4d9b88 100644
--- a/src/generated/cloud/datafusion/v1/src/builder.rs
+++ b/src/generated/cloud/datafusion/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod data_fusion {
     /// A builder for [DataFusion][crate::client::DataFusion].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datafusion_v1::*;
     /// # use builder::data_fusion::ClientBuilder;
     /// # use client::DataFusion;
@@ -30,19 +30,18 @@ pub mod data_fusion {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataFusion;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataFusion;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod data_fusion {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataFusion>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod data_fusion {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::ListAvailableVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod data_fusion {
             (*self.0.stub)
                 .list_available_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAvailableVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAvailableVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod data_fusion {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAvailableVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -178,8 +179,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAvailableVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAvailableVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -189,8 +190,8 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -221,7 +222,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -231,13 +232,13 @@ pub mod data_fusion {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -246,15 +247,17 @@ pub mod data_fusion {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -292,8 +295,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -303,7 +306,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -331,7 +334,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -341,7 +344,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -354,8 +357,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -365,7 +368,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -394,7 +397,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -409,7 +412,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -426,7 +429,7 @@ pub mod data_fusion {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -489,8 +492,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -500,7 +503,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -529,7 +532,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -544,7 +547,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -556,7 +559,7 @@ pub mod data_fusion {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -593,8 +596,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -604,7 +607,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -633,7 +636,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -648,7 +651,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -665,7 +668,7 @@ pub mod data_fusion {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -734,8 +737,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -745,7 +748,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::RestartInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -774,7 +777,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -789,7 +792,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .restart_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restart_instance`.
@@ -806,7 +809,7 @@ pub mod data_fusion {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -843,8 +846,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestartInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestartInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -854,8 +857,8 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -891,7 +894,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -901,15 +904,15 @@ pub mod data_fusion {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -918,17 +921,17 @@ pub mod data_fusion {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -964,8 +967,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -975,7 +978,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1006,7 +1009,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1016,7 +1019,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1027,8 +1030,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1038,7 +1041,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1071,7 +1074,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1081,7 +1084,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1092,8 +1095,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1103,7 +1106,7 @@ pub mod data_fusion {
     /// # Example
     /// ```
     /// # use google_cloud_datafusion_v1::builder::data_fusion::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datafusion_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1136,7 +1139,7 @@ pub mod data_fusion {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1146,7 +1149,7 @@ pub mod data_fusion {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1157,8 +1160,8 @@ pub mod data_fusion {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/datafusion/v1/src/client.rs b/src/generated/cloud/datafusion/v1/src/client.rs
index 3b9486e275..8fe0a62133 100644
--- a/src/generated/cloud/datafusion/v1/src/client.rs
+++ b/src/generated/cloud/datafusion/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_datafusion_v1::client::DataFusion;
 /// let client = DataFusion::builder().build().await?;
 /// // use `client` to make requests to the Cloud Data Fusion API.
@@ -68,13 +68,13 @@ impl DataFusion {
     /// Returns a builder for [DataFusion].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datafusion_v1::client::DataFusion;
     /// let client = DataFusion::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_fusion::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::data_fusion::client::Factory)
+        crate::new_client_builder(super::builder::data_fusion::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +92,14 @@ impl DataFusion {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataFusion>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataFusion>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -108,13 +108,13 @@ impl DataFusion {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataFusion> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataFusion> {
         super::transport::DataFusion::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataFusion> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataFusion> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataFusion::new)
diff --git a/src/generated/cloud/datafusion/v1/src/lib.rs b/src/generated/cloud/datafusion/v1/src/lib.rs
index 9ff64e5bf9..e7565bb705 100644
--- a/src/generated/cloud/datafusion/v1/src/lib.rs
+++ b/src/generated/cloud/datafusion/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/datafusion/v1/src/model.rs b/src/generated/cloud/datafusion/v1/src/model.rs
index 542345f708..34050e57a8 100644
--- a/src/generated/cloud/datafusion/v1/src/model.rs
+++ b/src/generated/cloud/datafusion/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -1959,7 +1959,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2116,7 +2116,7 @@ impl wkt::message::Message for ListAvailableVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAvailableVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAvailableVersionsResponse {
     type PageItem = crate::model::Version;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/datafusion/v1/src/stub.rs b/src/generated/cloud/datafusion/v1/src/stub.rs
index cf9bb64b6f..67c9e4a1ab 100644
--- a/src/generated/cloud/datafusion/v1/src/stub.rs
+++ b/src/generated/cloud/datafusion/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn list_available_versions(
         &self,
         _req: crate::model::ListAvailableVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAvailableVersionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAvailableVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,9 +53,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,10 +64,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -77,9 +74,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,9 +85,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +96,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +107,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn restart_instance(
         &self,
         _req: crate::model::RestartInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,10 +118,10 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -134,9 +131,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,8 +142,8 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -154,8 +151,8 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -165,9 +162,9 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -176,8 +173,8 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/datafusion/v1/src/stub/dynamic.rs b/src/generated/cloud/datafusion/v1/src/stub/dynamic.rs
index 95d886bb9c..eef8edb9e1 100644
--- a/src/generated/cloud/datafusion/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/datafusion/v1/src/stub/dynamic.rs
@@ -20,80 +20,78 @@ pub trait DataFusion: std::fmt::Debug + Send + Sync {
     async fn list_available_versions(
         &self,
         req: crate::model::ListAvailableVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAvailableVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAvailableVersionsResponse>>;
 
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataFusion] also implement [DataFusion].
@@ -103,8 +101,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn list_available_versions(
         &self,
         req: crate::model::ListAvailableVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAvailableVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAvailableVersionsResponse>> {
         T::list_available_versions(self, req, options).await
     }
 
@@ -112,8 +110,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -121,8 +119,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -130,8 +128,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -139,8 +137,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -148,8 +146,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -157,8 +155,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restart_instance(self, req, options).await
     }
 
@@ -166,10 +164,9 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -177,8 +174,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -186,8 +183,8 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -195,22 +192,22 @@ impl<T: super::DataFusion> DataFusion for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/datafusion/v1/src/tracing.rs b/src/generated/cloud/datafusion/v1/src/tracing.rs
index bacb7bc541..e806308fbf 100644
--- a/src/generated/cloud/datafusion/v1/src/tracing.rs
+++ b/src/generated/cloud/datafusion/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_available_versions(
         &self,
         req: crate::model::ListAvailableVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAvailableVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAvailableVersionsResponse>> {
         self.inner.list_available_versions(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restart_instance(req, options).await
     }
 
@@ -104,9 +104,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -114,8 +113,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -123,8 +122,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -132,22 +131,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/datafusion/v1/src/transport.rs b/src/generated/cloud/datafusion/v1/src/transport.rs
index ad96c44379..2a8ab8e471 100644
--- a/src/generated/cloud/datafusion/v1/src/transport.rs
+++ b/src/generated/cloud/datafusion/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataFusion](super::stub::DataFusion) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataFusion {
 }
 
 impl DataFusion {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn list_available_versions(
         &self,
         req: crate::model::ListAvailableVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAvailableVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAvailableVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89,9 +89,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -106,13 +106,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -153,9 +153,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -170,13 +170,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -278,9 +278,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -295,13 +295,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -342,9 +342,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -359,13 +359,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -424,9 +424,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -441,13 +441,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn restart_instance(
         &self,
         req: crate::model::RestartInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -488,9 +488,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -505,14 +505,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -554,9 +553,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -571,13 +570,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -618,9 +617,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -635,13 +634,13 @@ impl super::stub::DataFusion for DataFusion {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -682,9 +681,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -693,24 +692,25 @@ impl super::stub::DataFusion for DataFusion {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -751,9 +751,9 @@ impl super::stub::DataFusion for DataFusion {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -762,25 +762,26 @@ impl super::stub::DataFusion for DataFusion {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/dataplex/v1/Cargo.toml b/src/generated/cloud/dataplex/v1/Cargo.toml
index e6f3354a22..837a893523 100644
--- a/src/generated/cloud/dataplex/v1/Cargo.toml
+++ b/src/generated/cloud/dataplex/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/dataplex/v1/src/builder.rs b/src/generated/cloud/dataplex/v1/src/builder.rs
index d1e5427960..2e26c8d0cd 100644
--- a/src/generated/cloud/dataplex/v1/src/builder.rs
+++ b/src/generated/cloud/dataplex/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod business_glossary_service {
     /// A builder for [BusinessGlossaryService][crate::client::BusinessGlossaryService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::business_glossary_service::ClientBuilder;
     /// # use client::BusinessGlossaryService;
@@ -30,19 +30,18 @@ pub mod business_glossary_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BusinessGlossaryService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BusinessGlossaryService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod business_glossary_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BusinessGlossaryService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod business_glossary_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::CreateGlossary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -105,7 +104,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -120,7 +119,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .create_glossary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_glossary`.
@@ -137,7 +136,7 @@ pub mod business_glossary_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -210,8 +209,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGlossary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGlossary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -221,7 +220,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::UpdateGlossary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -250,7 +249,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -265,7 +264,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .update_glossary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_glossary`.
@@ -282,7 +281,7 @@ pub mod business_glossary_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -361,8 +360,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGlossary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGlossary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -372,7 +371,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::DeleteGlossary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -401,7 +400,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -416,7 +415,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .delete_glossary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_glossary`.
@@ -428,7 +427,7 @@ pub mod business_glossary_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -471,8 +470,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGlossary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGlossary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -482,7 +481,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::GetGlossary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -510,7 +509,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -520,7 +519,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .get_glossary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGlossaryRequest::name].
@@ -533,8 +532,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGlossary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGlossary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -544,8 +543,8 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::ListGlossaries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -576,7 +575,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -586,14 +585,16 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .list_glossaries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGlossariesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListGlossariesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -601,15 +602,17 @@ pub mod business_glossary_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGlossariesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGlossariesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -647,8 +650,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGlossaries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGlossaries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -658,7 +661,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::CreateGlossaryCategory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -689,7 +692,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -699,7 +702,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .create_glossary_category(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateGlossaryCategoryRequest::parent].
@@ -742,8 +745,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGlossaryCategory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGlossaryCategory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -753,7 +756,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::UpdateGlossaryCategory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -784,7 +787,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -794,7 +797,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .update_glossary_category(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [category][crate::model::UpdateGlossaryCategoryRequest::category].
@@ -843,8 +846,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGlossaryCategory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGlossaryCategory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -854,7 +857,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::DeleteGlossaryCategory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -885,7 +888,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -895,7 +898,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .delete_glossary_category(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteGlossaryCategoryRequest::name].
@@ -908,8 +911,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGlossaryCategory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGlossaryCategory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -919,7 +922,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::GetGlossaryCategory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -950,7 +953,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -960,7 +963,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .get_glossary_category(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGlossaryCategoryRequest::name].
@@ -973,8 +976,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGlossaryCategory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGlossaryCategory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -984,8 +987,8 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::ListGlossaryCategories;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1019,7 +1022,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1029,15 +1032,15 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .list_glossary_categories(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListGlossaryCategoriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1046,17 +1049,17 @@ pub mod business_glossary_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListGlossaryCategoriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1094,8 +1097,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGlossaryCategories {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGlossaryCategories {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1105,7 +1108,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::CreateGlossaryTerm;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1136,7 +1139,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1146,7 +1149,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .create_glossary_term(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateGlossaryTermRequest::parent].
@@ -1189,8 +1192,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGlossaryTerm {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGlossaryTerm {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1200,7 +1203,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::UpdateGlossaryTerm;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1231,7 +1234,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1241,7 +1244,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .update_glossary_term(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [term][crate::model::UpdateGlossaryTermRequest::term].
@@ -1290,8 +1293,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGlossaryTerm {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGlossaryTerm {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1301,7 +1304,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::DeleteGlossaryTerm;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1332,7 +1335,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1342,7 +1345,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .delete_glossary_term(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteGlossaryTermRequest::name].
@@ -1355,8 +1358,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGlossaryTerm {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGlossaryTerm {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1366,7 +1369,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::GetGlossaryTerm;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1394,7 +1397,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1404,7 +1407,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .get_glossary_term(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGlossaryTermRequest::name].
@@ -1417,8 +1420,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGlossaryTerm {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGlossaryTerm {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1428,8 +1431,8 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::ListGlossaryTerms;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1463,7 +1466,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1473,14 +1476,16 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .list_glossary_terms(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGlossaryTermsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListGlossaryTermsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1488,15 +1493,17 @@ pub mod business_glossary_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGlossaryTermsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGlossaryTermsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1534,8 +1541,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGlossaryTerms {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGlossaryTerms {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1545,8 +1552,8 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1580,7 +1587,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1590,15 +1597,15 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1607,17 +1614,17 @@ pub mod business_glossary_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1647,8 +1654,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1658,7 +1665,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1689,7 +1696,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1699,7 +1706,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1710,8 +1717,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1721,7 +1728,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1752,7 +1759,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1762,7 +1769,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1815,8 +1822,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1826,7 +1833,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1857,7 +1864,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1867,7 +1874,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1898,8 +1905,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1909,7 +1916,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1942,7 +1949,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1952,7 +1959,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1978,8 +1985,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1989,8 +1996,8 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2026,7 +2033,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2036,15 +2043,15 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2053,17 +2060,17 @@ pub mod business_glossary_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2099,8 +2106,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2110,7 +2117,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2141,7 +2148,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2151,7 +2158,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2162,8 +2169,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2173,7 +2180,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2206,7 +2213,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2216,7 +2223,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2227,8 +2234,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2238,7 +2245,7 @@ pub mod business_glossary_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::business_glossary_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2271,7 +2278,7 @@ pub mod business_glossary_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2281,7 +2288,7 @@ pub mod business_glossary_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2292,8 +2299,8 @@ pub mod business_glossary_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2305,7 +2312,7 @@ pub mod catalog_service {
     /// A builder for [CatalogService][crate::client::CatalogService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::catalog_service::ClientBuilder;
     /// # use client::CatalogService;
@@ -2315,19 +2322,18 @@ pub mod catalog_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CatalogService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CatalogService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2338,7 +2344,7 @@ pub mod catalog_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CatalogService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2351,7 +2357,7 @@ pub mod catalog_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2361,7 +2367,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CreateEntryType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2390,7 +2396,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2405,7 +2411,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .create_entry_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_entry_type`.
@@ -2422,7 +2428,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2495,8 +2501,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntryType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntryType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2506,7 +2512,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::UpdateEntryType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2535,7 +2541,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2550,7 +2556,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .update_entry_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_entry_type`.
@@ -2567,7 +2573,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2646,8 +2652,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntryType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntryType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2657,7 +2663,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::DeleteEntryType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2686,7 +2692,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2701,7 +2707,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .delete_entry_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_entry_type`.
@@ -2713,7 +2719,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2756,8 +2762,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntryType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntryType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2767,8 +2773,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListEntryTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2799,7 +2805,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2809,14 +2815,16 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_entry_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntryTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEntryTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2824,15 +2832,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntryTypesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntryTypesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2870,8 +2880,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntryTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntryTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2881,7 +2891,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetEntryType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2909,7 +2919,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2919,7 +2929,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_entry_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntryTypeRequest::name].
@@ -2932,8 +2942,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntryType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntryType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2943,7 +2953,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CreateAspectType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2975,7 +2985,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2990,7 +3000,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .create_aspect_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_aspect_type`.
@@ -3007,7 +3017,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3080,8 +3090,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAspectType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAspectType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3091,7 +3101,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::UpdateAspectType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3123,7 +3133,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3138,7 +3148,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .update_aspect_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_aspect_type`.
@@ -3155,7 +3165,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3234,8 +3244,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAspectType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAspectType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3245,7 +3255,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::DeleteAspectType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3277,7 +3287,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3292,7 +3302,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .delete_aspect_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_aspect_type`.
@@ -3304,7 +3314,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3347,8 +3357,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAspectType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAspectType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3358,8 +3368,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListAspectTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3390,7 +3400,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3400,14 +3410,16 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_aspect_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAspectTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAspectTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3415,15 +3427,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAspectTypesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAspectTypesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3461,8 +3475,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAspectTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAspectTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3472,7 +3486,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetAspectType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3500,7 +3514,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3510,7 +3524,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_aspect_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAspectTypeRequest::name].
@@ -3523,8 +3537,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAspectType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAspectType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3534,7 +3548,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CreateEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3566,7 +3580,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3581,7 +3595,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .create_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_entry_group`.
@@ -3598,7 +3612,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3671,8 +3685,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3682,7 +3696,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::UpdateEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3714,7 +3728,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3729,7 +3743,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .update_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_entry_group`.
@@ -3746,7 +3760,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3825,8 +3839,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3836,7 +3850,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::DeleteEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3868,7 +3882,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3883,7 +3897,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .delete_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_entry_group`.
@@ -3895,7 +3909,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3938,8 +3952,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3949,8 +3963,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListEntryGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3981,7 +3995,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3991,14 +4005,16 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_entry_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntryGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEntryGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4006,15 +4022,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntryGroupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntryGroupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4052,8 +4070,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntryGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntryGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4063,7 +4081,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetEntryGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4091,7 +4109,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4101,7 +4119,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_entry_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntryGroupRequest::name].
@@ -4114,8 +4132,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntryGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntryGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4125,7 +4143,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CreateEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4153,7 +4171,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4163,7 +4181,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .create_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntryRequest::parent].
@@ -4206,8 +4224,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4217,7 +4235,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::UpdateEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4245,7 +4263,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4255,7 +4273,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .update_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entry][crate::model::UpdateEntryRequest::entry].
@@ -4323,8 +4341,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4334,7 +4352,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::DeleteEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4362,7 +4380,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4372,7 +4390,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .delete_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntryRequest::name].
@@ -4385,8 +4403,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4396,8 +4414,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListEntries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4428,7 +4446,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4438,13 +4456,13 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntriesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListEntriesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4453,15 +4471,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntriesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntriesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4493,8 +4513,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4504,7 +4524,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4532,7 +4552,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4542,7 +4562,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntryRequest::name].
@@ -4583,8 +4603,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4594,7 +4614,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::LookupEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4622,7 +4642,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4632,7 +4652,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .lookup_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::LookupEntryRequest::name].
@@ -4681,8 +4701,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4692,8 +4712,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::SearchEntries;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4724,7 +4744,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4734,13 +4754,13 @@ pub mod catalog_service {
             (*self.0.stub)
                 .search_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchEntriesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchEntriesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4749,15 +4769,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchEntriesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchEntriesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4809,8 +4831,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4820,7 +4842,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CreateMetadataJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4852,7 +4874,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4867,7 +4889,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .create_metadata_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_metadata_job`.
@@ -4884,7 +4906,7 @@ pub mod catalog_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4955,8 +4977,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMetadataJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMetadataJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4966,7 +4988,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetMetadataJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4994,7 +5016,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5004,7 +5026,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_metadata_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMetadataJobRequest::name].
@@ -5017,8 +5039,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMetadataJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMetadataJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5028,8 +5050,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListMetadataJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5063,7 +5085,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5073,14 +5095,16 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_metadata_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMetadataJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMetadataJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -5088,15 +5112,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMetadataJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMetadataJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5134,8 +5160,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMetadataJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMetadataJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5145,7 +5171,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CancelMetadataJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5176,7 +5202,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5186,7 +5212,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .cancel_metadata_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelMetadataJobRequest::name].
@@ -5199,8 +5225,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelMetadataJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelMetadataJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5210,7 +5236,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CreateEntryLink;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5238,7 +5264,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5248,7 +5274,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .create_entry_link(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntryLinkRequest::parent].
@@ -5291,8 +5317,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntryLink {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntryLink {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5302,7 +5328,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::DeleteEntryLink;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5330,7 +5356,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5340,7 +5366,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .delete_entry_link(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntryLinkRequest::name].
@@ -5353,8 +5379,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntryLink {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntryLink {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5364,7 +5390,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetEntryLink;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5392,7 +5418,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5402,7 +5428,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_entry_link(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntryLinkRequest::name].
@@ -5415,8 +5441,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntryLink {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntryLink {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5426,8 +5452,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5461,7 +5487,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5471,15 +5497,15 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5488,17 +5514,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5528,8 +5554,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5539,7 +5565,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5570,7 +5596,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5580,7 +5606,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5591,8 +5617,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5602,7 +5628,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5633,7 +5659,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5643,7 +5669,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -5696,8 +5722,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5707,7 +5733,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5738,7 +5764,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5748,7 +5774,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -5779,8 +5805,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5790,7 +5816,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5823,7 +5849,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5833,7 +5859,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -5859,8 +5885,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5870,8 +5896,8 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5907,7 +5933,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5917,15 +5943,15 @@ pub mod catalog_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5934,17 +5960,17 @@ pub mod catalog_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5980,8 +6006,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5991,7 +6017,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6022,7 +6048,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6032,7 +6058,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -6043,8 +6069,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6054,7 +6080,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6087,7 +6113,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6097,7 +6123,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -6108,8 +6134,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6119,7 +6145,7 @@ pub mod catalog_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::catalog_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6152,7 +6178,7 @@ pub mod catalog_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6162,7 +6188,7 @@ pub mod catalog_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -6173,8 +6199,8 @@ pub mod catalog_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6186,7 +6212,7 @@ pub mod cmek_service {
     /// A builder for [CmekService][crate::client::CmekService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::cmek_service::ClientBuilder;
     /// # use client::CmekService;
@@ -6196,19 +6222,18 @@ pub mod cmek_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CmekService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CmekService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -6219,7 +6244,7 @@ pub mod cmek_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CmekService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -6232,7 +6257,7 @@ pub mod cmek_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -6242,7 +6267,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::CreateEncryptionConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6274,7 +6299,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6289,7 +6314,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .create_encryption_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_encryption_config`.
@@ -6306,7 +6331,7 @@ pub mod cmek_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6373,8 +6398,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEncryptionConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEncryptionConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6384,7 +6409,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::UpdateEncryptionConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6416,7 +6441,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6431,7 +6456,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .update_encryption_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_encryption_config`.
@@ -6448,7 +6473,7 @@ pub mod cmek_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6517,8 +6542,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEncryptionConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEncryptionConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6528,7 +6553,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::DeleteEncryptionConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6560,7 +6585,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6575,7 +6600,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .delete_encryption_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_encryption_config`.
@@ -6587,7 +6612,7 @@ pub mod cmek_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6630,8 +6655,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEncryptionConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEncryptionConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6641,8 +6666,8 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::ListEncryptionConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6676,7 +6701,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6686,14 +6711,16 @@ pub mod cmek_service {
             (*self.0.stub)
                 .list_encryption_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEncryptionConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEncryptionConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6701,17 +6728,17 @@ pub mod cmek_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListEncryptionConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6749,8 +6776,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEncryptionConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEncryptionConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6760,7 +6787,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::GetEncryptionConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6791,7 +6818,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6801,7 +6828,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .get_encryption_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEncryptionConfigRequest::name].
@@ -6814,8 +6841,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEncryptionConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEncryptionConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6825,8 +6852,8 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6860,7 +6887,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6870,15 +6897,15 @@ pub mod cmek_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6887,17 +6914,17 @@ pub mod cmek_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6927,8 +6954,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6938,7 +6965,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6969,7 +6996,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6979,7 +7006,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -6990,8 +7017,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7001,7 +7028,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7032,7 +7059,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7042,7 +7069,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -7095,8 +7122,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7106,7 +7133,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7137,7 +7164,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7147,7 +7174,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -7178,8 +7205,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7189,7 +7216,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7222,7 +7249,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7232,7 +7259,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -7258,8 +7285,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7269,8 +7296,8 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7306,7 +7333,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7316,15 +7343,15 @@ pub mod cmek_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7333,17 +7360,17 @@ pub mod cmek_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7379,8 +7406,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7390,7 +7417,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7421,7 +7448,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7431,7 +7458,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7442,8 +7469,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7453,7 +7480,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7486,7 +7513,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7496,7 +7523,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -7507,8 +7534,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7518,7 +7545,7 @@ pub mod cmek_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::cmek_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7551,7 +7578,7 @@ pub mod cmek_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7561,7 +7588,7 @@ pub mod cmek_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7572,8 +7599,8 @@ pub mod cmek_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7585,7 +7612,7 @@ pub mod content_service {
     /// A builder for [ContentService][crate::client::ContentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::content_service::ClientBuilder;
     /// # use client::ContentService;
@@ -7595,19 +7622,18 @@ pub mod content_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ContentService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ContentService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7618,7 +7644,7 @@ pub mod content_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ContentService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7631,7 +7657,7 @@ pub mod content_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7641,7 +7667,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::CreateContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7669,7 +7695,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7679,7 +7705,7 @@ pub mod content_service {
             (*self.0.stub)
                 .create_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateContentRequest::parent].
@@ -7720,8 +7746,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7731,7 +7757,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::UpdateContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7759,7 +7785,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7769,7 +7795,7 @@ pub mod content_service {
             (*self.0.stub)
                 .update_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateContentRequest::update_mask].
@@ -7824,8 +7850,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7835,7 +7861,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::DeleteContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7863,7 +7889,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7873,7 +7899,7 @@ pub mod content_service {
             (*self.0.stub)
                 .delete_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteContentRequest::name].
@@ -7886,8 +7912,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7897,7 +7923,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::GetContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7925,7 +7951,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7935,7 +7961,7 @@ pub mod content_service {
             (*self.0.stub)
                 .get_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetContentRequest::name].
@@ -7957,8 +7983,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7968,7 +7994,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7999,7 +8025,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8009,7 +8035,7 @@ pub mod content_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -8040,8 +8066,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8051,7 +8077,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8082,7 +8108,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8092,7 +8118,7 @@ pub mod content_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -8145,8 +8171,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8156,7 +8182,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8189,7 +8215,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8199,7 +8225,7 @@ pub mod content_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -8225,8 +8251,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8236,8 +8262,8 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::ListContent;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8268,7 +8294,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8278,13 +8304,13 @@ pub mod content_service {
             (*self.0.stub)
                 .list_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListContentResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListContentResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8293,15 +8319,17 @@ pub mod content_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListContentResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListContentResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8333,8 +8361,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8344,8 +8372,8 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8379,7 +8407,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8389,15 +8417,15 @@ pub mod content_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8406,17 +8434,17 @@ pub mod content_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8446,8 +8474,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8457,7 +8485,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8488,7 +8516,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8498,7 +8526,7 @@ pub mod content_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -8509,8 +8537,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8520,8 +8548,8 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8557,7 +8585,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8567,15 +8595,15 @@ pub mod content_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8584,17 +8612,17 @@ pub mod content_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8630,8 +8658,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8641,7 +8669,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8672,7 +8700,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8682,7 +8710,7 @@ pub mod content_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8693,8 +8721,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8704,7 +8732,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8737,7 +8765,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8747,7 +8775,7 @@ pub mod content_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -8758,8 +8786,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8769,7 +8797,7 @@ pub mod content_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::content_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8802,7 +8830,7 @@ pub mod content_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8812,7 +8840,7 @@ pub mod content_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8823,8 +8851,8 @@ pub mod content_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8836,7 +8864,7 @@ pub mod data_taxonomy_service {
     /// A builder for [DataTaxonomyService][crate::client::DataTaxonomyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::data_taxonomy_service::ClientBuilder;
     /// # use client::DataTaxonomyService;
@@ -8846,19 +8874,18 @@ pub mod data_taxonomy_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataTaxonomyService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataTaxonomyService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8869,7 +8896,7 @@ pub mod data_taxonomy_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataTaxonomyService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8882,7 +8909,7 @@ pub mod data_taxonomy_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8892,7 +8919,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::CreateDataTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8924,7 +8951,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8939,7 +8966,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .create_data_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_data_taxonomy`.
@@ -8956,7 +8983,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9029,8 +9056,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9040,7 +9067,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::UpdateDataTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9072,7 +9099,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9087,7 +9114,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .update_data_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_data_taxonomy`.
@@ -9104,7 +9131,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9183,8 +9210,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9194,7 +9221,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::DeleteDataTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9226,7 +9253,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9241,7 +9268,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .delete_data_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_data_taxonomy`.
@@ -9253,7 +9280,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9296,8 +9323,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9307,8 +9334,8 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::ListDataTaxonomies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9342,7 +9369,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9352,14 +9379,16 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .list_data_taxonomies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataTaxonomiesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataTaxonomiesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -9367,17 +9396,17 @@ pub mod data_taxonomy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataTaxonomiesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9415,8 +9444,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataTaxonomies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataTaxonomies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9426,7 +9455,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::GetDataTaxonomy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9454,7 +9483,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9464,7 +9493,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .get_data_taxonomy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataTaxonomyRequest::name].
@@ -9477,8 +9506,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataTaxonomy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataTaxonomy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9488,7 +9517,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::CreateDataAttributeBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9522,7 +9551,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9537,7 +9566,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .create_data_attribute_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_data_attribute_binding`.
@@ -9556,7 +9585,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9629,8 +9658,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataAttributeBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataAttributeBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9640,7 +9669,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::UpdateDataAttributeBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9674,7 +9703,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9689,7 +9718,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .update_data_attribute_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_data_attribute_binding`.
@@ -9708,7 +9737,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9787,8 +9816,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataAttributeBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataAttributeBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9798,7 +9827,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::DeleteDataAttributeBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9832,7 +9861,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9847,7 +9876,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .delete_data_attribute_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_data_attribute_binding`.
@@ -9859,7 +9888,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9904,8 +9933,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataAttributeBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataAttributeBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9915,8 +9944,8 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::ListDataAttributeBindings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9952,7 +9981,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9962,15 +9991,15 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .list_data_attribute_bindings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListDataAttributeBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9979,17 +10008,17 @@ pub mod data_taxonomy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataAttributeBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10027,8 +10056,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataAttributeBindings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataAttributeBindings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10038,7 +10067,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::GetDataAttributeBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10071,7 +10100,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10081,7 +10110,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .get_data_attribute_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataAttributeBindingRequest::name].
@@ -10094,8 +10123,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataAttributeBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataAttributeBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10105,7 +10134,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::CreateDataAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10137,7 +10166,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10152,7 +10181,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .create_data_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_data_attribute`.
@@ -10169,7 +10198,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10242,8 +10271,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10253,7 +10282,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::UpdateDataAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10285,7 +10314,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10300,7 +10329,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .update_data_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_data_attribute`.
@@ -10317,7 +10346,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10396,8 +10425,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10407,7 +10436,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::DeleteDataAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10439,7 +10468,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10454,7 +10483,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .delete_data_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_data_attribute`.
@@ -10466,7 +10495,7 @@ pub mod data_taxonomy_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10509,8 +10538,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10520,8 +10549,8 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::ListDataAttributes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10555,7 +10584,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10565,14 +10594,16 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .list_data_attributes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataAttributesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataAttributesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -10580,17 +10611,17 @@ pub mod data_taxonomy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDataAttributesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10628,8 +10659,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataAttributes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataAttributes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10639,7 +10670,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::GetDataAttribute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10670,7 +10701,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10680,7 +10711,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .get_data_attribute(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataAttributeRequest::name].
@@ -10693,8 +10724,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataAttribute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataAttribute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10704,8 +10735,8 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10739,7 +10770,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10749,15 +10780,15 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10766,17 +10797,17 @@ pub mod data_taxonomy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10806,8 +10837,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10817,7 +10848,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10848,7 +10879,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10858,7 +10889,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -10869,8 +10900,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10880,7 +10911,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10911,7 +10942,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10921,7 +10952,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -10974,8 +11005,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10985,7 +11016,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11016,7 +11047,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11026,7 +11057,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -11057,8 +11088,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11068,7 +11099,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11101,7 +11132,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11111,7 +11142,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -11137,8 +11168,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11148,8 +11179,8 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11185,7 +11216,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11195,15 +11226,15 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11212,17 +11243,17 @@ pub mod data_taxonomy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11258,8 +11289,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11269,7 +11300,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11300,7 +11331,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11310,7 +11341,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -11321,8 +11352,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11332,7 +11363,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11365,7 +11396,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11375,7 +11406,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -11386,8 +11417,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11397,7 +11428,7 @@ pub mod data_taxonomy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_taxonomy_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11430,7 +11461,7 @@ pub mod data_taxonomy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11440,7 +11471,7 @@ pub mod data_taxonomy_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -11451,8 +11482,8 @@ pub mod data_taxonomy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11464,7 +11495,7 @@ pub mod data_scan_service {
     /// A builder for [DataScanService][crate::client::DataScanService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::data_scan_service::ClientBuilder;
     /// # use client::DataScanService;
@@ -11474,19 +11505,18 @@ pub mod data_scan_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataScanService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataScanService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11497,7 +11527,7 @@ pub mod data_scan_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataScanService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11510,7 +11540,7 @@ pub mod data_scan_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11520,7 +11550,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::CreateDataScan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11549,7 +11579,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11564,7 +11594,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .create_data_scan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_data_scan`.
@@ -11581,7 +11611,7 @@ pub mod data_scan_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11654,8 +11684,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataScan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataScan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11665,7 +11695,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::UpdateDataScan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11694,7 +11724,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11709,7 +11739,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .update_data_scan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_data_scan`.
@@ -11726,7 +11756,7 @@ pub mod data_scan_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11801,8 +11831,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataScan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataScan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11812,7 +11842,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::DeleteDataScan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11841,7 +11871,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11856,7 +11886,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .delete_data_scan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_data_scan`.
@@ -11868,7 +11898,7 @@ pub mod data_scan_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11911,8 +11941,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataScan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataScan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11922,7 +11952,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::GetDataScan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11950,7 +11980,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11960,7 +11990,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .get_data_scan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataScanRequest::name].
@@ -11982,8 +12012,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataScan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataScan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11993,8 +12023,8 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::ListDataScans;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12025,7 +12055,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12035,13 +12065,13 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .list_data_scans(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataScansResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDataScansResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12050,15 +12080,17 @@ pub mod data_scan_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataScansResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataScansResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12096,8 +12128,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataScans {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataScans {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12107,7 +12139,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::RunDataScan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12135,7 +12167,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12145,7 +12177,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .run_data_scan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RunDataScanRequest::name].
@@ -12158,8 +12190,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RunDataScan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RunDataScan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12169,7 +12201,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::GetDataScanJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12197,7 +12229,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12207,7 +12239,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .get_data_scan_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataScanJobRequest::name].
@@ -12229,8 +12261,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataScanJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataScanJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12240,8 +12272,8 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::ListDataScanJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12275,7 +12307,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12285,14 +12317,16 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .list_data_scan_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataScanJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataScanJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -12300,15 +12334,17 @@ pub mod data_scan_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataScanJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataScanJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12340,8 +12376,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataScanJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataScanJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12351,7 +12387,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::GenerateDataQualityRules;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12384,7 +12420,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12394,7 +12430,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .generate_data_quality_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GenerateDataQualityRulesRequest::name].
@@ -12407,8 +12443,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateDataQualityRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateDataQualityRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12418,8 +12454,8 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12453,7 +12489,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12463,15 +12499,15 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12480,17 +12516,17 @@ pub mod data_scan_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12520,8 +12556,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12531,7 +12567,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12562,7 +12598,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12572,7 +12608,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -12583,8 +12619,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12594,7 +12630,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12625,7 +12661,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12635,7 +12671,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -12688,8 +12724,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12699,7 +12735,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12730,7 +12766,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12740,7 +12776,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -12771,8 +12807,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12782,7 +12818,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12815,7 +12851,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12825,7 +12861,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -12851,8 +12887,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12862,8 +12898,8 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12899,7 +12935,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12909,15 +12945,15 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12926,17 +12962,17 @@ pub mod data_scan_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12972,8 +13008,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12983,7 +13019,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13014,7 +13050,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13024,7 +13060,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -13035,8 +13071,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13046,7 +13082,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13079,7 +13115,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13089,7 +13125,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -13100,8 +13136,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13111,7 +13147,7 @@ pub mod data_scan_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::data_scan_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13144,7 +13180,7 @@ pub mod data_scan_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13154,7 +13190,7 @@ pub mod data_scan_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -13165,8 +13201,8 @@ pub mod data_scan_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13178,7 +13214,7 @@ pub mod metadata_service {
     /// A builder for [MetadataService][crate::client::MetadataService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::metadata_service::ClientBuilder;
     /// # use client::MetadataService;
@@ -13188,19 +13224,18 @@ pub mod metadata_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MetadataService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MetadataService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -13211,7 +13246,7 @@ pub mod metadata_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MetadataService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -13224,7 +13259,7 @@ pub mod metadata_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -13234,7 +13269,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::CreateEntity;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13262,7 +13297,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13272,7 +13307,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_entity(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntityRequest::parent].
@@ -13313,8 +13348,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntity {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntity {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13324,7 +13359,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::UpdateEntity;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13352,7 +13387,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13362,7 +13397,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .update_entity(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entity][crate::model::UpdateEntityRequest::entity].
@@ -13395,8 +13430,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntity {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntity {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13406,7 +13441,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::DeleteEntity;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13434,7 +13469,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13444,7 +13479,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_entity(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntityRequest::name].
@@ -13465,8 +13500,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntity {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntity {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13476,7 +13511,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::GetEntity;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13504,7 +13539,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13514,7 +13549,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_entity(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntityRequest::name].
@@ -13536,8 +13571,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntity {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntity {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13547,8 +13582,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::ListEntities;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13579,7 +13614,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13589,13 +13624,13 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntitiesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListEntitiesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13604,15 +13639,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntitiesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntitiesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13655,8 +13692,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13666,7 +13703,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::CreatePartition;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13694,7 +13731,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13704,7 +13741,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .create_partition(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePartitionRequest::parent].
@@ -13745,8 +13782,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePartition {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePartition {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13756,7 +13793,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::DeletePartition;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13784,7 +13821,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13794,7 +13831,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_partition(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeletePartitionRequest::name].
@@ -13814,8 +13851,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePartition {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePartition {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13825,7 +13862,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::GetPartition;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13853,7 +13890,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13863,7 +13900,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_partition(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPartitionRequest::name].
@@ -13876,8 +13913,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPartition {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPartition {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13887,8 +13924,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::ListPartitions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13919,7 +13956,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13929,14 +13966,16 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_partitions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPartitionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPartitionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -13944,15 +13983,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPartitionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPartitionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13984,8 +14025,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPartitions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPartitions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13995,8 +14036,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14030,7 +14071,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14040,15 +14081,15 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14057,17 +14098,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14097,8 +14138,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14108,7 +14149,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14139,7 +14180,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14149,7 +14190,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -14160,8 +14201,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14171,7 +14212,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14202,7 +14243,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14212,7 +14253,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -14265,8 +14306,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14276,7 +14317,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14307,7 +14348,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14317,7 +14358,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -14348,8 +14389,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14359,7 +14400,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14392,7 +14433,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14402,7 +14443,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -14428,8 +14469,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14439,8 +14480,8 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14476,7 +14517,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14486,15 +14527,15 @@ pub mod metadata_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14503,17 +14544,17 @@ pub mod metadata_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14549,8 +14590,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14560,7 +14601,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14591,7 +14632,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14601,7 +14642,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -14612,8 +14653,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14623,7 +14664,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14656,7 +14697,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14666,7 +14707,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -14677,8 +14718,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14688,7 +14729,7 @@ pub mod metadata_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::metadata_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14721,7 +14762,7 @@ pub mod metadata_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14731,7 +14772,7 @@ pub mod metadata_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -14742,8 +14783,8 @@ pub mod metadata_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14755,7 +14796,7 @@ pub mod dataplex_service {
     /// A builder for [DataplexService][crate::client::DataplexService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::*;
     /// # use builder::dataplex_service::ClientBuilder;
     /// # use client::DataplexService;
@@ -14765,19 +14806,18 @@ pub mod dataplex_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataplexService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataplexService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -14788,7 +14828,7 @@ pub mod dataplex_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataplexService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -14801,7 +14841,7 @@ pub mod dataplex_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -14811,7 +14851,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CreateLake;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14840,7 +14880,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14855,7 +14895,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .create_lake(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_lake`.
@@ -14872,7 +14912,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14945,8 +14985,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateLake {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateLake {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14956,7 +14996,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::UpdateLake;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14985,7 +15025,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15000,7 +15040,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .update_lake(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_lake`.
@@ -15017,7 +15057,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15096,8 +15136,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateLake {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateLake {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15107,7 +15147,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::DeleteLake;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15136,7 +15176,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15151,7 +15191,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .delete_lake(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_lake`.
@@ -15163,7 +15203,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15200,8 +15240,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteLake {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteLake {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15211,8 +15251,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListLakes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15243,7 +15283,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15253,13 +15293,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_lakes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListLakesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListLakesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15268,15 +15308,15 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListLakesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListLakesResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15314,8 +15354,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLakes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLakes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15325,7 +15365,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetLake;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15353,7 +15393,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15363,7 +15403,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_lake(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetLakeRequest::name].
@@ -15376,8 +15416,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLake {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLake {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15387,8 +15427,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListLakeActions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15419,7 +15459,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15429,13 +15469,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_lake_actions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListActionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListActionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15444,15 +15484,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListActionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListActionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15478,8 +15520,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLakeActions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLakeActions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15489,7 +15531,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CreateZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15518,7 +15560,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15533,7 +15575,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .create_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_zone`.
@@ -15550,7 +15592,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15623,8 +15665,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15634,7 +15676,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::UpdateZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15663,7 +15705,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15678,7 +15720,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .update_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_zone`.
@@ -15695,7 +15737,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15774,8 +15816,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15785,7 +15827,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::DeleteZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15814,7 +15856,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15829,7 +15871,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .delete_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_zone`.
@@ -15841,7 +15883,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15878,8 +15920,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15889,8 +15931,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListZones;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15921,7 +15963,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15931,13 +15973,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_zones(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListZonesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListZonesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15946,15 +15988,15 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListZonesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListZonesResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15992,8 +16034,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListZones {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListZones {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16003,7 +16045,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16031,7 +16073,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16041,7 +16083,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetZoneRequest::name].
@@ -16054,8 +16096,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16065,8 +16107,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListZoneActions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16097,7 +16139,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16107,13 +16149,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_zone_actions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListActionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListActionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16122,15 +16164,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListActionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListActionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16156,8 +16200,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListZoneActions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListZoneActions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16167,7 +16211,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CreateAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16196,7 +16240,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16211,7 +16255,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .create_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_asset`.
@@ -16228,7 +16272,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16301,8 +16345,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16312,7 +16356,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::UpdateAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16341,7 +16385,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16356,7 +16400,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .update_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_asset`.
@@ -16373,7 +16417,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16452,8 +16496,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16463,7 +16507,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::DeleteAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16492,7 +16536,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16507,7 +16551,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .delete_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_asset`.
@@ -16519,7 +16563,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16556,8 +16600,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16567,8 +16611,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListAssets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16599,7 +16643,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16609,13 +16653,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAssetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAssetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16624,15 +16668,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAssetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAssetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16670,8 +16716,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16681,7 +16727,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16709,7 +16755,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16719,7 +16765,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAssetRequest::name].
@@ -16732,8 +16778,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16743,8 +16789,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListAssetActions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16778,7 +16824,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16788,13 +16834,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_asset_actions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListActionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListActionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16803,15 +16849,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListActionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListActionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16837,8 +16885,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssetActions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssetActions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16848,7 +16896,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CreateTask;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16877,7 +16925,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16892,7 +16940,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .create_task(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_task`.
@@ -16909,7 +16957,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16982,8 +17030,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTask {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTask {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16993,7 +17041,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::UpdateTask;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17022,7 +17070,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17037,7 +17085,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .update_task(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_task`.
@@ -17054,7 +17102,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17133,8 +17181,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTask {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTask {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17144,7 +17192,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::DeleteTask;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17173,7 +17221,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17188,7 +17236,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .delete_task(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_task`.
@@ -17200,7 +17248,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17237,8 +17285,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTask {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTask {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17248,8 +17296,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListTasks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17280,7 +17328,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17290,13 +17338,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_tasks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTasksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTasksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17305,15 +17353,15 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTasksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListTasksResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17351,8 +17399,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTasks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTasks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17362,7 +17410,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetTask;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17390,7 +17438,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17400,7 +17448,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_task(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTaskRequest::name].
@@ -17413,8 +17461,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTask {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTask {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17424,8 +17472,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17456,7 +17504,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17466,13 +17514,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListJobsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListJobsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17481,15 +17529,15 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListJobsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListJobsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17515,8 +17563,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17526,7 +17574,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::RunTask;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17554,7 +17602,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17564,7 +17612,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .run_task(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RunTaskRequest::name].
@@ -17599,8 +17647,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RunTask {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RunTask {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17610,7 +17658,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17638,7 +17686,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17648,7 +17696,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetJobRequest::name].
@@ -17661,8 +17709,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17672,7 +17720,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CancelJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17700,7 +17748,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17710,7 +17758,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .cancel_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelJobRequest::name].
@@ -17723,8 +17771,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17734,7 +17782,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CreateEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17766,7 +17814,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17781,7 +17829,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .create_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_environment`.
@@ -17798,7 +17846,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17871,8 +17919,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17882,7 +17930,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::UpdateEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17914,7 +17962,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17929,7 +17977,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .update_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_environment`.
@@ -17946,7 +17994,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -18025,8 +18073,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18036,7 +18084,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::DeleteEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -18068,7 +18116,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18083,7 +18131,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .delete_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_environment`.
@@ -18095,7 +18143,7 @@ pub mod dataplex_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -18132,8 +18180,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18143,8 +18191,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListEnvironments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18178,7 +18226,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18188,14 +18236,16 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_environments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEnvironmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEnvironmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -18203,15 +18253,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEnvironmentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEnvironmentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18249,8 +18301,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEnvironments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEnvironments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18260,7 +18312,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18288,7 +18340,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18298,7 +18350,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEnvironmentRequest::name].
@@ -18311,8 +18363,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18322,8 +18374,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListSessions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18354,7 +18406,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18364,13 +18416,13 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_sessions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSessionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSessionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18379,15 +18431,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSessionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSessionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18419,8 +18473,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18430,8 +18484,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18465,7 +18519,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18475,15 +18529,15 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18492,17 +18546,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18532,8 +18586,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18543,7 +18597,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18574,7 +18628,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18584,7 +18638,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -18595,8 +18649,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18606,7 +18660,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18637,7 +18691,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18647,7 +18701,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -18700,8 +18754,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18711,7 +18765,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18742,7 +18796,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18752,7 +18806,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -18783,8 +18837,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18794,7 +18848,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18827,7 +18881,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18837,7 +18891,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -18863,8 +18917,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18874,8 +18928,8 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18911,7 +18965,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18921,15 +18975,15 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18938,17 +18992,17 @@ pub mod dataplex_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18984,8 +19038,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18995,7 +19049,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19026,7 +19080,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19036,7 +19090,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -19047,8 +19101,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19058,7 +19112,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19091,7 +19145,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19101,7 +19155,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -19112,8 +19166,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19123,7 +19177,7 @@ pub mod dataplex_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataplex_v1::builder::dataplex_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataplex_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19156,7 +19210,7 @@ pub mod dataplex_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19166,7 +19220,7 @@ pub mod dataplex_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -19177,8 +19231,8 @@ pub mod dataplex_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/dataplex/v1/src/client.rs b/src/generated/cloud/dataplex/v1/src/client.rs
index 613d520e75..c08e4348cc 100644
--- a/src/generated/cloud/dataplex/v1/src/client.rs
+++ b/src/generated/cloud/dataplex/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::BusinessGlossaryService;
 /// let client = BusinessGlossaryService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -72,15 +72,13 @@ impl BusinessGlossaryService {
     /// Returns a builder for [BusinessGlossaryService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::BusinessGlossaryService;
     /// let client = BusinessGlossaryService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::business_glossary_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::business_glossary_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::business_glossary_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -98,16 +96,15 @@ impl BusinessGlossaryService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::BusinessGlossaryService>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BusinessGlossaryService>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -116,13 +113,13 @@ impl BusinessGlossaryService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BusinessGlossaryService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BusinessGlossaryService> {
         super::transport::BusinessGlossaryService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BusinessGlossaryService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BusinessGlossaryService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BusinessGlossaryService::new)
@@ -325,7 +322,7 @@ impl BusinessGlossaryService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::CatalogService;
 /// let client = CatalogService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -375,13 +372,13 @@ impl CatalogService {
     /// Returns a builder for [CatalogService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::CatalogService;
     /// let client = CatalogService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::catalog_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::catalog_service::client::Factory)
+        crate::new_client_builder(super::builder::catalog_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -399,14 +396,14 @@ impl CatalogService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CatalogService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CatalogService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -415,13 +412,13 @@ impl CatalogService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CatalogService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CatalogService> {
         super::transport::CatalogService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CatalogService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CatalogService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CatalogService::new)
@@ -762,7 +759,7 @@ impl CatalogService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::CmekService;
 /// let client = CmekService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -808,13 +805,13 @@ impl CmekService {
     /// Returns a builder for [CmekService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::CmekService;
     /// let client = CmekService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cmek_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::cmek_service::client::Factory)
+        crate::new_client_builder(super::builder::cmek_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -832,14 +829,14 @@ impl CmekService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CmekService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CmekService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -848,13 +845,13 @@ impl CmekService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CmekService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CmekService> {
         super::transport::CmekService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CmekService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CmekService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CmekService::new)
@@ -984,7 +981,7 @@ impl CmekService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::ContentService;
 /// let client = ContentService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -1031,13 +1028,13 @@ impl ContentService {
     /// Returns a builder for [ContentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::ContentService;
     /// let client = ContentService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::content_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::content_service::client::Factory)
+        crate::new_client_builder(super::builder::content_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1055,14 +1052,14 @@ impl ContentService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ContentService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ContentService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1071,13 +1068,13 @@ impl ContentService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ContentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ContentService> {
         super::transport::ContentService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ContentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ContentService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ContentService::new)
@@ -1184,7 +1181,7 @@ impl ContentService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::DataTaxonomyService;
 /// let client = DataTaxonomyService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -1232,15 +1229,13 @@ impl DataTaxonomyService {
     /// Returns a builder for [DataTaxonomyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::DataTaxonomyService;
     /// let client = DataTaxonomyService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_taxonomy_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_taxonomy_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_taxonomy_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1258,14 +1253,14 @@ impl DataTaxonomyService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataTaxonomyService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataTaxonomyService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1275,13 +1270,13 @@ impl DataTaxonomyService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataTaxonomyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataTaxonomyService> {
         super::transport::DataTaxonomyService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataTaxonomyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataTaxonomyService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataTaxonomyService::new)
@@ -1567,7 +1562,7 @@ impl DataTaxonomyService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::DataScanService;
 /// let client = DataScanService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -1615,15 +1610,13 @@ impl DataScanService {
     /// Returns a builder for [DataScanService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::DataScanService;
     /// let client = DataScanService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_scan_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_scan_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_scan_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1641,15 +1634,14 @@ impl DataScanService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataScanService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataScanService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1658,13 +1650,13 @@ impl DataScanService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataScanService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataScanService> {
         super::transport::DataScanService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataScanService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataScanService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataScanService::new)
@@ -1819,7 +1811,7 @@ impl DataScanService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::MetadataService;
 /// let client = MetadataService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -1866,15 +1858,13 @@ impl MetadataService {
     /// Returns a builder for [MetadataService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::MetadataService;
     /// let client = MetadataService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::metadata_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::metadata_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::metadata_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1892,15 +1882,14 @@ impl MetadataService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MetadataService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MetadataService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1909,13 +1898,13 @@ impl MetadataService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MetadataService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MetadataService> {
         super::transport::MetadataService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MetadataService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MetadataService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MetadataService::new)
@@ -2035,7 +2024,7 @@ impl MetadataService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataplex_v1::client::DataplexService;
 /// let client = DataplexService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataplex API.
@@ -2085,15 +2074,13 @@ impl DataplexService {
     /// Returns a builder for [DataplexService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataplex_v1::client::DataplexService;
     /// let client = DataplexService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dataplex_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::dataplex_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::dataplex_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2111,15 +2098,14 @@ impl DataplexService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataplexService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataplexService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2128,13 +2114,13 @@ impl DataplexService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataplexService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataplexService> {
         super::transport::DataplexService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataplexService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataplexService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataplexService::new)
diff --git a/src/generated/cloud/dataplex/v1/src/lib.rs b/src/generated/cloud/dataplex/v1/src/lib.rs
index cea82875f6..b84871812a 100644
--- a/src/generated/cloud/dataplex/v1/src/lib.rs
+++ b/src/generated/cloud/dataplex/v1/src/lib.rs
@@ -53,8 +53,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -89,3 +89,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/dataplex/v1/src/model.rs b/src/generated/cloud/dataplex/v1/src/model.rs
index 13004d02a6..e34c71289d 100644
--- a/src/generated/cloud/dataplex/v1/src/model.rs
+++ b/src/generated/cloud/dataplex/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -2840,7 +2840,7 @@ impl wkt::message::Message for ListGlossariesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGlossariesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGlossariesResponse {
     type PageItem = crate::model::Glossary;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3305,7 +3305,7 @@ impl wkt::message::Message for ListGlossaryCategoriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGlossaryCategoriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGlossaryCategoriesResponse {
     type PageItem = crate::model::GlossaryCategory;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3770,7 +3770,7 @@ impl wkt::message::Message for ListGlossaryTermsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGlossaryTermsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGlossaryTermsResponse {
     type PageItem = crate::model::GlossaryTerm;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6710,7 +6710,7 @@ impl wkt::message::Message for ListEntryGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntryGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntryGroupsResponse {
     type PageItem = crate::model::EntryGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7210,7 +7210,7 @@ impl wkt::message::Message for ListEntryTypesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntryTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntryTypesResponse {
     type PageItem = crate::model::EntryType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7711,7 +7711,7 @@ impl wkt::message::Message for ListAspectTypesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAspectTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAspectTypesResponse {
     type PageItem = crate::model::AspectType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8233,7 +8233,7 @@ impl wkt::message::Message for ListEntriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntriesResponse {
     type PageItem = crate::model::Entry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8865,7 +8865,7 @@ impl wkt::message::Message for SearchEntriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchEntriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchEntriesResponse {
     type PageItem = crate::model::SearchEntriesResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9400,7 +9400,7 @@ impl wkt::message::Message for ListMetadataJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMetadataJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMetadataJobsResponse {
     type PageItem = crate::model::MetadataJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13044,7 +13044,7 @@ impl wkt::message::Message for ListEncryptionConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEncryptionConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEncryptionConfigsResponse {
     type PageItem = crate::model::EncryptionConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13441,7 +13441,7 @@ impl wkt::message::Message for ListContentResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListContentResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListContentResponse {
     type PageItem = crate::model::Content;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -20984,7 +20984,7 @@ impl wkt::message::Message for ListDataTaxonomiesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataTaxonomiesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataTaxonomiesResponse {
     type PageItem = crate::model::DataTaxonomy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -21484,7 +21484,7 @@ impl wkt::message::Message for ListDataAttributesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataAttributesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataAttributesResponse {
     type PageItem = crate::model::DataAttribute;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -21987,7 +21987,7 @@ impl wkt::message::Message for ListDataAttributeBindingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataAttributeBindingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataAttributeBindingsResponse {
     type PageItem = crate::model::DataAttributeBinding;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -22705,7 +22705,7 @@ impl wkt::message::Message for ListDataScansResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataScansResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataScansResponse {
     type PageItem = crate::model::DataScan;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23174,7 +23174,7 @@ impl wkt::message::Message for ListDataScanJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataScanJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataScanJobsResponse {
     type PageItem = crate::model::DataScanJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -31843,7 +31843,7 @@ impl wkt::message::Message for ListEntitiesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntitiesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntitiesResponse {
     type PageItem = crate::model::Entity;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -32365,7 +32365,7 @@ impl wkt::message::Message for ListPartitionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPartitionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPartitionsResponse {
     type PageItem = crate::model::Partition;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -41154,7 +41154,7 @@ impl wkt::message::Message for ListLakesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListLakesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListLakesResponse {
     type PageItem = crate::model::Lake;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -41298,7 +41298,7 @@ impl wkt::message::Message for ListActionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListActionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListActionsResponse {
     type PageItem = crate::model::Action;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -41760,7 +41760,7 @@ impl wkt::message::Message for ListZonesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListZonesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListZonesResponse {
     type PageItem = crate::model::Zone;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -42292,7 +42292,7 @@ impl wkt::message::Message for ListAssetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAssetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAssetsResponse {
     type PageItem = crate::model::Asset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43007,7 +43007,7 @@ impl wkt::message::Message for ListTasksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTasksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTasksResponse {
     type PageItem = crate::model::Task;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43369,7 +43369,7 @@ impl wkt::message::Message for ListJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListJobsResponse {
     type PageItem = crate::model::Job;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43830,7 +43830,7 @@ impl wkt::message::Message for ListEnvironmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEnvironmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEnvironmentsResponse {
     type PageItem = crate::model::Environment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -44032,7 +44032,7 @@ impl wkt::message::Message for ListSessionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSessionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSessionsResponse {
     type PageItem = crate::model::Session;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/dataplex/v1/src/stub.rs b/src/generated/cloud/dataplex/v1/src/stub.rs
index 7a82b20010..69a5e8d9ed 100644
--- a/src/generated/cloud/dataplex/v1/src/stub.rs
+++ b/src/generated/cloud/dataplex/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn create_glossary(
         &self,
         _req: crate::model::CreateGlossaryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn update_glossary(
         &self,
         _req: crate::model::UpdateGlossaryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn delete_glossary(
         &self,
         _req: crate::model::DeleteGlossaryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +75,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn get_glossary(
         &self,
         _req: crate::model::GetGlossaryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Glossary>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Glossary>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,9 +85,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn list_glossaries(
         &self,
         _req: crate::model::ListGlossariesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGlossariesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGlossariesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn create_glossary_category(
         &self,
         _req: crate::model::CreateGlossaryCategoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GlossaryCategory>>,
+        Output = crate::Result<crate::Response<crate::model::GlossaryCategory>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn update_glossary_category(
         &self,
         _req: crate::model::UpdateGlossaryCategoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GlossaryCategory>>,
+        Output = crate::Result<crate::Response<crate::model::GlossaryCategory>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,8 +118,8 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn delete_glossary_category(
         &self,
         _req: crate::model::DeleteGlossaryCategoryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -128,9 +127,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn get_glossary_category(
         &self,
         _req: crate::model::GetGlossaryCategoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GlossaryCategory>>,
+        Output = crate::Result<crate::Response<crate::model::GlossaryCategory>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,11 +138,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn list_glossary_categories(
         &self,
         _req: crate::model::ListGlossaryCategoriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListGlossaryCategoriesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListGlossaryCategoriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +149,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn create_glossary_term(
         &self,
         _req: crate::model::CreateGlossaryTermRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GlossaryTerm>>,
+        Output = crate::Result<crate::Response<crate::model::GlossaryTerm>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +160,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn update_glossary_term(
         &self,
         _req: crate::model::UpdateGlossaryTermRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GlossaryTerm>>,
+        Output = crate::Result<crate::Response<crate::model::GlossaryTerm>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,8 +171,8 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn delete_glossary_term(
         &self,
         _req: crate::model::DeleteGlossaryTermRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -183,9 +180,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn get_glossary_term(
         &self,
         _req: crate::model::GetGlossaryTermRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GlossaryTerm>>,
+        Output = crate::Result<crate::Response<crate::model::GlossaryTerm>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -194,9 +191,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn list_glossary_terms(
         &self,
         _req: crate::model::ListGlossaryTermsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGlossaryTermsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGlossaryTermsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -205,10 +202,10 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -218,9 +215,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -229,9 +226,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,9 +237,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -251,10 +248,10 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -264,10 +261,10 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -277,9 +274,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,8 +285,8 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -297,8 +294,8 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -308,9 +305,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -319,9 +316,9 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -341,9 +338,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn create_entry_type(
         &self,
         _req: crate::model::CreateEntryTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -352,9 +349,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn update_entry_type(
         &self,
         _req: crate::model::UpdateEntryTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -363,9 +360,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn delete_entry_type(
         &self,
         _req: crate::model::DeleteEntryTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -374,9 +371,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_entry_types(
         &self,
         _req: crate::model::ListEntryTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntryTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntryTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,10 +382,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_entry_type(
         &self,
         _req: crate::model::GetEntryTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -396,9 +392,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn create_aspect_type(
         &self,
         _req: crate::model::CreateAspectTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -407,9 +403,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn update_aspect_type(
         &self,
         _req: crate::model::UpdateAspectTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -418,9 +414,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn delete_aspect_type(
         &self,
         _req: crate::model::DeleteAspectTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -429,9 +425,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_aspect_types(
         &self,
         _req: crate::model::ListAspectTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAspectTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAspectTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -440,10 +436,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_aspect_type(
         &self,
         _req: crate::model::GetAspectTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AspectType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AspectType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -451,9 +446,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn create_entry_group(
         &self,
         _req: crate::model::CreateEntryGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -462,9 +457,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn update_entry_group(
         &self,
         _req: crate::model::UpdateEntryGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -473,9 +468,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn delete_entry_group(
         &self,
         _req: crate::model::DeleteEntryGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -484,9 +479,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_entry_groups(
         &self,
         _req: crate::model::ListEntryGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntryGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntryGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -495,10 +490,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_entry_group(
         &self,
         _req: crate::model::GetEntryGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -506,10 +500,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn create_entry(
         &self,
         _req: crate::model::CreateEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -517,10 +510,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn update_entry(
         &self,
         _req: crate::model::UpdateEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -528,10 +520,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn delete_entry(
         &self,
         _req: crate::model::DeleteEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -539,9 +530,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_entries(
         &self,
         _req: crate::model::ListEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -550,10 +541,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_entry(
         &self,
         _req: crate::model::GetEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -561,10 +551,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn lookup_entry(
         &self,
         _req: crate::model::LookupEntryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entry>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entry>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -572,9 +561,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn search_entries(
         &self,
         _req: crate::model::SearchEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchEntriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchEntriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -583,9 +572,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn create_metadata_job(
         &self,
         _req: crate::model::CreateMetadataJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -594,10 +583,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_metadata_job(
         &self,
         _req: crate::model::GetMetadataJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MetadataJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::MetadataJob>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -605,9 +593,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_metadata_jobs(
         &self,
         _req: crate::model::ListMetadataJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMetadataJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMetadataJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -616,8 +604,8 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn cancel_metadata_job(
         &self,
         _req: crate::model::CancelMetadataJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -625,10 +613,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn create_entry_link(
         &self,
         _req: crate::model::CreateEntryLinkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryLink>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryLink>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -636,10 +623,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn delete_entry_link(
         &self,
         _req: crate::model::DeleteEntryLinkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryLink>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryLink>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -647,10 +633,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_entry_link(
         &self,
         _req: crate::model::GetEntryLinkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntryLink>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntryLink>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -658,10 +643,10 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -671,9 +656,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -682,9 +667,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -693,9 +678,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -704,10 +689,10 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -717,10 +702,10 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -730,9 +715,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -741,8 +726,8 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -750,8 +735,8 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -761,9 +746,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -772,9 +757,9 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -794,9 +779,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn create_encryption_config(
         &self,
         _req: crate::model::CreateEncryptionConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -805,9 +790,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn update_encryption_config(
         &self,
         _req: crate::model::UpdateEncryptionConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -816,9 +801,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn delete_encryption_config(
         &self,
         _req: crate::model::DeleteEncryptionConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -827,11 +812,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn list_encryption_configs(
         &self,
         _req: crate::model::ListEncryptionConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListEncryptionConfigsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListEncryptionConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -840,9 +823,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn get_encryption_config(
         &self,
         _req: crate::model::GetEncryptionConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EncryptionConfig>>,
+        Output = crate::Result<crate::Response<crate::model::EncryptionConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -851,10 +834,10 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -864,9 +847,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -875,9 +858,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -886,9 +869,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -897,10 +880,10 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -910,10 +893,10 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -923,9 +906,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -934,8 +917,8 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -943,8 +926,8 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -954,9 +937,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -965,9 +948,9 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -987,10 +970,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn create_content(
         &self,
         _req: crate::model::CreateContentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Content>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Content>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -998,10 +980,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn update_content(
         &self,
         _req: crate::model::UpdateContentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Content>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Content>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1009,8 +990,8 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn delete_content(
         &self,
         _req: crate::model::DeleteContentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1018,10 +999,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn get_content(
         &self,
         _req: crate::model::GetContentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Content>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Content>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1029,9 +1009,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1040,9 +1020,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1051,10 +1031,10 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1064,9 +1044,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn list_content(
         &self,
         _req: crate::model::ListContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListContentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListContentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1075,10 +1055,10 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1088,9 +1068,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1099,10 +1079,10 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1112,9 +1092,9 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1123,8 +1103,8 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1132,8 +1112,8 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1154,9 +1134,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn create_data_taxonomy(
         &self,
         _req: crate::model::CreateDataTaxonomyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1165,9 +1145,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn update_data_taxonomy(
         &self,
         _req: crate::model::UpdateDataTaxonomyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1176,9 +1156,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn delete_data_taxonomy(
         &self,
         _req: crate::model::DeleteDataTaxonomyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1187,9 +1167,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn list_data_taxonomies(
         &self,
         _req: crate::model::ListDataTaxonomiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataTaxonomiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataTaxonomiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1198,9 +1178,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn get_data_taxonomy(
         &self,
         _req: crate::model::GetDataTaxonomyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataTaxonomy>>,
+        Output = crate::Result<crate::Response<crate::model::DataTaxonomy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1209,9 +1189,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn create_data_attribute_binding(
         &self,
         _req: crate::model::CreateDataAttributeBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1220,9 +1200,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn update_data_attribute_binding(
         &self,
         _req: crate::model::UpdateDataAttributeBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1231,9 +1211,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn delete_data_attribute_binding(
         &self,
         _req: crate::model::DeleteDataAttributeBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1242,11 +1222,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn list_data_attribute_bindings(
         &self,
         _req: crate::model::ListDataAttributeBindingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDataAttributeBindingsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDataAttributeBindingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1255,9 +1233,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn get_data_attribute_binding(
         &self,
         _req: crate::model::GetDataAttributeBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAttributeBinding>>,
+        Output = crate::Result<crate::Response<crate::model::DataAttributeBinding>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1266,9 +1244,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn create_data_attribute(
         &self,
         _req: crate::model::CreateDataAttributeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1277,9 +1255,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn update_data_attribute(
         &self,
         _req: crate::model::UpdateDataAttributeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1288,9 +1266,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn delete_data_attribute(
         &self,
         _req: crate::model::DeleteDataAttributeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1299,9 +1277,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn list_data_attributes(
         &self,
         _req: crate::model::ListDataAttributesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataAttributesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataAttributesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1310,9 +1288,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn get_data_attribute(
         &self,
         _req: crate::model::GetDataAttributeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataAttribute>>,
+        Output = crate::Result<crate::Response<crate::model::DataAttribute>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1321,10 +1299,10 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1334,9 +1312,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1345,9 +1323,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1356,9 +1334,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1367,10 +1345,10 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1380,10 +1358,10 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1393,9 +1371,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1404,8 +1382,8 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1413,8 +1391,8 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1424,9 +1402,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1435,9 +1413,9 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1457,9 +1435,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn create_data_scan(
         &self,
         _req: crate::model::CreateDataScanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1468,9 +1446,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn update_data_scan(
         &self,
         _req: crate::model::UpdateDataScanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1479,9 +1457,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn delete_data_scan(
         &self,
         _req: crate::model::DeleteDataScanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1490,10 +1468,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn get_data_scan(
         &self,
         _req: crate::model::GetDataScanRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataScan>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataScan>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1501,9 +1478,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn list_data_scans(
         &self,
         _req: crate::model::ListDataScansRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataScansResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataScansResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1512,9 +1489,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn run_data_scan(
         &self,
         _req: crate::model::RunDataScanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RunDataScanResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RunDataScanResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1523,10 +1500,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn get_data_scan_job(
         &self,
         _req: crate::model::GetDataScanJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataScanJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataScanJob>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1534,9 +1510,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn list_data_scan_jobs(
         &self,
         _req: crate::model::ListDataScanJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataScanJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataScanJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1545,11 +1521,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn generate_data_quality_rules(
         &self,
         _req: crate::model::GenerateDataQualityRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateDataQualityRulesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateDataQualityRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1558,10 +1532,10 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1571,9 +1545,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1582,9 +1556,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1593,9 +1567,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1604,10 +1578,10 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1617,10 +1591,10 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1630,9 +1604,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1641,8 +1615,8 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1650,8 +1624,8 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1661,9 +1635,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1672,9 +1646,9 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1694,10 +1668,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_entity(
         &self,
         _req: crate::model::CreateEntityRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entity>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entity>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1705,10 +1678,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn update_entity(
         &self,
         _req: crate::model::UpdateEntityRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entity>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entity>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1716,8 +1688,8 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_entity(
         &self,
         _req: crate::model::DeleteEntityRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1725,10 +1697,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_entity(
         &self,
         _req: crate::model::GetEntityRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Entity>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Entity>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1736,9 +1707,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_entities(
         &self,
         _req: crate::model::ListEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntitiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntitiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1747,10 +1718,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn create_partition(
         &self,
         _req: crate::model::CreatePartitionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Partition>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Partition>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1758,8 +1728,8 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_partition(
         &self,
         _req: crate::model::DeletePartitionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1767,10 +1737,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_partition(
         &self,
         _req: crate::model::GetPartitionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Partition>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Partition>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1778,9 +1747,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_partitions(
         &self,
         _req: crate::model::ListPartitionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPartitionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPartitionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1789,10 +1758,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1802,9 +1771,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1813,9 +1782,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1824,9 +1793,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1835,10 +1804,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1848,10 +1817,10 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1861,9 +1830,9 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1872,8 +1841,8 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1881,8 +1850,8 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1903,9 +1872,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn create_lake(
         &self,
         _req: crate::model::CreateLakeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1914,9 +1883,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn update_lake(
         &self,
         _req: crate::model::UpdateLakeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1925,9 +1894,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn delete_lake(
         &self,
         _req: crate::model::DeleteLakeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1936,9 +1905,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_lakes(
         &self,
         _req: crate::model::ListLakesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListLakesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListLakesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1947,10 +1916,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_lake(
         &self,
         _req: crate::model::GetLakeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Lake>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Lake>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1958,9 +1926,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_lake_actions(
         &self,
         _req: crate::model::ListLakeActionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListActionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListActionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1969,9 +1937,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn create_zone(
         &self,
         _req: crate::model::CreateZoneRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1980,9 +1948,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn update_zone(
         &self,
         _req: crate::model::UpdateZoneRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1991,9 +1959,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn delete_zone(
         &self,
         _req: crate::model::DeleteZoneRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2002,9 +1970,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_zones(
         &self,
         _req: crate::model::ListZonesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListZonesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListZonesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2013,10 +1981,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_zone(
         &self,
         _req: crate::model::GetZoneRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Zone>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Zone>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2024,9 +1991,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_zone_actions(
         &self,
         _req: crate::model::ListZoneActionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListActionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListActionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2035,9 +2002,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn create_asset(
         &self,
         _req: crate::model::CreateAssetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2046,9 +2013,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn update_asset(
         &self,
         _req: crate::model::UpdateAssetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2057,9 +2024,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn delete_asset(
         &self,
         _req: crate::model::DeleteAssetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2068,9 +2035,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_assets(
         &self,
         _req: crate::model::ListAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAssetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAssetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2079,10 +2046,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_asset(
         &self,
         _req: crate::model::GetAssetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Asset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Asset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2090,9 +2056,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_asset_actions(
         &self,
         _req: crate::model::ListAssetActionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListActionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListActionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2101,9 +2067,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn create_task(
         &self,
         _req: crate::model::CreateTaskRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2112,9 +2078,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn update_task(
         &self,
         _req: crate::model::UpdateTaskRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2123,9 +2089,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn delete_task(
         &self,
         _req: crate::model::DeleteTaskRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2134,9 +2100,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_tasks(
         &self,
         _req: crate::model::ListTasksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTasksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTasksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2145,10 +2111,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_task(
         &self,
         _req: crate::model::GetTaskRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Task>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Task>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2156,9 +2121,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_jobs(
         &self,
         _req: crate::model::ListJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2167,9 +2132,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn run_task(
         &self,
         _req: crate::model::RunTaskRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RunTaskResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RunTaskResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2178,9 +2143,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_job(
         &self,
         _req: crate::model::GetJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2188,8 +2153,8 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn cancel_job(
         &self,
         _req: crate::model::CancelJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2197,9 +2162,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn create_environment(
         &self,
         _req: crate::model::CreateEnvironmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2208,9 +2173,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn update_environment(
         &self,
         _req: crate::model::UpdateEnvironmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2219,9 +2184,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn delete_environment(
         &self,
         _req: crate::model::DeleteEnvironmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2230,9 +2195,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_environments(
         &self,
         _req: crate::model::ListEnvironmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2241,10 +2206,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_environment(
         &self,
         _req: crate::model::GetEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Environment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Environment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2252,9 +2216,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_sessions(
         &self,
         _req: crate::model::ListSessionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSessionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2263,10 +2227,10 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2276,9 +2240,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2287,9 +2251,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2298,9 +2262,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2309,10 +2273,10 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2322,10 +2286,10 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2335,9 +2299,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2346,8 +2310,8 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2355,8 +2319,8 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2366,9 +2330,9 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2377,8 +2341,8 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/dataplex/v1/src/stub/dynamic.rs b/src/generated/cloud/dataplex/v1/src/stub/dynamic.rs
index 9f65431725..ebe20ef84e 100644
--- a/src/generated/cloud/dataplex/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/dataplex/v1/src/stub/dynamic.rs
@@ -20,160 +20,156 @@ pub trait BusinessGlossaryService: std::fmt::Debug + Send + Sync {
     async fn create_glossary(
         &self,
         req: crate::model::CreateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_glossary(
         &self,
         req: crate::model::UpdateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_glossary(
         &self,
         req: crate::model::DeleteGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_glossary(
         &self,
         req: crate::model::GetGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Glossary>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Glossary>>;
 
     async fn list_glossaries(
         &self,
         req: crate::model::ListGlossariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGlossariesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGlossariesResponse>>;
 
     async fn create_glossary_category(
         &self,
         req: crate::model::CreateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryCategory>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryCategory>>;
 
     async fn update_glossary_category(
         &self,
         req: crate::model::UpdateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryCategory>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryCategory>>;
 
     async fn delete_glossary_category(
         &self,
         req: crate::model::DeleteGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_glossary_category(
         &self,
         req: crate::model::GetGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryCategory>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryCategory>>;
 
     async fn list_glossary_categories(
         &self,
         req: crate::model::ListGlossaryCategoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGlossaryCategoriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGlossaryCategoriesResponse>>;
 
     async fn create_glossary_term(
         &self,
         req: crate::model::CreateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryTerm>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryTerm>>;
 
     async fn update_glossary_term(
         &self,
         req: crate::model::UpdateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryTerm>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryTerm>>;
 
     async fn delete_glossary_term(
         &self,
         req: crate::model::DeleteGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_glossary_term(
         &self,
         req: crate::model::GetGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryTerm>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryTerm>>;
 
     async fn list_glossary_terms(
         &self,
         req: crate::model::ListGlossaryTermsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGlossaryTermsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGlossaryTermsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BusinessGlossaryService] also implement [BusinessGlossaryService].
@@ -183,8 +179,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn create_glossary(
         &self,
         req: crate::model::CreateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_glossary(self, req, options).await
     }
 
@@ -192,8 +188,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn update_glossary(
         &self,
         req: crate::model::UpdateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_glossary(self, req, options).await
     }
 
@@ -201,8 +197,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn delete_glossary(
         &self,
         req: crate::model::DeleteGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_glossary(self, req, options).await
     }
 
@@ -210,8 +206,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn get_glossary(
         &self,
         req: crate::model::GetGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Glossary>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Glossary>> {
         T::get_glossary(self, req, options).await
     }
 
@@ -219,8 +215,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn list_glossaries(
         &self,
         req: crate::model::ListGlossariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGlossariesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGlossariesResponse>> {
         T::list_glossaries(self, req, options).await
     }
 
@@ -228,8 +224,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn create_glossary_category(
         &self,
         req: crate::model::CreateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryCategory>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryCategory>> {
         T::create_glossary_category(self, req, options).await
     }
 
@@ -237,8 +233,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn update_glossary_category(
         &self,
         req: crate::model::UpdateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryCategory>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryCategory>> {
         T::update_glossary_category(self, req, options).await
     }
 
@@ -246,8 +242,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn delete_glossary_category(
         &self,
         req: crate::model::DeleteGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_glossary_category(self, req, options).await
     }
 
@@ -255,8 +251,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn get_glossary_category(
         &self,
         req: crate::model::GetGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryCategory>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryCategory>> {
         T::get_glossary_category(self, req, options).await
     }
 
@@ -264,8 +260,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn list_glossary_categories(
         &self,
         req: crate::model::ListGlossaryCategoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGlossaryCategoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGlossaryCategoriesResponse>> {
         T::list_glossary_categories(self, req, options).await
     }
 
@@ -273,8 +269,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn create_glossary_term(
         &self,
         req: crate::model::CreateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryTerm>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryTerm>> {
         T::create_glossary_term(self, req, options).await
     }
 
@@ -282,8 +278,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn update_glossary_term(
         &self,
         req: crate::model::UpdateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryTerm>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryTerm>> {
         T::update_glossary_term(self, req, options).await
     }
 
@@ -291,8 +287,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn delete_glossary_term(
         &self,
         req: crate::model::DeleteGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_glossary_term(self, req, options).await
     }
 
@@ -300,8 +296,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn get_glossary_term(
         &self,
         req: crate::model::GetGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GlossaryTerm>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GlossaryTerm>> {
         T::get_glossary_term(self, req, options).await
     }
 
@@ -309,8 +305,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn list_glossary_terms(
         &self,
         req: crate::model::ListGlossaryTermsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGlossaryTermsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGlossaryTermsResponse>> {
         T::list_glossary_terms(self, req, options).await
     }
 
@@ -318,9 +314,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -328,8 +323,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -337,8 +332,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -346,8 +341,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -355,10 +350,9 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -366,10 +360,9 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -377,8 +370,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -386,8 +379,8 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -395,22 +388,22 @@ impl<T: super::BusinessGlossaryService> BusinessGlossaryService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -421,244 +414,240 @@ pub trait CatalogService: std::fmt::Debug + Send + Sync {
     async fn create_entry_type(
         &self,
         req: crate::model::CreateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_entry_type(
         &self,
         req: crate::model::UpdateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_entry_type(
         &self,
         req: crate::model::DeleteEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_entry_types(
         &self,
         req: crate::model::ListEntryTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntryTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntryTypesResponse>>;
 
     async fn get_entry_type(
         &self,
         req: crate::model::GetEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryType>>;
 
     async fn create_aspect_type(
         &self,
         req: crate::model::CreateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_aspect_type(
         &self,
         req: crate::model::UpdateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_aspect_type(
         &self,
         req: crate::model::DeleteAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_aspect_types(
         &self,
         req: crate::model::ListAspectTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAspectTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAspectTypesResponse>>;
 
     async fn get_aspect_type(
         &self,
         req: crate::model::GetAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AspectType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AspectType>>;
 
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntryGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntryGroupsResponse>>;
 
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>>;
 
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntriesResponse>>;
 
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>>;
 
     async fn search_entries(
         &self,
         req: crate::model::SearchEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchEntriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchEntriesResponse>>;
 
     async fn create_metadata_job(
         &self,
         req: crate::model::CreateMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_metadata_job(
         &self,
         req: crate::model::GetMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataJob>>;
 
     async fn list_metadata_jobs(
         &self,
         req: crate::model::ListMetadataJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataJobsResponse>>;
 
     async fn cancel_metadata_job(
         &self,
         req: crate::model::CancelMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_entry_link(
         &self,
         req: crate::model::CreateEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryLink>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryLink>>;
 
     async fn delete_entry_link(
         &self,
         req: crate::model::DeleteEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryLink>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryLink>>;
 
     async fn get_entry_link(
         &self,
         req: crate::model::GetEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryLink>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryLink>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CatalogService] also implement [CatalogService].
@@ -668,8 +657,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn create_entry_type(
         &self,
         req: crate::model::CreateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_entry_type(self, req, options).await
     }
 
@@ -677,8 +666,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn update_entry_type(
         &self,
         req: crate::model::UpdateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_entry_type(self, req, options).await
     }
 
@@ -686,8 +675,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn delete_entry_type(
         &self,
         req: crate::model::DeleteEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_entry_type(self, req, options).await
     }
 
@@ -695,8 +684,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_entry_types(
         &self,
         req: crate::model::ListEntryTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntryTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntryTypesResponse>> {
         T::list_entry_types(self, req, options).await
     }
 
@@ -704,8 +693,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_entry_type(
         &self,
         req: crate::model::GetEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryType>> {
         T::get_entry_type(self, req, options).await
     }
 
@@ -713,8 +702,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn create_aspect_type(
         &self,
         req: crate::model::CreateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_aspect_type(self, req, options).await
     }
 
@@ -722,8 +711,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn update_aspect_type(
         &self,
         req: crate::model::UpdateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_aspect_type(self, req, options).await
     }
 
@@ -731,8 +720,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn delete_aspect_type(
         &self,
         req: crate::model::DeleteAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_aspect_type(self, req, options).await
     }
 
@@ -740,8 +729,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_aspect_types(
         &self,
         req: crate::model::ListAspectTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAspectTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAspectTypesResponse>> {
         T::list_aspect_types(self, req, options).await
     }
 
@@ -749,8 +738,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_aspect_type(
         &self,
         req: crate::model::GetAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AspectType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AspectType>> {
         T::get_aspect_type(self, req, options).await
     }
 
@@ -758,8 +747,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_entry_group(self, req, options).await
     }
 
@@ -767,8 +756,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_entry_group(self, req, options).await
     }
 
@@ -776,8 +765,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_entry_group(self, req, options).await
     }
 
@@ -785,8 +774,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntryGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntryGroupsResponse>> {
         T::list_entry_groups(self, req, options).await
     }
 
@@ -794,8 +783,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryGroup>> {
         T::get_entry_group(self, req, options).await
     }
 
@@ -803,8 +792,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::create_entry(self, req, options).await
     }
 
@@ -812,8 +801,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::update_entry(self, req, options).await
     }
 
@@ -821,8 +810,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::delete_entry(self, req, options).await
     }
 
@@ -830,8 +819,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntriesResponse>> {
         T::list_entries(self, req, options).await
     }
 
@@ -839,8 +828,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::get_entry(self, req, options).await
     }
 
@@ -848,8 +837,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entry>> {
         T::lookup_entry(self, req, options).await
     }
 
@@ -857,8 +846,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn search_entries(
         &self,
         req: crate::model::SearchEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchEntriesResponse>> {
         T::search_entries(self, req, options).await
     }
 
@@ -866,8 +855,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn create_metadata_job(
         &self,
         req: crate::model::CreateMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_metadata_job(self, req, options).await
     }
 
@@ -875,8 +864,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_metadata_job(
         &self,
         req: crate::model::GetMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataJob>> {
         T::get_metadata_job(self, req, options).await
     }
 
@@ -884,8 +873,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_metadata_jobs(
         &self,
         req: crate::model::ListMetadataJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataJobsResponse>> {
         T::list_metadata_jobs(self, req, options).await
     }
 
@@ -893,8 +882,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn cancel_metadata_job(
         &self,
         req: crate::model::CancelMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_metadata_job(self, req, options).await
     }
 
@@ -902,8 +891,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn create_entry_link(
         &self,
         req: crate::model::CreateEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryLink>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryLink>> {
         T::create_entry_link(self, req, options).await
     }
 
@@ -911,8 +900,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn delete_entry_link(
         &self,
         req: crate::model::DeleteEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryLink>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryLink>> {
         T::delete_entry_link(self, req, options).await
     }
 
@@ -920,8 +909,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_entry_link(
         &self,
         req: crate::model::GetEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntryLink>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntryLink>> {
         T::get_entry_link(self, req, options).await
     }
 
@@ -929,9 +918,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -939,8 +927,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -948,8 +936,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -957,8 +945,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -966,10 +954,9 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -977,10 +964,9 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -988,8 +974,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -997,8 +983,8 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1006,22 +992,22 @@ impl<T: super::CatalogService> CatalogService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1032,100 +1018,96 @@ pub trait CmekService: std::fmt::Debug + Send + Sync {
     async fn create_encryption_config(
         &self,
         req: crate::model::CreateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_encryption_config(
         &self,
         req: crate::model::UpdateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_encryption_config(
         &self,
         req: crate::model::DeleteEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_encryption_configs(
         &self,
         req: crate::model::ListEncryptionConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEncryptionConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEncryptionConfigsResponse>>;
 
     async fn get_encryption_config(
         &self,
         req: crate::model::GetEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptionConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptionConfig>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CmekService] also implement [CmekService].
@@ -1135,8 +1117,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn create_encryption_config(
         &self,
         req: crate::model::CreateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_encryption_config(self, req, options).await
     }
 
@@ -1144,8 +1126,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn update_encryption_config(
         &self,
         req: crate::model::UpdateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_encryption_config(self, req, options).await
     }
 
@@ -1153,8 +1135,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn delete_encryption_config(
         &self,
         req: crate::model::DeleteEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_encryption_config(self, req, options).await
     }
 
@@ -1162,8 +1144,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn list_encryption_configs(
         &self,
         req: crate::model::ListEncryptionConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEncryptionConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEncryptionConfigsResponse>> {
         T::list_encryption_configs(self, req, options).await
     }
 
@@ -1171,8 +1153,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn get_encryption_config(
         &self,
         req: crate::model::GetEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptionConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptionConfig>> {
         T::get_encryption_config(self, req, options).await
     }
 
@@ -1180,9 +1162,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1190,8 +1171,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1199,8 +1180,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1208,8 +1189,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1217,10 +1198,9 @@ impl<T: super::CmekService> CmekService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1228,10 +1208,9 @@ impl<T: super::CmekService> CmekService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1239,8 +1218,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1248,8 +1227,8 @@ impl<T: super::CmekService> CmekService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1257,22 +1236,22 @@ impl<T: super::CmekService> CmekService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1283,90 +1262,86 @@ pub trait ContentService: std::fmt::Debug + Send + Sync {
     async fn create_content(
         &self,
         req: crate::model::CreateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Content>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Content>>;
 
     async fn update_content(
         &self,
         req: crate::model::UpdateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Content>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Content>>;
 
     async fn delete_content(
         &self,
         req: crate::model::DeleteContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_content(
         &self,
         req: crate::model::GetContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Content>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Content>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_content(
         &self,
         req: crate::model::ListContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContentResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ContentService] also implement [ContentService].
@@ -1376,8 +1351,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn create_content(
         &self,
         req: crate::model::CreateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Content>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Content>> {
         T::create_content(self, req, options).await
     }
 
@@ -1385,8 +1360,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn update_content(
         &self,
         req: crate::model::UpdateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Content>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Content>> {
         T::update_content(self, req, options).await
     }
 
@@ -1394,8 +1369,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn delete_content(
         &self,
         req: crate::model::DeleteContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_content(self, req, options).await
     }
 
@@ -1403,8 +1378,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn get_content(
         &self,
         req: crate::model::GetContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Content>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Content>> {
         T::get_content(self, req, options).await
     }
 
@@ -1412,8 +1387,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1421,8 +1396,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1430,10 +1405,9 @@ impl<T: super::ContentService> ContentService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1441,8 +1415,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn list_content(
         &self,
         req: crate::model::ListContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContentResponse>> {
         T::list_content(self, req, options).await
     }
 
@@ -1450,9 +1424,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1460,8 +1433,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1469,10 +1442,9 @@ impl<T: super::ContentService> ContentService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1480,8 +1452,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1489,8 +1461,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1498,8 +1470,8 @@ impl<T: super::ContentService> ContentService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1510,160 +1482,156 @@ pub trait DataTaxonomyService: std::fmt::Debug + Send + Sync {
     async fn create_data_taxonomy(
         &self,
         req: crate::model::CreateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_data_taxonomy(
         &self,
         req: crate::model::UpdateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_data_taxonomy(
         &self,
         req: crate::model::DeleteDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_data_taxonomies(
         &self,
         req: crate::model::ListDataTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataTaxonomiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataTaxonomiesResponse>>;
 
     async fn get_data_taxonomy(
         &self,
         req: crate::model::GetDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataTaxonomy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataTaxonomy>>;
 
     async fn create_data_attribute_binding(
         &self,
         req: crate::model::CreateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_data_attribute_binding(
         &self,
         req: crate::model::UpdateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_data_attribute_binding(
         &self,
         req: crate::model::DeleteDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_data_attribute_bindings(
         &self,
         req: crate::model::ListDataAttributeBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAttributeBindingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAttributeBindingsResponse>>;
 
     async fn get_data_attribute_binding(
         &self,
         req: crate::model::GetDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAttributeBinding>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAttributeBinding>>;
 
     async fn create_data_attribute(
         &self,
         req: crate::model::CreateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_data_attribute(
         &self,
         req: crate::model::UpdateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_data_attribute(
         &self,
         req: crate::model::DeleteDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_data_attributes(
         &self,
         req: crate::model::ListDataAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAttributesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAttributesResponse>>;
 
     async fn get_data_attribute(
         &self,
         req: crate::model::GetDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAttribute>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAttribute>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataTaxonomyService] also implement [DataTaxonomyService].
@@ -1673,8 +1641,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn create_data_taxonomy(
         &self,
         req: crate::model::CreateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_data_taxonomy(self, req, options).await
     }
 
@@ -1682,8 +1650,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn update_data_taxonomy(
         &self,
         req: crate::model::UpdateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_data_taxonomy(self, req, options).await
     }
 
@@ -1691,8 +1659,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn delete_data_taxonomy(
         &self,
         req: crate::model::DeleteDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_data_taxonomy(self, req, options).await
     }
 
@@ -1700,8 +1668,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn list_data_taxonomies(
         &self,
         req: crate::model::ListDataTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataTaxonomiesResponse>> {
         T::list_data_taxonomies(self, req, options).await
     }
 
@@ -1709,8 +1677,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn get_data_taxonomy(
         &self,
         req: crate::model::GetDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataTaxonomy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataTaxonomy>> {
         T::get_data_taxonomy(self, req, options).await
     }
 
@@ -1718,8 +1686,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn create_data_attribute_binding(
         &self,
         req: crate::model::CreateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_data_attribute_binding(self, req, options).await
     }
 
@@ -1727,8 +1695,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn update_data_attribute_binding(
         &self,
         req: crate::model::UpdateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_data_attribute_binding(self, req, options).await
     }
 
@@ -1736,8 +1704,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn delete_data_attribute_binding(
         &self,
         req: crate::model::DeleteDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_data_attribute_binding(self, req, options).await
     }
 
@@ -1745,9 +1713,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn list_data_attribute_bindings(
         &self,
         req: crate::model::ListDataAttributeBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAttributeBindingsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAttributeBindingsResponse>> {
         T::list_data_attribute_bindings(self, req, options).await
     }
 
@@ -1755,8 +1722,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn get_data_attribute_binding(
         &self,
         req: crate::model::GetDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAttributeBinding>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAttributeBinding>> {
         T::get_data_attribute_binding(self, req, options).await
     }
 
@@ -1764,8 +1731,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn create_data_attribute(
         &self,
         req: crate::model::CreateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_data_attribute(self, req, options).await
     }
 
@@ -1773,8 +1740,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn update_data_attribute(
         &self,
         req: crate::model::UpdateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_data_attribute(self, req, options).await
     }
 
@@ -1782,8 +1749,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn delete_data_attribute(
         &self,
         req: crate::model::DeleteDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_data_attribute(self, req, options).await
     }
 
@@ -1791,8 +1758,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn list_data_attributes(
         &self,
         req: crate::model::ListDataAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataAttributesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataAttributesResponse>> {
         T::list_data_attributes(self, req, options).await
     }
 
@@ -1800,8 +1767,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn get_data_attribute(
         &self,
         req: crate::model::GetDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataAttribute>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataAttribute>> {
         T::get_data_attribute(self, req, options).await
     }
 
@@ -1809,9 +1776,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1819,8 +1785,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1828,8 +1794,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1837,8 +1803,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1846,10 +1812,9 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1857,10 +1822,9 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1868,8 +1832,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1877,8 +1841,8 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1886,22 +1850,22 @@ impl<T: super::DataTaxonomyService> DataTaxonomyService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1912,124 +1876,120 @@ pub trait DataScanService: std::fmt::Debug + Send + Sync {
     async fn create_data_scan(
         &self,
         req: crate::model::CreateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_data_scan(
         &self,
         req: crate::model::UpdateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_data_scan(
         &self,
         req: crate::model::DeleteDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_data_scan(
         &self,
         req: crate::model::GetDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataScan>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataScan>>;
 
     async fn list_data_scans(
         &self,
         req: crate::model::ListDataScansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataScansResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataScansResponse>>;
 
     async fn run_data_scan(
         &self,
         req: crate::model::RunDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RunDataScanResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RunDataScanResponse>>;
 
     async fn get_data_scan_job(
         &self,
         req: crate::model::GetDataScanJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataScanJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataScanJob>>;
 
     async fn list_data_scan_jobs(
         &self,
         req: crate::model::ListDataScanJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataScanJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataScanJobsResponse>>;
 
     async fn generate_data_quality_rules(
         &self,
         req: crate::model::GenerateDataQualityRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateDataQualityRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateDataQualityRulesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataScanService] also implement [DataScanService].
@@ -2039,8 +1999,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn create_data_scan(
         &self,
         req: crate::model::CreateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_data_scan(self, req, options).await
     }
 
@@ -2048,8 +2008,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn update_data_scan(
         &self,
         req: crate::model::UpdateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_data_scan(self, req, options).await
     }
 
@@ -2057,8 +2017,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn delete_data_scan(
         &self,
         req: crate::model::DeleteDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_data_scan(self, req, options).await
     }
 
@@ -2066,8 +2026,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn get_data_scan(
         &self,
         req: crate::model::GetDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataScan>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataScan>> {
         T::get_data_scan(self, req, options).await
     }
 
@@ -2075,8 +2035,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn list_data_scans(
         &self,
         req: crate::model::ListDataScansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataScansResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataScansResponse>> {
         T::list_data_scans(self, req, options).await
     }
 
@@ -2084,8 +2044,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn run_data_scan(
         &self,
         req: crate::model::RunDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RunDataScanResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RunDataScanResponse>> {
         T::run_data_scan(self, req, options).await
     }
 
@@ -2093,8 +2053,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn get_data_scan_job(
         &self,
         req: crate::model::GetDataScanJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataScanJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataScanJob>> {
         T::get_data_scan_job(self, req, options).await
     }
 
@@ -2102,8 +2062,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn list_data_scan_jobs(
         &self,
         req: crate::model::ListDataScanJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataScanJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataScanJobsResponse>> {
         T::list_data_scan_jobs(self, req, options).await
     }
 
@@ -2111,9 +2071,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn generate_data_quality_rules(
         &self,
         req: crate::model::GenerateDataQualityRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateDataQualityRulesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateDataQualityRulesResponse>> {
         T::generate_data_quality_rules(self, req, options).await
     }
 
@@ -2121,9 +2080,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2131,8 +2089,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2140,8 +2098,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -2149,8 +2107,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -2158,10 +2116,9 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2169,10 +2126,9 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2180,8 +2136,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2189,8 +2145,8 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2198,22 +2154,22 @@ impl<T: super::DataScanService> DataScanService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2224,114 +2180,110 @@ pub trait MetadataService: std::fmt::Debug + Send + Sync {
     async fn create_entity(
         &self,
         req: crate::model::CreateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entity>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entity>>;
 
     async fn update_entity(
         &self,
         req: crate::model::UpdateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entity>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entity>>;
 
     async fn delete_entity(
         &self,
         req: crate::model::DeleteEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_entity(
         &self,
         req: crate::model::GetEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entity>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entity>>;
 
     async fn list_entities(
         &self,
         req: crate::model::ListEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntitiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntitiesResponse>>;
 
     async fn create_partition(
         &self,
         req: crate::model::CreatePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Partition>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Partition>>;
 
     async fn delete_partition(
         &self,
         req: crate::model::DeletePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_partition(
         &self,
         req: crate::model::GetPartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Partition>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Partition>>;
 
     async fn list_partitions(
         &self,
         req: crate::model::ListPartitionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPartitionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPartitionsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::MetadataService] also implement [MetadataService].
@@ -2341,8 +2293,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_entity(
         &self,
         req: crate::model::CreateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entity>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entity>> {
         T::create_entity(self, req, options).await
     }
 
@@ -2350,8 +2302,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn update_entity(
         &self,
         req: crate::model::UpdateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entity>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entity>> {
         T::update_entity(self, req, options).await
     }
 
@@ -2359,8 +2311,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_entity(
         &self,
         req: crate::model::DeleteEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_entity(self, req, options).await
     }
 
@@ -2368,8 +2320,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_entity(
         &self,
         req: crate::model::GetEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Entity>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Entity>> {
         T::get_entity(self, req, options).await
     }
 
@@ -2377,8 +2329,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_entities(
         &self,
         req: crate::model::ListEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntitiesResponse>> {
         T::list_entities(self, req, options).await
     }
 
@@ -2386,8 +2338,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn create_partition(
         &self,
         req: crate::model::CreatePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Partition>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Partition>> {
         T::create_partition(self, req, options).await
     }
 
@@ -2395,8 +2347,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_partition(
         &self,
         req: crate::model::DeletePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_partition(self, req, options).await
     }
 
@@ -2404,8 +2356,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_partition(
         &self,
         req: crate::model::GetPartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Partition>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Partition>> {
         T::get_partition(self, req, options).await
     }
 
@@ -2413,8 +2365,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_partitions(
         &self,
         req: crate::model::ListPartitionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPartitionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPartitionsResponse>> {
         T::list_partitions(self, req, options).await
     }
 
@@ -2422,9 +2374,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2432,8 +2383,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2441,8 +2392,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -2450,8 +2401,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -2459,10 +2410,9 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -2470,10 +2420,9 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2481,8 +2430,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2490,8 +2439,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -2499,8 +2448,8 @@ impl<T: super::MetadataService> MetadataService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2511,268 +2460,264 @@ pub trait DataplexService: std::fmt::Debug + Send + Sync {
     async fn create_lake(
         &self,
         req: crate::model::CreateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_lake(
         &self,
         req: crate::model::UpdateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_lake(
         &self,
         req: crate::model::DeleteLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_lakes(
         &self,
         req: crate::model::ListLakesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLakesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLakesResponse>>;
 
     async fn get_lake(
         &self,
         req: crate::model::GetLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Lake>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Lake>>;
 
     async fn list_lake_actions(
         &self,
         req: crate::model::ListLakeActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActionsResponse>>;
 
     async fn create_zone(
         &self,
         req: crate::model::CreateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_zone(
         &self,
         req: crate::model::UpdateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_zone(
         &self,
         req: crate::model::DeleteZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListZonesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListZonesResponse>>;
 
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Zone>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Zone>>;
 
     async fn list_zone_actions(
         &self,
         req: crate::model::ListZoneActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActionsResponse>>;
 
     async fn create_asset(
         &self,
         req: crate::model::CreateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssetsResponse>>;
 
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Asset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Asset>>;
 
     async fn list_asset_actions(
         &self,
         req: crate::model::ListAssetActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActionsResponse>>;
 
     async fn create_task(
         &self,
         req: crate::model::CreateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_task(
         &self,
         req: crate::model::UpdateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_task(
         &self,
         req: crate::model::DeleteTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_tasks(
         &self,
         req: crate::model::ListTasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTasksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTasksResponse>>;
 
     async fn get_task(
         &self,
         req: crate::model::GetTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Task>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Task>>;
 
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListJobsResponse>>;
 
     async fn run_task(
         &self,
         req: crate::model::RunTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RunTaskResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RunTaskResponse>>;
 
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>>;
 
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>>;
 
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataplexService] also implement [DataplexService].
@@ -2782,8 +2727,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn create_lake(
         &self,
         req: crate::model::CreateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_lake(self, req, options).await
     }
 
@@ -2791,8 +2736,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn update_lake(
         &self,
         req: crate::model::UpdateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_lake(self, req, options).await
     }
 
@@ -2800,8 +2745,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn delete_lake(
         &self,
         req: crate::model::DeleteLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_lake(self, req, options).await
     }
 
@@ -2809,8 +2754,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_lakes(
         &self,
         req: crate::model::ListLakesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLakesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLakesResponse>> {
         T::list_lakes(self, req, options).await
     }
 
@@ -2818,8 +2763,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_lake(
         &self,
         req: crate::model::GetLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Lake>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Lake>> {
         T::get_lake(self, req, options).await
     }
 
@@ -2827,8 +2772,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_lake_actions(
         &self,
         req: crate::model::ListLakeActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActionsResponse>> {
         T::list_lake_actions(self, req, options).await
     }
 
@@ -2836,8 +2781,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn create_zone(
         &self,
         req: crate::model::CreateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_zone(self, req, options).await
     }
 
@@ -2845,8 +2790,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn update_zone(
         &self,
         req: crate::model::UpdateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_zone(self, req, options).await
     }
 
@@ -2854,8 +2799,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn delete_zone(
         &self,
         req: crate::model::DeleteZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_zone(self, req, options).await
     }
 
@@ -2863,8 +2808,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListZonesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListZonesResponse>> {
         T::list_zones(self, req, options).await
     }
 
@@ -2872,8 +2817,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Zone>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Zone>> {
         T::get_zone(self, req, options).await
     }
 
@@ -2881,8 +2826,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_zone_actions(
         &self,
         req: crate::model::ListZoneActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActionsResponse>> {
         T::list_zone_actions(self, req, options).await
     }
 
@@ -2890,8 +2835,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn create_asset(
         &self,
         req: crate::model::CreateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_asset(self, req, options).await
     }
 
@@ -2899,8 +2844,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_asset(self, req, options).await
     }
 
@@ -2908,8 +2853,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_asset(self, req, options).await
     }
 
@@ -2917,8 +2862,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssetsResponse>> {
         T::list_assets(self, req, options).await
     }
 
@@ -2926,8 +2871,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Asset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Asset>> {
         T::get_asset(self, req, options).await
     }
 
@@ -2935,8 +2880,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_asset_actions(
         &self,
         req: crate::model::ListAssetActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActionsResponse>> {
         T::list_asset_actions(self, req, options).await
     }
 
@@ -2944,8 +2889,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn create_task(
         &self,
         req: crate::model::CreateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_task(self, req, options).await
     }
 
@@ -2953,8 +2898,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn update_task(
         &self,
         req: crate::model::UpdateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_task(self, req, options).await
     }
 
@@ -2962,8 +2907,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn delete_task(
         &self,
         req: crate::model::DeleteTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_task(self, req, options).await
     }
 
@@ -2971,8 +2916,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_tasks(
         &self,
         req: crate::model::ListTasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTasksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTasksResponse>> {
         T::list_tasks(self, req, options).await
     }
 
@@ -2980,8 +2925,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_task(
         &self,
         req: crate::model::GetTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Task>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Task>> {
         T::get_task(self, req, options).await
     }
 
@@ -2989,8 +2934,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListJobsResponse>> {
         T::list_jobs(self, req, options).await
     }
 
@@ -2998,8 +2943,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn run_task(
         &self,
         req: crate::model::RunTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RunTaskResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RunTaskResponse>> {
         T::run_task(self, req, options).await
     }
 
@@ -3007,8 +2952,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::get_job(self, req, options).await
     }
 
@@ -3016,8 +2961,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_job(self, req, options).await
     }
 
@@ -3025,8 +2970,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_environment(self, req, options).await
     }
 
@@ -3034,8 +2979,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_environment(self, req, options).await
     }
 
@@ -3043,8 +2988,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_environment(self, req, options).await
     }
 
@@ -3052,8 +2997,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         T::list_environments(self, req, options).await
     }
 
@@ -3061,8 +3006,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>> {
         T::get_environment(self, req, options).await
     }
 
@@ -3070,8 +3015,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>> {
         T::list_sessions(self, req, options).await
     }
 
@@ -3079,9 +3024,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3089,8 +3033,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3098,8 +3042,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -3107,8 +3051,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -3116,10 +3060,9 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -3127,10 +3070,9 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3138,8 +3080,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3147,8 +3089,8 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -3156,22 +3098,22 @@ impl<T: super::DataplexService> DataplexService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/dataplex/v1/src/tracing.rs b/src/generated/cloud/dataplex/v1/src/tracing.rs
index 708a9d803d..21c92b52f4 100644
--- a/src/generated/cloud/dataplex/v1/src/tracing.rs
+++ b/src/generated/cloud/dataplex/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_glossary(
         &self,
         req: crate::model::CreateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_glossary(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_glossary(
         &self,
         req: crate::model::UpdateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_glossary(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn delete_glossary(
         &self,
         req: crate::model::DeleteGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_glossary(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_glossary(
         &self,
         req: crate::model::GetGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Glossary>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Glossary>> {
         self.inner.get_glossary(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_glossaries(
         &self,
         req: crate::model::ListGlossariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGlossariesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGlossariesResponse>> {
         self.inner.list_glossaries(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn create_glossary_category(
         &self,
         req: crate::model::CreateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryCategory>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryCategory>> {
         self.inner.create_glossary_category(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn update_glossary_category(
         &self,
         req: crate::model::UpdateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryCategory>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryCategory>> {
         self.inner.update_glossary_category(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn delete_glossary_category(
         &self,
         req: crate::model::DeleteGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_glossary_category(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_glossary_category(
         &self,
         req: crate::model::GetGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryCategory>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryCategory>> {
         self.inner.get_glossary_category(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_glossary_categories(
         &self,
         req: crate::model::ListGlossaryCategoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGlossaryCategoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGlossaryCategoriesResponse>> {
         self.inner.list_glossary_categories(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn create_glossary_term(
         &self,
         req: crate::model::CreateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryTerm>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryTerm>> {
         self.inner.create_glossary_term(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn update_glossary_term(
         &self,
         req: crate::model::UpdateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryTerm>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryTerm>> {
         self.inner.update_glossary_term(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn delete_glossary_term(
         &self,
         req: crate::model::DeleteGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_glossary_term(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn get_glossary_term(
         &self,
         req: crate::model::GetGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryTerm>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryTerm>> {
         self.inner.get_glossary_term(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn list_glossary_terms(
         &self,
         req: crate::model::ListGlossaryTermsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGlossaryTermsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGlossaryTermsResponse>> {
         self.inner.list_glossary_terms(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -212,9 +212,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -222,9 +221,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -232,8 +230,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -241,8 +239,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -250,22 +248,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -296,8 +294,8 @@ where
     async fn create_entry_type(
         &self,
         req: crate::model::CreateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_entry_type(req, options).await
     }
 
@@ -305,8 +303,8 @@ where
     async fn update_entry_type(
         &self,
         req: crate::model::UpdateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_entry_type(req, options).await
     }
 
@@ -314,8 +312,8 @@ where
     async fn delete_entry_type(
         &self,
         req: crate::model::DeleteEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_entry_type(req, options).await
     }
 
@@ -323,8 +321,8 @@ where
     async fn list_entry_types(
         &self,
         req: crate::model::ListEntryTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntryTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntryTypesResponse>> {
         self.inner.list_entry_types(req, options).await
     }
 
@@ -332,8 +330,8 @@ where
     async fn get_entry_type(
         &self,
         req: crate::model::GetEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryType>> {
         self.inner.get_entry_type(req, options).await
     }
 
@@ -341,8 +339,8 @@ where
     async fn create_aspect_type(
         &self,
         req: crate::model::CreateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_aspect_type(req, options).await
     }
 
@@ -350,8 +348,8 @@ where
     async fn update_aspect_type(
         &self,
         req: crate::model::UpdateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_aspect_type(req, options).await
     }
 
@@ -359,8 +357,8 @@ where
     async fn delete_aspect_type(
         &self,
         req: crate::model::DeleteAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_aspect_type(req, options).await
     }
 
@@ -368,8 +366,8 @@ where
     async fn list_aspect_types(
         &self,
         req: crate::model::ListAspectTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAspectTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAspectTypesResponse>> {
         self.inner.list_aspect_types(req, options).await
     }
 
@@ -377,8 +375,8 @@ where
     async fn get_aspect_type(
         &self,
         req: crate::model::GetAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AspectType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AspectType>> {
         self.inner.get_aspect_type(req, options).await
     }
 
@@ -386,8 +384,8 @@ where
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_entry_group(req, options).await
     }
 
@@ -395,8 +393,8 @@ where
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_entry_group(req, options).await
     }
 
@@ -404,8 +402,8 @@ where
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_entry_group(req, options).await
     }
 
@@ -413,8 +411,8 @@ where
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntryGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntryGroupsResponse>> {
         self.inner.list_entry_groups(req, options).await
     }
 
@@ -422,8 +420,8 @@ where
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         self.inner.get_entry_group(req, options).await
     }
 
@@ -431,8 +429,8 @@ where
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.create_entry(req, options).await
     }
 
@@ -440,8 +438,8 @@ where
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.update_entry(req, options).await
     }
 
@@ -449,8 +447,8 @@ where
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.delete_entry(req, options).await
     }
 
@@ -458,8 +456,8 @@ where
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntriesResponse>> {
         self.inner.list_entries(req, options).await
     }
 
@@ -467,8 +465,8 @@ where
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.get_entry(req, options).await
     }
 
@@ -476,8 +474,8 @@ where
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         self.inner.lookup_entry(req, options).await
     }
 
@@ -485,8 +483,8 @@ where
     async fn search_entries(
         &self,
         req: crate::model::SearchEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchEntriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchEntriesResponse>> {
         self.inner.search_entries(req, options).await
     }
 
@@ -494,8 +492,8 @@ where
     async fn create_metadata_job(
         &self,
         req: crate::model::CreateMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_metadata_job(req, options).await
     }
 
@@ -503,8 +501,8 @@ where
     async fn get_metadata_job(
         &self,
         req: crate::model::GetMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataJob>> {
         self.inner.get_metadata_job(req, options).await
     }
 
@@ -512,8 +510,8 @@ where
     async fn list_metadata_jobs(
         &self,
         req: crate::model::ListMetadataJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataJobsResponse>> {
         self.inner.list_metadata_jobs(req, options).await
     }
 
@@ -521,8 +519,8 @@ where
     async fn cancel_metadata_job(
         &self,
         req: crate::model::CancelMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_metadata_job(req, options).await
     }
 
@@ -530,8 +528,8 @@ where
     async fn create_entry_link(
         &self,
         req: crate::model::CreateEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryLink>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryLink>> {
         self.inner.create_entry_link(req, options).await
     }
 
@@ -539,8 +537,8 @@ where
     async fn delete_entry_link(
         &self,
         req: crate::model::DeleteEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryLink>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryLink>> {
         self.inner.delete_entry_link(req, options).await
     }
 
@@ -548,8 +546,8 @@ where
     async fn get_entry_link(
         &self,
         req: crate::model::GetEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryLink>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryLink>> {
         self.inner.get_entry_link(req, options).await
     }
 
@@ -557,8 +555,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -566,8 +564,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -575,8 +573,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -584,8 +582,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -593,9 +591,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -603,9 +600,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -613,8 +609,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -622,8 +618,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -631,22 +627,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -677,8 +673,8 @@ where
     async fn create_encryption_config(
         &self,
         req: crate::model::CreateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_encryption_config(req, options).await
     }
 
@@ -686,8 +682,8 @@ where
     async fn update_encryption_config(
         &self,
         req: crate::model::UpdateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_encryption_config(req, options).await
     }
 
@@ -695,8 +691,8 @@ where
     async fn delete_encryption_config(
         &self,
         req: crate::model::DeleteEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_encryption_config(req, options).await
     }
 
@@ -704,8 +700,8 @@ where
     async fn list_encryption_configs(
         &self,
         req: crate::model::ListEncryptionConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEncryptionConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEncryptionConfigsResponse>> {
         self.inner.list_encryption_configs(req, options).await
     }
 
@@ -713,8 +709,8 @@ where
     async fn get_encryption_config(
         &self,
         req: crate::model::GetEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptionConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptionConfig>> {
         self.inner.get_encryption_config(req, options).await
     }
 
@@ -722,8 +718,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -731,8 +727,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -740,8 +736,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -749,8 +745,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -758,9 +754,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -768,9 +763,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -778,8 +772,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -787,8 +781,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -796,22 +790,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -842,8 +836,8 @@ where
     async fn create_content(
         &self,
         req: crate::model::CreateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Content>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Content>> {
         self.inner.create_content(req, options).await
     }
 
@@ -851,8 +845,8 @@ where
     async fn update_content(
         &self,
         req: crate::model::UpdateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Content>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Content>> {
         self.inner.update_content(req, options).await
     }
 
@@ -860,8 +854,8 @@ where
     async fn delete_content(
         &self,
         req: crate::model::DeleteContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_content(req, options).await
     }
 
@@ -869,8 +863,8 @@ where
     async fn get_content(
         &self,
         req: crate::model::GetContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Content>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Content>> {
         self.inner.get_content(req, options).await
     }
 
@@ -878,8 +872,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -887,8 +881,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -896,9 +890,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -906,8 +899,8 @@ where
     async fn list_content(
         &self,
         req: crate::model::ListContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContentResponse>> {
         self.inner.list_content(req, options).await
     }
 
@@ -915,8 +908,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -924,8 +917,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -933,9 +926,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -943,8 +935,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -952,8 +944,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -961,8 +953,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -993,8 +985,8 @@ where
     async fn create_data_taxonomy(
         &self,
         req: crate::model::CreateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_data_taxonomy(req, options).await
     }
 
@@ -1002,8 +994,8 @@ where
     async fn update_data_taxonomy(
         &self,
         req: crate::model::UpdateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_data_taxonomy(req, options).await
     }
 
@@ -1011,8 +1003,8 @@ where
     async fn delete_data_taxonomy(
         &self,
         req: crate::model::DeleteDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_data_taxonomy(req, options).await
     }
 
@@ -1020,8 +1012,8 @@ where
     async fn list_data_taxonomies(
         &self,
         req: crate::model::ListDataTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataTaxonomiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataTaxonomiesResponse>> {
         self.inner.list_data_taxonomies(req, options).await
     }
 
@@ -1029,8 +1021,8 @@ where
     async fn get_data_taxonomy(
         &self,
         req: crate::model::GetDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataTaxonomy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataTaxonomy>> {
         self.inner.get_data_taxonomy(req, options).await
     }
 
@@ -1038,8 +1030,8 @@ where
     async fn create_data_attribute_binding(
         &self,
         req: crate::model::CreateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_data_attribute_binding(req, options).await
     }
 
@@ -1047,8 +1039,8 @@ where
     async fn update_data_attribute_binding(
         &self,
         req: crate::model::UpdateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_data_attribute_binding(req, options).await
     }
 
@@ -1056,8 +1048,8 @@ where
     async fn delete_data_attribute_binding(
         &self,
         req: crate::model::DeleteDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_data_attribute_binding(req, options).await
     }
 
@@ -1065,8 +1057,8 @@ where
     async fn list_data_attribute_bindings(
         &self,
         req: crate::model::ListDataAttributeBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAttributeBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAttributeBindingsResponse>> {
         self.inner.list_data_attribute_bindings(req, options).await
     }
 
@@ -1074,8 +1066,8 @@ where
     async fn get_data_attribute_binding(
         &self,
         req: crate::model::GetDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAttributeBinding>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAttributeBinding>> {
         self.inner.get_data_attribute_binding(req, options).await
     }
 
@@ -1083,8 +1075,8 @@ where
     async fn create_data_attribute(
         &self,
         req: crate::model::CreateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_data_attribute(req, options).await
     }
 
@@ -1092,8 +1084,8 @@ where
     async fn update_data_attribute(
         &self,
         req: crate::model::UpdateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_data_attribute(req, options).await
     }
 
@@ -1101,8 +1093,8 @@ where
     async fn delete_data_attribute(
         &self,
         req: crate::model::DeleteDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_data_attribute(req, options).await
     }
 
@@ -1110,8 +1102,8 @@ where
     async fn list_data_attributes(
         &self,
         req: crate::model::ListDataAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAttributesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAttributesResponse>> {
         self.inner.list_data_attributes(req, options).await
     }
 
@@ -1119,8 +1111,8 @@ where
     async fn get_data_attribute(
         &self,
         req: crate::model::GetDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAttribute>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAttribute>> {
         self.inner.get_data_attribute(req, options).await
     }
 
@@ -1128,8 +1120,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1137,8 +1129,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1146,8 +1138,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1155,8 +1147,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1164,9 +1156,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1174,9 +1165,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1184,8 +1174,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1193,8 +1183,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1202,22 +1192,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1248,8 +1238,8 @@ where
     async fn create_data_scan(
         &self,
         req: crate::model::CreateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_data_scan(req, options).await
     }
 
@@ -1257,8 +1247,8 @@ where
     async fn update_data_scan(
         &self,
         req: crate::model::UpdateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_data_scan(req, options).await
     }
 
@@ -1266,8 +1256,8 @@ where
     async fn delete_data_scan(
         &self,
         req: crate::model::DeleteDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_data_scan(req, options).await
     }
 
@@ -1275,8 +1265,8 @@ where
     async fn get_data_scan(
         &self,
         req: crate::model::GetDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataScan>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataScan>> {
         self.inner.get_data_scan(req, options).await
     }
 
@@ -1284,8 +1274,8 @@ where
     async fn list_data_scans(
         &self,
         req: crate::model::ListDataScansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataScansResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataScansResponse>> {
         self.inner.list_data_scans(req, options).await
     }
 
@@ -1293,8 +1283,8 @@ where
     async fn run_data_scan(
         &self,
         req: crate::model::RunDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RunDataScanResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RunDataScanResponse>> {
         self.inner.run_data_scan(req, options).await
     }
 
@@ -1302,8 +1292,8 @@ where
     async fn get_data_scan_job(
         &self,
         req: crate::model::GetDataScanJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataScanJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataScanJob>> {
         self.inner.get_data_scan_job(req, options).await
     }
 
@@ -1311,8 +1301,8 @@ where
     async fn list_data_scan_jobs(
         &self,
         req: crate::model::ListDataScanJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataScanJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataScanJobsResponse>> {
         self.inner.list_data_scan_jobs(req, options).await
     }
 
@@ -1320,8 +1310,8 @@ where
     async fn generate_data_quality_rules(
         &self,
         req: crate::model::GenerateDataQualityRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateDataQualityRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateDataQualityRulesResponse>> {
         self.inner.generate_data_quality_rules(req, options).await
     }
 
@@ -1329,8 +1319,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1338,8 +1328,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1347,8 +1337,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1356,8 +1346,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1365,9 +1355,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1375,9 +1364,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1385,8 +1373,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1394,8 +1382,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1403,22 +1391,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1449,8 +1437,8 @@ where
     async fn create_entity(
         &self,
         req: crate::model::CreateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entity>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entity>> {
         self.inner.create_entity(req, options).await
     }
 
@@ -1458,8 +1446,8 @@ where
     async fn update_entity(
         &self,
         req: crate::model::UpdateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entity>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entity>> {
         self.inner.update_entity(req, options).await
     }
 
@@ -1467,8 +1455,8 @@ where
     async fn delete_entity(
         &self,
         req: crate::model::DeleteEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_entity(req, options).await
     }
 
@@ -1476,8 +1464,8 @@ where
     async fn get_entity(
         &self,
         req: crate::model::GetEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entity>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entity>> {
         self.inner.get_entity(req, options).await
     }
 
@@ -1485,8 +1473,8 @@ where
     async fn list_entities(
         &self,
         req: crate::model::ListEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntitiesResponse>> {
         self.inner.list_entities(req, options).await
     }
 
@@ -1494,8 +1482,8 @@ where
     async fn create_partition(
         &self,
         req: crate::model::CreatePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Partition>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Partition>> {
         self.inner.create_partition(req, options).await
     }
 
@@ -1503,8 +1491,8 @@ where
     async fn delete_partition(
         &self,
         req: crate::model::DeletePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_partition(req, options).await
     }
 
@@ -1512,8 +1500,8 @@ where
     async fn get_partition(
         &self,
         req: crate::model::GetPartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Partition>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Partition>> {
         self.inner.get_partition(req, options).await
     }
 
@@ -1521,8 +1509,8 @@ where
     async fn list_partitions(
         &self,
         req: crate::model::ListPartitionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPartitionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPartitionsResponse>> {
         self.inner.list_partitions(req, options).await
     }
 
@@ -1530,8 +1518,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1539,8 +1527,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1548,8 +1536,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1557,8 +1545,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1566,9 +1554,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1576,9 +1563,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1586,8 +1572,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1595,8 +1581,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1604,8 +1590,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1636,8 +1622,8 @@ where
     async fn create_lake(
         &self,
         req: crate::model::CreateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_lake(req, options).await
     }
 
@@ -1645,8 +1631,8 @@ where
     async fn update_lake(
         &self,
         req: crate::model::UpdateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_lake(req, options).await
     }
 
@@ -1654,8 +1640,8 @@ where
     async fn delete_lake(
         &self,
         req: crate::model::DeleteLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_lake(req, options).await
     }
 
@@ -1663,8 +1649,8 @@ where
     async fn list_lakes(
         &self,
         req: crate::model::ListLakesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLakesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLakesResponse>> {
         self.inner.list_lakes(req, options).await
     }
 
@@ -1672,8 +1658,8 @@ where
     async fn get_lake(
         &self,
         req: crate::model::GetLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Lake>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Lake>> {
         self.inner.get_lake(req, options).await
     }
 
@@ -1681,8 +1667,8 @@ where
     async fn list_lake_actions(
         &self,
         req: crate::model::ListLakeActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActionsResponse>> {
         self.inner.list_lake_actions(req, options).await
     }
 
@@ -1690,8 +1676,8 @@ where
     async fn create_zone(
         &self,
         req: crate::model::CreateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_zone(req, options).await
     }
 
@@ -1699,8 +1685,8 @@ where
     async fn update_zone(
         &self,
         req: crate::model::UpdateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_zone(req, options).await
     }
 
@@ -1708,8 +1694,8 @@ where
     async fn delete_zone(
         &self,
         req: crate::model::DeleteZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_zone(req, options).await
     }
 
@@ -1717,8 +1703,8 @@ where
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListZonesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListZonesResponse>> {
         self.inner.list_zones(req, options).await
     }
 
@@ -1726,8 +1712,8 @@ where
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Zone>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Zone>> {
         self.inner.get_zone(req, options).await
     }
 
@@ -1735,8 +1721,8 @@ where
     async fn list_zone_actions(
         &self,
         req: crate::model::ListZoneActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActionsResponse>> {
         self.inner.list_zone_actions(req, options).await
     }
 
@@ -1744,8 +1730,8 @@ where
     async fn create_asset(
         &self,
         req: crate::model::CreateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_asset(req, options).await
     }
 
@@ -1753,8 +1739,8 @@ where
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_asset(req, options).await
     }
 
@@ -1762,8 +1748,8 @@ where
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_asset(req, options).await
     }
 
@@ -1771,8 +1757,8 @@ where
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssetsResponse>> {
         self.inner.list_assets(req, options).await
     }
 
@@ -1780,8 +1766,8 @@ where
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Asset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Asset>> {
         self.inner.get_asset(req, options).await
     }
 
@@ -1789,8 +1775,8 @@ where
     async fn list_asset_actions(
         &self,
         req: crate::model::ListAssetActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActionsResponse>> {
         self.inner.list_asset_actions(req, options).await
     }
 
@@ -1798,8 +1784,8 @@ where
     async fn create_task(
         &self,
         req: crate::model::CreateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_task(req, options).await
     }
 
@@ -1807,8 +1793,8 @@ where
     async fn update_task(
         &self,
         req: crate::model::UpdateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_task(req, options).await
     }
 
@@ -1816,8 +1802,8 @@ where
     async fn delete_task(
         &self,
         req: crate::model::DeleteTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_task(req, options).await
     }
 
@@ -1825,8 +1811,8 @@ where
     async fn list_tasks(
         &self,
         req: crate::model::ListTasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTasksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTasksResponse>> {
         self.inner.list_tasks(req, options).await
     }
 
@@ -1834,8 +1820,8 @@ where
     async fn get_task(
         &self,
         req: crate::model::GetTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Task>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Task>> {
         self.inner.get_task(req, options).await
     }
 
@@ -1843,8 +1829,8 @@ where
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListJobsResponse>> {
         self.inner.list_jobs(req, options).await
     }
 
@@ -1852,8 +1838,8 @@ where
     async fn run_task(
         &self,
         req: crate::model::RunTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RunTaskResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RunTaskResponse>> {
         self.inner.run_task(req, options).await
     }
 
@@ -1861,8 +1847,8 @@ where
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.get_job(req, options).await
     }
 
@@ -1870,8 +1856,8 @@ where
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_job(req, options).await
     }
 
@@ -1879,8 +1865,8 @@ where
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_environment(req, options).await
     }
 
@@ -1888,8 +1874,8 @@ where
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_environment(req, options).await
     }
 
@@ -1897,8 +1883,8 @@ where
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_environment(req, options).await
     }
 
@@ -1906,8 +1892,8 @@ where
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         self.inner.list_environments(req, options).await
     }
 
@@ -1915,8 +1901,8 @@ where
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         self.inner.get_environment(req, options).await
     }
 
@@ -1924,8 +1910,8 @@ where
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         self.inner.list_sessions(req, options).await
     }
 
@@ -1933,8 +1919,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1942,8 +1928,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1951,8 +1937,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1960,8 +1946,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1969,9 +1955,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1979,9 +1964,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1989,8 +1973,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1998,8 +1982,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -2007,22 +1991,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/dataplex/v1/src/transport.rs b/src/generated/cloud/dataplex/v1/src/transport.rs
index afd5d582d1..aa1665d3d9 100644
--- a/src/generated/cloud/dataplex/v1/src/transport.rs
+++ b/src/generated/cloud/dataplex/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [BusinessGlossaryService](super::stub::BusinessGlossaryService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for BusinessGlossaryService {
 }
 
 impl BusinessGlossaryService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn create_glossary(
         &self,
         req: crate::model::CreateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn update_glossary(
         &self,
         req: crate::model::UpdateGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -171,9 +171,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -188,13 +188,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn delete_glossary(
         &self,
         req: crate::model::DeleteGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -236,9 +236,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253,13 +253,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn get_glossary(
         &self,
         req: crate::model::GetGlossaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Glossary>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Glossary>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -300,9 +300,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -317,13 +317,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn list_glossaries(
         &self,
         req: crate::model::ListGlossariesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGlossariesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGlossariesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +381,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn create_glossary_category(
         &self,
         req: crate::model::CreateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryCategory>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryCategory>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429,9 +429,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -446,13 +446,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn update_glossary_category(
         &self,
         req: crate::model::UpdateGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryCategory>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryCategory>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -515,9 +515,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -532,13 +532,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn delete_glossary_category(
         &self,
         req: crate::model::DeleteGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -583,9 +583,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -594,24 +594,25 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_glossary_category(
         &self,
         req: crate::model::GetGlossaryCategoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryCategory>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryCategory>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -656,9 +657,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -673,13 +674,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn list_glossary_categories(
         &self,
         req: crate::model::ListGlossaryCategoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGlossaryCategoriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGlossaryCategoriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -724,9 +725,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -741,13 +742,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn create_glossary_term(
         &self,
         req: crate::model::CreateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryTerm>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryTerm>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -789,9 +790,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -806,13 +807,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn update_glossary_term(
         &self,
         req: crate::model::UpdateGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryTerm>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryTerm>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -875,9 +876,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -892,13 +893,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn delete_glossary_term(
         &self,
         req: crate::model::DeleteGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -943,9 +944,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -954,24 +955,25 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_glossary_term(
         &self,
         req: crate::model::GetGlossaryTermRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GlossaryTerm>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GlossaryTerm>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1016,9 +1018,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1033,13 +1035,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn list_glossary_terms(
         &self,
         req: crate::model::ListGlossaryTermsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGlossaryTermsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGlossaryTermsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1084,9 +1086,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1101,13 +1103,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1137,9 +1139,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1154,13 +1156,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1197,9 +1199,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1214,13 +1216,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1996,9 +1998,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2013,13 +2015,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3035,9 +3037,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3052,14 +3054,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3835,9 +3836,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3852,14 +3853,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3939,9 +3939,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3956,13 +3956,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4040,9 +4040,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4057,13 +4057,13 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4141,9 +4141,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4152,24 +4152,25 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4247,9 +4248,9 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4258,25 +4259,26 @@ impl super::stub::BusinessGlossaryService for BusinessGlossaryService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4296,7 +4298,7 @@ impl std::fmt::Debug for CatalogService {
 }
 
 impl CatalogService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -4306,13 +4308,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn create_entry_type(
         &self,
         req: crate::model::CreateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4351,9 +4353,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4368,13 +4370,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn update_entry_type(
         &self,
         req: crate::model::UpdateEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4434,9 +4436,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4451,13 +4453,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn delete_entry_type(
         &self,
         req: crate::model::DeleteEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4499,9 +4501,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4516,13 +4518,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_entry_types(
         &self,
         req: crate::model::ListEntryTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntryTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntryTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4563,9 +4565,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4580,13 +4582,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_entry_type(
         &self,
         req: crate::model::GetEntryTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4627,9 +4629,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4644,13 +4646,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn create_aspect_type(
         &self,
         req: crate::model::CreateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4689,9 +4691,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4706,13 +4708,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn update_aspect_type(
         &self,
         req: crate::model::UpdateAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4772,9 +4774,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4789,13 +4791,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn delete_aspect_type(
         &self,
         req: crate::model::DeleteAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4837,9 +4839,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4854,13 +4856,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_aspect_types(
         &self,
         req: crate::model::ListAspectTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAspectTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAspectTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4901,9 +4903,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4918,13 +4920,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_aspect_type(
         &self,
         req: crate::model::GetAspectTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AspectType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AspectType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4965,9 +4967,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4982,13 +4984,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn create_entry_group(
         &self,
         req: crate::model::CreateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5027,9 +5029,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5044,13 +5046,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn update_entry_group(
         &self,
         req: crate::model::UpdateEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5110,9 +5112,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5127,13 +5129,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn delete_entry_group(
         &self,
         req: crate::model::DeleteEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5175,9 +5177,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5192,13 +5194,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_entry_groups(
         &self,
         req: crate::model::ListEntryGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntryGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntryGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5239,9 +5241,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5256,13 +5258,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_entry_group(
         &self,
         req: crate::model::GetEntryGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5303,9 +5305,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5320,13 +5322,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn create_entry(
         &self,
         req: crate::model::CreateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5368,9 +5370,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5385,13 +5387,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn update_entry(
         &self,
         req: crate::model::UpdateEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5461,9 +5463,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5478,13 +5480,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn delete_entry(
         &self,
         req: crate::model::DeleteEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5529,9 +5531,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5546,13 +5548,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_entries(
         &self,
         req: crate::model::ListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5596,9 +5598,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5613,13 +5615,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_entry(
         &self,
         req: crate::model::GetEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5673,9 +5675,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5690,13 +5692,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn lookup_entry(
         &self,
         req: crate::model::LookupEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5743,9 +5745,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5760,13 +5762,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn search_entries(
         &self,
         req: crate::model::SearchEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchEntriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchEntriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5809,9 +5811,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5826,13 +5828,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn create_metadata_job(
         &self,
         req: crate::model::CreateMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5871,9 +5873,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5888,13 +5890,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_metadata_job(
         &self,
         req: crate::model::GetMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5935,9 +5937,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5952,13 +5954,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_metadata_jobs(
         &self,
         req: crate::model::ListMetadataJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5999,9 +6001,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6016,13 +6018,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn cancel_metadata_job(
         &self,
         req: crate::model::CancelMetadataJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6063,9 +6065,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6074,24 +6076,25 @@ impl super::stub::CatalogService for CatalogService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_entry_link(
         &self,
         req: crate::model::CreateEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryLink>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryLink>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6133,9 +6136,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6150,13 +6153,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn delete_entry_link(
         &self,
         req: crate::model::DeleteEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryLink>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryLink>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6201,9 +6204,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6218,13 +6221,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_entry_link(
         &self,
         req: crate::model::GetEntryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntryLink>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntryLink>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6269,9 +6272,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6286,13 +6289,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6322,9 +6325,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6339,13 +6342,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6382,9 +6385,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6399,13 +6402,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7181,9 +7184,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7198,13 +7201,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8220,9 +8223,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8237,14 +8240,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9020,9 +9022,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9037,14 +9039,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9124,9 +9125,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9141,13 +9142,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9225,9 +9226,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9242,13 +9243,13 @@ impl super::stub::CatalogService for CatalogService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9326,9 +9327,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9337,24 +9338,25 @@ impl super::stub::CatalogService for CatalogService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9432,9 +9434,9 @@ impl super::stub::CatalogService for CatalogService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9443,25 +9445,26 @@ impl super::stub::CatalogService for CatalogService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9481,7 +9484,7 @@ impl std::fmt::Debug for CmekService {
 }
 
 impl CmekService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -9491,13 +9494,13 @@ impl super::stub::CmekService for CmekService {
     async fn create_encryption_config(
         &self,
         req: crate::model::CreateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9535,9 +9538,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9552,13 +9555,13 @@ impl super::stub::CmekService for CmekService {
     async fn update_encryption_config(
         &self,
         req: crate::model::UpdateEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9617,9 +9620,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9634,13 +9637,13 @@ impl super::stub::CmekService for CmekService {
     async fn delete_encryption_config(
         &self,
         req: crate::model::DeleteEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9682,9 +9685,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9699,13 +9702,13 @@ impl super::stub::CmekService for CmekService {
     async fn list_encryption_configs(
         &self,
         req: crate::model::ListEncryptionConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEncryptionConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEncryptionConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9746,9 +9749,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9763,13 +9766,13 @@ impl super::stub::CmekService for CmekService {
     async fn get_encryption_config(
         &self,
         req: crate::model::GetEncryptionConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptionConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptionConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9810,9 +9813,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9827,13 +9830,13 @@ impl super::stub::CmekService for CmekService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9863,9 +9866,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9880,13 +9883,13 @@ impl super::stub::CmekService for CmekService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9923,9 +9926,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9940,13 +9943,13 @@ impl super::stub::CmekService for CmekService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10722,9 +10725,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10739,13 +10742,13 @@ impl super::stub::CmekService for CmekService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11761,9 +11764,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11778,14 +11781,13 @@ impl super::stub::CmekService for CmekService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12561,9 +12563,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12578,14 +12580,13 @@ impl super::stub::CmekService for CmekService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12665,9 +12666,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12682,13 +12683,13 @@ impl super::stub::CmekService for CmekService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12766,9 +12767,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12783,13 +12784,13 @@ impl super::stub::CmekService for CmekService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12867,9 +12868,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12878,24 +12879,25 @@ impl super::stub::CmekService for CmekService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12973,9 +12975,9 @@ impl super::stub::CmekService for CmekService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12984,25 +12986,26 @@ impl super::stub::CmekService for CmekService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13022,7 +13025,7 @@ impl std::fmt::Debug for ContentService {
 }
 
 impl ContentService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13032,13 +13035,13 @@ impl super::stub::ContentService for ContentService {
     async fn create_content(
         &self,
         req: crate::model::CreateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Content>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Content>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13118,9 +13121,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13135,13 +13138,13 @@ impl super::stub::ContentService for ContentService {
     async fn update_content(
         &self,
         req: crate::model::UpdateContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Content>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Content>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13265,9 +13268,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13282,13 +13285,13 @@ impl super::stub::ContentService for ContentService {
     async fn delete_content(
         &self,
         req: crate::model::DeleteContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13374,9 +13377,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13385,24 +13388,25 @@ impl super::stub::ContentService for ContentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_content(
         &self,
         req: crate::model::GetContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Content>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Content>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13490,9 +13494,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13507,13 +13511,13 @@ impl super::stub::ContentService for ContentService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13623,9 +13627,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13640,13 +13644,13 @@ impl super::stub::ContentService for ContentService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13732,9 +13736,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13749,14 +13753,13 @@ impl super::stub::ContentService for ContentService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13842,9 +13845,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13859,13 +13862,13 @@ impl super::stub::ContentService for ContentService {
     async fn list_content(
         &self,
         req: crate::model::ListContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13949,9 +13952,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13966,13 +13969,13 @@ impl super::stub::ContentService for ContentService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14002,9 +14005,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14019,13 +14022,13 @@ impl super::stub::ContentService for ContentService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14062,9 +14065,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14079,14 +14082,13 @@ impl super::stub::ContentService for ContentService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14166,9 +14168,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14183,13 +14185,13 @@ impl super::stub::ContentService for ContentService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14267,9 +14269,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14284,13 +14286,13 @@ impl super::stub::ContentService for ContentService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14368,9 +14370,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14379,24 +14381,25 @@ impl super::stub::ContentService for ContentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14474,9 +14477,9 @@ impl super::stub::ContentService for ContentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14485,12 +14488,13 @@ impl super::stub::ContentService for ContentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -14509,7 +14513,7 @@ impl std::fmt::Debug for DataTaxonomyService {
 }
 
 impl DataTaxonomyService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -14519,13 +14523,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn create_data_taxonomy(
         &self,
         req: crate::model::CreateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14564,9 +14568,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14581,13 +14585,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn update_data_taxonomy(
         &self,
         req: crate::model::UpdateDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14647,9 +14651,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14664,13 +14668,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn delete_data_taxonomy(
         &self,
         req: crate::model::DeleteDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14712,9 +14716,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14729,13 +14733,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn list_data_taxonomies(
         &self,
         req: crate::model::ListDataTaxonomiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataTaxonomiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataTaxonomiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14776,9 +14780,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14793,13 +14797,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn get_data_taxonomy(
         &self,
         req: crate::model::GetDataTaxonomyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataTaxonomy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataTaxonomy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14840,9 +14844,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14857,13 +14861,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn create_data_attribute_binding(
         &self,
         req: crate::model::CreateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14903,9 +14907,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14920,13 +14924,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn update_data_attribute_binding(
         &self,
         req: crate::model::UpdateDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14986,9 +14990,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15003,13 +15007,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn delete_data_attribute_binding(
         &self,
         req: crate::model::DeleteDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15051,9 +15055,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15068,13 +15072,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn list_data_attribute_bindings(
         &self,
         req: crate::model::ListDataAttributeBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAttributeBindingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAttributeBindingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15115,9 +15119,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15132,13 +15136,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn get_data_attribute_binding(
         &self,
         req: crate::model::GetDataAttributeBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAttributeBinding>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAttributeBinding>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15179,9 +15183,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15196,13 +15200,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn create_data_attribute(
         &self,
         req: crate::model::CreateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15245,9 +15249,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15262,13 +15266,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn update_data_attribute(
         &self,
         req: crate::model::UpdateDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15332,9 +15336,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15349,13 +15353,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn delete_data_attribute(
         &self,
         req: crate::model::DeleteDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15401,9 +15405,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15418,13 +15422,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn list_data_attributes(
         &self,
         req: crate::model::ListDataAttributesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataAttributesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataAttributesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15469,9 +15473,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15486,13 +15490,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn get_data_attribute(
         &self,
         req: crate::model::GetDataAttributeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataAttribute>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataAttribute>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15537,9 +15541,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15554,13 +15558,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15590,9 +15594,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15607,13 +15611,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15650,9 +15654,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15667,13 +15671,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16449,9 +16453,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16466,13 +16470,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17488,9 +17492,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17505,14 +17509,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18288,9 +18291,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18305,14 +18308,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18392,9 +18394,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18409,13 +18411,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18493,9 +18495,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18510,13 +18512,13 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18594,9 +18596,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18605,24 +18607,25 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18700,9 +18703,9 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18711,25 +18714,26 @@ impl super::stub::DataTaxonomyService for DataTaxonomyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -18749,7 +18753,7 @@ impl std::fmt::Debug for DataScanService {
 }
 
 impl DataScanService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18759,13 +18763,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn create_data_scan(
         &self,
         req: crate::model::CreateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18804,9 +18808,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18821,13 +18825,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn update_data_scan(
         &self,
         req: crate::model::UpdateDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18887,9 +18891,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18904,13 +18908,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn delete_data_scan(
         &self,
         req: crate::model::DeleteDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18952,9 +18956,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18969,13 +18973,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn get_data_scan(
         &self,
         req: crate::model::GetDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataScan>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataScan>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19017,9 +19021,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19034,13 +19038,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn list_data_scans(
         &self,
         req: crate::model::ListDataScansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataScansResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataScansResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19081,9 +19085,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19098,13 +19102,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn run_data_scan(
         &self,
         req: crate::model::RunDataScanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RunDataScanResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RunDataScanResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19145,9 +19149,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19162,13 +19166,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn get_data_scan_job(
         &self,
         req: crate::model::GetDataScanJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataScanJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataScanJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19214,9 +19218,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19231,13 +19235,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn list_data_scan_jobs(
         &self,
         req: crate::model::ListDataScanJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataScanJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataScanJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19281,9 +19285,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19298,13 +19302,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn generate_data_quality_rules(
         &self,
         req: crate::model::GenerateDataQualityRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateDataQualityRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateDataQualityRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19386,9 +19390,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19403,13 +19407,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19439,9 +19443,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19456,13 +19460,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19499,9 +19503,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19516,13 +19520,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20298,9 +20302,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20315,13 +20319,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21337,9 +21341,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21354,14 +21358,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22137,9 +22140,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22154,14 +22157,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22241,9 +22243,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22258,13 +22260,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22342,9 +22344,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22359,13 +22361,13 @@ impl super::stub::DataScanService for DataScanService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22443,9 +22445,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22454,24 +22456,25 @@ impl super::stub::DataScanService for DataScanService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22549,9 +22552,9 @@ impl super::stub::DataScanService for DataScanService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22560,25 +22563,26 @@ impl super::stub::DataScanService for DataScanService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -22598,7 +22602,7 @@ impl std::fmt::Debug for MetadataService {
 }
 
 impl MetadataService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -22608,13 +22612,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_entity(
         &self,
         req: crate::model::CreateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entity>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entity>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22660,9 +22664,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22677,13 +22681,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn update_entity(
         &self,
         req: crate::model::UpdateEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entity>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entity>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22739,9 +22743,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22756,13 +22760,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_entity(
         &self,
         req: crate::model::DeleteEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22812,9 +22816,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22823,24 +22827,25 @@ impl super::stub::MetadataService for MetadataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_entity(
         &self,
         req: crate::model::GetEntityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Entity>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Entity>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22890,9 +22895,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22907,13 +22912,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_entities(
         &self,
         req: crate::model::ListEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntitiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntitiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22962,9 +22967,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22979,13 +22984,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn create_partition(
         &self,
         req: crate::model::CreatePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Partition>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Partition>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23035,9 +23040,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23052,13 +23057,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_partition(
         &self,
         req: crate::model::DeletePartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23112,9 +23117,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23123,24 +23128,25 @@ impl super::stub::MetadataService for MetadataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_partition(
         &self,
         req: crate::model::GetPartitionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Partition>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Partition>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23193,9 +23199,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23210,13 +23216,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_partitions(
         &self,
         req: crate::model::ListPartitionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPartitionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPartitionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23268,9 +23274,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23285,13 +23291,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23321,9 +23327,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23338,13 +23344,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23381,9 +23387,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23398,13 +23404,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24180,9 +24186,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24197,13 +24203,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25219,9 +25225,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25236,14 +25242,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26019,9 +26024,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26036,14 +26041,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26123,9 +26127,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26140,13 +26144,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26224,9 +26228,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26241,13 +26245,13 @@ impl super::stub::MetadataService for MetadataService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26325,9 +26329,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26336,24 +26340,25 @@ impl super::stub::MetadataService for MetadataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26431,9 +26436,9 @@ impl super::stub::MetadataService for MetadataService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26442,12 +26447,13 @@ impl super::stub::MetadataService for MetadataService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -26466,7 +26472,7 @@ impl std::fmt::Debug for DataplexService {
 }
 
 impl DataplexService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -26476,13 +26482,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn create_lake(
         &self,
         req: crate::model::CreateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26521,9 +26527,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26538,13 +26544,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn update_lake(
         &self,
         req: crate::model::UpdateLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26604,9 +26610,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26621,13 +26627,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn delete_lake(
         &self,
         req: crate::model::DeleteLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26668,9 +26674,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26685,13 +26691,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_lakes(
         &self,
         req: crate::model::ListLakesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLakesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLakesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26732,9 +26738,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26749,13 +26755,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_lake(
         &self,
         req: crate::model::GetLakeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Lake>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Lake>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26796,9 +26802,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26813,13 +26819,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_lake_actions(
         &self,
         req: crate::model::ListLakeActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26862,9 +26868,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26879,13 +26885,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn create_zone(
         &self,
         req: crate::model::CreateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26928,9 +26934,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26945,13 +26951,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn update_zone(
         &self,
         req: crate::model::UpdateZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27015,9 +27021,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27032,13 +27038,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn delete_zone(
         &self,
         req: crate::model::DeleteZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27083,9 +27089,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27100,13 +27106,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListZonesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListZonesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27151,9 +27157,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27168,13 +27174,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Zone>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Zone>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27219,9 +27225,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27236,13 +27242,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_zone_actions(
         &self,
         req: crate::model::ListZoneActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27289,9 +27295,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27306,13 +27312,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn create_asset(
         &self,
         req: crate::model::CreateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27359,9 +27365,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27376,13 +27382,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27450,9 +27456,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27467,13 +27473,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27522,9 +27528,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27539,13 +27545,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27594,9 +27600,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27611,13 +27617,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Asset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Asset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27666,9 +27672,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27683,13 +27689,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_asset_actions(
         &self,
         req: crate::model::ListAssetActionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27740,9 +27746,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27757,13 +27763,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn create_task(
         &self,
         req: crate::model::CreateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27806,9 +27812,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27823,13 +27829,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn update_task(
         &self,
         req: crate::model::UpdateTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27893,9 +27899,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27910,13 +27916,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn delete_task(
         &self,
         req: crate::model::DeleteTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27961,9 +27967,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27978,13 +27984,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_tasks(
         &self,
         req: crate::model::ListTasksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTasksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTasksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28029,9 +28035,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28046,13 +28052,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_task(
         &self,
         req: crate::model::GetTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Task>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Task>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28097,9 +28103,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28114,13 +28120,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28167,9 +28173,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28184,13 +28190,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn run_task(
         &self,
         req: crate::model::RunTaskRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RunTaskResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RunTaskResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28235,9 +28241,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28252,13 +28258,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28307,9 +28313,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28324,13 +28330,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28379,9 +28385,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28390,24 +28396,25 @@ impl super::stub::DataplexService for DataplexService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28450,9 +28457,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28467,13 +28474,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28537,9 +28544,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28554,13 +28561,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28605,9 +28612,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28622,13 +28629,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28673,9 +28680,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28690,13 +28697,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28741,9 +28748,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28758,13 +28765,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28812,9 +28819,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28829,13 +28836,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28865,9 +28872,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28882,13 +28889,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28925,9 +28932,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28942,13 +28949,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29724,9 +29731,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29741,13 +29748,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30763,9 +30770,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30780,14 +30787,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31563,9 +31569,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31580,14 +31586,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31667,9 +31672,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31684,13 +31689,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31768,9 +31773,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31785,13 +31790,13 @@ impl super::stub::DataplexService for DataplexService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31869,9 +31874,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31880,24 +31885,25 @@ impl super::stub::DataplexService for DataplexService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31975,9 +31981,9 @@ impl super::stub::DataplexService for DataplexService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31986,25 +31992,26 @@ impl super::stub::DataplexService for DataplexService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/dataproc/v1/Cargo.toml b/src/generated/cloud/dataproc/v1/Cargo.toml
index a59ad551d2..ad8bb7adb3 100644
--- a/src/generated/cloud/dataproc/v1/Cargo.toml
+++ b/src/generated/cloud/dataproc/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/dataproc/v1/src/builder.rs b/src/generated/cloud/dataproc/v1/src/builder.rs
index f803c3d577..de6e27bb1b 100644
--- a/src/generated/cloud/dataproc/v1/src/builder.rs
+++ b/src/generated/cloud/dataproc/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod autoscaling_policy_service {
     /// A builder for [AutoscalingPolicyService][crate::client::AutoscalingPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::autoscaling_policy_service::ClientBuilder;
     /// # use client::AutoscalingPolicyService;
@@ -30,19 +30,18 @@ pub mod autoscaling_policy_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AutoscalingPolicyService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AutoscalingPolicyService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod autoscaling_policy_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AutoscalingPolicyService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod autoscaling_policy_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::CreateAutoscalingPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109,7 +108,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119,7 +118,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .create_autoscaling_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAutoscalingPolicyRequest::parent].
@@ -154,8 +153,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAutoscalingPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAutoscalingPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -165,7 +164,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::UpdateAutoscalingPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -198,7 +197,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -208,7 +207,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .update_autoscaling_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [policy][crate::model::UpdateAutoscalingPolicyRequest::policy].
@@ -235,8 +234,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAutoscalingPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAutoscalingPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +245,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::GetAutoscalingPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -277,7 +276,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -287,7 +286,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .get_autoscaling_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAutoscalingPolicyRequest::name].
@@ -300,8 +299,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAutoscalingPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAutoscalingPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -311,8 +310,8 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::ListAutoscalingPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -348,7 +347,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -358,15 +357,15 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .list_autoscaling_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListAutoscalingPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -375,17 +374,17 @@ pub mod autoscaling_policy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAutoscalingPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -411,8 +410,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAutoscalingPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAutoscalingPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -422,7 +421,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::DeleteAutoscalingPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -455,7 +454,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -465,7 +464,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .delete_autoscaling_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAutoscalingPolicyRequest::name].
@@ -478,8 +477,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAutoscalingPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAutoscalingPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -489,7 +488,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -520,7 +519,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -530,7 +529,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -583,8 +582,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -594,7 +593,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -625,7 +624,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -635,7 +634,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -666,8 +665,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -677,7 +676,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -710,7 +709,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -720,7 +719,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -746,8 +745,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -757,8 +756,8 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -794,7 +793,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -804,15 +803,15 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -821,17 +820,17 @@ pub mod autoscaling_policy_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -867,8 +866,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -878,7 +877,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -909,7 +908,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -919,7 +918,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -930,8 +929,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -941,7 +940,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -974,7 +973,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -984,7 +983,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -995,8 +994,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1006,7 +1005,7 @@ pub mod autoscaling_policy_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::autoscaling_policy_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1039,7 +1038,7 @@ pub mod autoscaling_policy_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1049,7 +1048,7 @@ pub mod autoscaling_policy_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1060,8 +1059,8 @@ pub mod autoscaling_policy_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1073,7 +1072,7 @@ pub mod batch_controller {
     /// A builder for [BatchController][crate::client::BatchController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::batch_controller::ClientBuilder;
     /// # use client::BatchController;
@@ -1083,19 +1082,18 @@ pub mod batch_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BatchController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BatchController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1106,7 +1104,7 @@ pub mod batch_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BatchController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1119,7 +1117,7 @@ pub mod batch_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1129,7 +1127,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::CreateBatch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1158,7 +1156,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1173,7 +1171,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .create_batch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_batch`.
@@ -1190,7 +1188,7 @@ pub mod batch_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1261,8 +1259,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBatch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBatch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1272,7 +1270,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::GetBatch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1300,7 +1298,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1310,7 +1308,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .get_batch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBatchRequest::name].
@@ -1323,8 +1321,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBatch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBatch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1334,8 +1332,8 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::ListBatches;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1366,7 +1364,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1376,13 +1374,13 @@ pub mod batch_controller {
             (*self.0.stub)
                 .list_batches(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBatchesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBatchesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1391,15 +1389,17 @@ pub mod batch_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBatchesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBatchesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1437,8 +1437,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBatches {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBatches {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1448,7 +1448,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::DeleteBatch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1476,7 +1476,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1486,7 +1486,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .delete_batch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteBatchRequest::name].
@@ -1499,8 +1499,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBatch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBatch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1510,7 +1510,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1541,7 +1541,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1551,7 +1551,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1604,8 +1604,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1615,7 +1615,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1646,7 +1646,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1656,7 +1656,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1687,8 +1687,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1698,7 +1698,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1731,7 +1731,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1741,7 +1741,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1767,8 +1767,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1778,8 +1778,8 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1815,7 +1815,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1825,15 +1825,15 @@ pub mod batch_controller {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1842,17 +1842,17 @@ pub mod batch_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1888,8 +1888,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1899,7 +1899,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1930,7 +1930,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1940,7 +1940,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1951,8 +1951,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1962,7 +1962,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1995,7 +1995,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2005,7 +2005,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2016,8 +2016,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2027,7 +2027,7 @@ pub mod batch_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::batch_controller::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2060,7 +2060,7 @@ pub mod batch_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2070,7 +2070,7 @@ pub mod batch_controller {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2081,8 +2081,8 @@ pub mod batch_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2094,7 +2094,7 @@ pub mod cluster_controller {
     /// A builder for [ClusterController][crate::client::ClusterController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::cluster_controller::ClientBuilder;
     /// # use client::ClusterController;
@@ -2104,19 +2104,18 @@ pub mod cluster_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ClusterController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ClusterController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2127,7 +2126,7 @@ pub mod cluster_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ClusterController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2140,7 +2139,7 @@ pub mod cluster_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2150,7 +2149,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::CreateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2179,7 +2178,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2194,7 +2193,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .create_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_cluster`.
@@ -2211,7 +2210,7 @@ pub mod cluster_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2293,8 +2292,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2304,7 +2303,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::UpdateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2333,7 +2332,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2348,7 +2347,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .update_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_cluster`.
@@ -2365,7 +2364,7 @@ pub mod cluster_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2489,8 +2488,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2500,7 +2499,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::StopCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2529,7 +2528,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2544,7 +2543,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .stop_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_cluster`.
@@ -2561,7 +2560,7 @@ pub mod cluster_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2626,8 +2625,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2637,7 +2636,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::StartCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2666,7 +2665,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2681,7 +2680,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .start_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `start_cluster`.
@@ -2698,7 +2697,7 @@ pub mod cluster_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2763,8 +2762,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2774,7 +2773,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::DeleteCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2803,7 +2802,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2818,7 +2817,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .delete_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_cluster`.
@@ -2834,7 +2833,7 @@ pub mod cluster_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2899,8 +2898,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2910,7 +2909,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::GetCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2938,7 +2937,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2948,7 +2947,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .get_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetClusterRequest::project_id].
@@ -2977,8 +2976,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2988,8 +2987,8 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::ListClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3020,7 +3019,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3030,13 +3029,13 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .list_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListClustersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListClustersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3045,15 +3044,17 @@ pub mod cluster_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListClustersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListClustersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3093,8 +3094,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3104,7 +3105,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::DiagnoseCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3133,7 +3134,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3148,7 +3149,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .diagnose_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `diagnose_cluster`.
@@ -3167,7 +3168,7 @@ pub mod cluster_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3277,8 +3278,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DiagnoseCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DiagnoseCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3288,7 +3289,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3319,7 +3320,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3329,7 +3330,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -3382,8 +3383,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3393,7 +3394,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3424,7 +3425,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3434,7 +3435,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -3465,8 +3466,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3476,7 +3477,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3509,7 +3510,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3519,7 +3520,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -3545,8 +3546,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3556,8 +3557,8 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3593,7 +3594,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3603,15 +3604,15 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3620,17 +3621,17 @@ pub mod cluster_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3666,8 +3667,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3677,7 +3678,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3708,7 +3709,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3718,7 +3719,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3729,8 +3730,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3740,7 +3741,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3773,7 +3774,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3783,7 +3784,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3794,8 +3795,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3805,7 +3806,7 @@ pub mod cluster_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::cluster_controller::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3838,7 +3839,7 @@ pub mod cluster_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3848,7 +3849,7 @@ pub mod cluster_controller {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3859,8 +3860,8 @@ pub mod cluster_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3872,7 +3873,7 @@ pub mod job_controller {
     /// A builder for [JobController][crate::client::JobController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::job_controller::ClientBuilder;
     /// # use client::JobController;
@@ -3882,19 +3883,18 @@ pub mod job_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::JobController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = JobController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3905,7 +3905,7 @@ pub mod job_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::JobController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3918,7 +3918,7 @@ pub mod job_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3928,7 +3928,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::SubmitJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3956,7 +3956,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3966,7 +3966,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .submit_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::SubmitJobRequest::project_id].
@@ -4015,8 +4015,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubmitJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubmitJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4026,7 +4026,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::SubmitJobAsOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4055,7 +4055,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4070,7 +4070,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .submit_job_as_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `submit_job_as_operation`.
@@ -4084,7 +4084,7 @@ pub mod job_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4157,8 +4157,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubmitJobAsOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubmitJobAsOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4168,7 +4168,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::GetJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4196,7 +4196,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4206,7 +4206,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .get_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::GetJobRequest::project_id].
@@ -4235,8 +4235,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4246,8 +4246,8 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::ListJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4278,7 +4278,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4288,13 +4288,13 @@ pub mod job_controller {
             (*self.0.stub)
                 .list_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListJobsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListJobsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4303,15 +4303,15 @@ pub mod job_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListJobsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListJobsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4366,8 +4366,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4377,7 +4377,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::UpdateJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4405,7 +4405,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4415,7 +4415,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .update_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::UpdateJobRequest::project_id].
@@ -4488,8 +4488,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4499,7 +4499,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::CancelJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4527,7 +4527,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4537,7 +4537,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .cancel_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::CancelJobRequest::project_id].
@@ -4566,8 +4566,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4577,7 +4577,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::DeleteJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4605,7 +4605,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4615,7 +4615,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .delete_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [project_id][crate::model::DeleteJobRequest::project_id].
@@ -4644,8 +4644,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4655,7 +4655,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4686,7 +4686,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4696,7 +4696,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4749,8 +4749,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4760,7 +4760,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4791,7 +4791,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4801,7 +4801,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4832,8 +4832,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4843,7 +4843,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4876,7 +4876,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4886,7 +4886,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4912,8 +4912,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4923,8 +4923,8 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4960,7 +4960,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4970,15 +4970,15 @@ pub mod job_controller {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4987,17 +4987,17 @@ pub mod job_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5033,8 +5033,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5044,7 +5044,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5075,7 +5075,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5085,7 +5085,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5096,8 +5096,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5107,7 +5107,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5140,7 +5140,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5150,7 +5150,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5161,8 +5161,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5172,7 +5172,7 @@ pub mod job_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::job_controller::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5205,7 +5205,7 @@ pub mod job_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5215,7 +5215,7 @@ pub mod job_controller {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5226,8 +5226,8 @@ pub mod job_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5239,7 +5239,7 @@ pub mod node_group_controller {
     /// A builder for [NodeGroupController][crate::client::NodeGroupController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::node_group_controller::ClientBuilder;
     /// # use client::NodeGroupController;
@@ -5249,19 +5249,18 @@ pub mod node_group_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NodeGroupController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NodeGroupController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5272,7 +5271,7 @@ pub mod node_group_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NodeGroupController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5285,7 +5284,7 @@ pub mod node_group_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5295,7 +5294,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::CreateNodeGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5324,7 +5323,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5339,7 +5338,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .create_node_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_node_group`.
@@ -5358,7 +5357,7 @@ pub mod node_group_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5429,8 +5428,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNodeGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNodeGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5440,7 +5439,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::ResizeNodeGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5469,7 +5468,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5484,7 +5483,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .resize_node_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resize_node_group`.
@@ -5503,7 +5502,7 @@ pub mod node_group_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5575,8 +5574,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResizeNodeGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResizeNodeGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5586,7 +5585,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::GetNodeGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5614,7 +5613,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5624,7 +5623,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .get_node_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNodeGroupRequest::name].
@@ -5637,8 +5636,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNodeGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNodeGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5648,7 +5647,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5679,7 +5678,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5689,7 +5688,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -5742,8 +5741,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5753,7 +5752,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5784,7 +5783,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5794,7 +5793,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -5825,8 +5824,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5836,7 +5835,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5869,7 +5868,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5879,7 +5878,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -5905,8 +5904,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5916,8 +5915,8 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5953,7 +5952,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5963,15 +5962,15 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5980,17 +5979,17 @@ pub mod node_group_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6026,8 +6025,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6037,7 +6036,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6068,7 +6067,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6078,7 +6077,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -6089,8 +6088,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6100,7 +6099,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6133,7 +6132,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6143,7 +6142,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -6154,8 +6153,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6165,7 +6164,7 @@ pub mod node_group_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::node_group_controller::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6198,7 +6197,7 @@ pub mod node_group_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6208,7 +6207,7 @@ pub mod node_group_controller {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -6219,8 +6218,8 @@ pub mod node_group_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6232,7 +6231,7 @@ pub mod session_template_controller {
     /// A builder for [SessionTemplateController][crate::client::SessionTemplateController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::session_template_controller::ClientBuilder;
     /// # use client::SessionTemplateController;
@@ -6242,19 +6241,18 @@ pub mod session_template_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SessionTemplateController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SessionTemplateController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -6265,7 +6263,7 @@ pub mod session_template_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SessionTemplateController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -6278,7 +6276,7 @@ pub mod session_template_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -6288,7 +6286,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::CreateSessionTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6319,7 +6317,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6329,7 +6327,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .create_session_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSessionTemplateRequest::parent].
@@ -6364,8 +6362,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSessionTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSessionTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6375,7 +6373,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::UpdateSessionTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6406,7 +6404,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6416,7 +6414,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .update_session_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session_template][crate::model::UpdateSessionTemplateRequest::session_template].
@@ -6443,8 +6441,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSessionTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSessionTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6454,7 +6452,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::GetSessionTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6485,7 +6483,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6495,7 +6493,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .get_session_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSessionTemplateRequest::name].
@@ -6508,8 +6506,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSessionTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSessionTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6519,8 +6517,8 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::ListSessionTemplates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6554,7 +6552,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6564,14 +6562,16 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .list_session_templates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSessionTemplatesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSessionTemplatesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6579,17 +6579,17 @@ pub mod session_template_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSessionTemplatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6621,8 +6621,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessionTemplates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessionTemplates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6632,7 +6632,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::DeleteSessionTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6663,7 +6663,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6673,7 +6673,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .delete_session_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSessionTemplateRequest::name].
@@ -6686,8 +6686,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSessionTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSessionTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6697,7 +6697,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6728,7 +6728,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6738,7 +6738,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -6791,8 +6791,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6802,7 +6802,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6833,7 +6833,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6843,7 +6843,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -6874,8 +6874,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6885,7 +6885,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6918,7 +6918,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6928,7 +6928,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -6954,8 +6954,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6965,8 +6965,8 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7002,7 +7002,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7012,15 +7012,15 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7029,17 +7029,17 @@ pub mod session_template_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7075,8 +7075,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7086,7 +7086,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7117,7 +7117,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7127,7 +7127,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7138,8 +7138,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7149,7 +7149,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7182,7 +7182,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7192,7 +7192,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -7203,8 +7203,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7214,7 +7214,7 @@ pub mod session_template_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_template_controller::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7247,7 +7247,7 @@ pub mod session_template_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7257,7 +7257,7 @@ pub mod session_template_controller {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7268,8 +7268,8 @@ pub mod session_template_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7281,7 +7281,7 @@ pub mod session_controller {
     /// A builder for [SessionController][crate::client::SessionController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::session_controller::ClientBuilder;
     /// # use client::SessionController;
@@ -7291,19 +7291,18 @@ pub mod session_controller {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SessionController;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SessionController;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7314,7 +7313,7 @@ pub mod session_controller {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SessionController>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7327,7 +7326,7 @@ pub mod session_controller {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7337,7 +7336,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::CreateSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7366,7 +7365,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7381,7 +7380,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .create_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_session`.
@@ -7398,7 +7397,7 @@ pub mod session_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7471,8 +7470,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7482,7 +7481,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::GetSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7510,7 +7509,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7520,7 +7519,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .get_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSessionRequest::name].
@@ -7533,8 +7532,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7544,8 +7543,8 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::ListSessions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7576,7 +7575,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7586,13 +7585,13 @@ pub mod session_controller {
             (*self.0.stub)
                 .list_sessions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSessionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSessionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7601,15 +7600,17 @@ pub mod session_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSessionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSessionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7641,8 +7642,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7652,7 +7653,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::TerminateSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7684,7 +7685,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7699,7 +7700,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .terminate_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `terminate_session`.
@@ -7716,7 +7717,7 @@ pub mod session_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7759,8 +7760,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TerminateSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TerminateSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7770,7 +7771,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::DeleteSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7799,7 +7800,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7814,7 +7815,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .delete_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_session`.
@@ -7831,7 +7832,7 @@ pub mod session_controller {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7874,8 +7875,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7885,7 +7886,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7916,7 +7917,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7926,7 +7927,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -7979,8 +7980,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7990,7 +7991,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8021,7 +8022,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8031,7 +8032,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -8062,8 +8063,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8073,7 +8074,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8106,7 +8107,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8116,7 +8117,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -8142,8 +8143,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8153,8 +8154,8 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8190,7 +8191,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8200,15 +8201,15 @@ pub mod session_controller {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8217,17 +8218,17 @@ pub mod session_controller {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8263,8 +8264,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8274,7 +8275,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8305,7 +8306,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8315,7 +8316,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8326,8 +8327,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8337,7 +8338,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8370,7 +8371,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8380,7 +8381,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -8391,8 +8392,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8402,7 +8403,7 @@ pub mod session_controller {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::session_controller::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8435,7 +8436,7 @@ pub mod session_controller {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8445,7 +8446,7 @@ pub mod session_controller {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8456,8 +8457,8 @@ pub mod session_controller {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8469,7 +8470,7 @@ pub mod workflow_template_service {
     /// A builder for [WorkflowTemplateService][crate::client::WorkflowTemplateService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::*;
     /// # use builder::workflow_template_service::ClientBuilder;
     /// # use client::WorkflowTemplateService;
@@ -8479,19 +8480,18 @@ pub mod workflow_template_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::WorkflowTemplateService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = WorkflowTemplateService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8502,7 +8502,7 @@ pub mod workflow_template_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::WorkflowTemplateService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8515,7 +8515,7 @@ pub mod workflow_template_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8525,7 +8525,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::CreateWorkflowTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8556,7 +8556,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8566,7 +8566,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .create_workflow_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateWorkflowTemplateRequest::parent].
@@ -8601,8 +8601,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWorkflowTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWorkflowTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8612,7 +8612,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::GetWorkflowTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8643,7 +8643,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8653,7 +8653,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .get_workflow_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWorkflowTemplateRequest::name].
@@ -8672,8 +8672,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWorkflowTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWorkflowTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8683,7 +8683,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::InstantiateWorkflowTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8717,7 +8717,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8732,7 +8732,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .instantiate_workflow_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `instantiate_workflow_template`.
@@ -8744,7 +8744,7 @@ pub mod workflow_template_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8804,8 +8804,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InstantiateWorkflowTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InstantiateWorkflowTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8815,7 +8815,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::InstantiateInlineWorkflowTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8849,7 +8849,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8864,7 +8864,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .instantiate_inline_workflow_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `instantiate_inline_workflow_template`.
@@ -8876,7 +8876,7 @@ pub mod workflow_template_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8941,8 +8941,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InstantiateInlineWorkflowTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InstantiateInlineWorkflowTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8952,7 +8952,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::UpdateWorkflowTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8983,7 +8983,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8993,7 +8993,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .update_workflow_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [template][crate::model::UpdateWorkflowTemplateRequest::template].
@@ -9020,8 +9020,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateWorkflowTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateWorkflowTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9031,8 +9031,8 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::ListWorkflowTemplates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9066,7 +9066,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9076,14 +9076,16 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .list_workflow_templates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWorkflowTemplatesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListWorkflowTemplatesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -9091,17 +9093,17 @@ pub mod workflow_template_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListWorkflowTemplatesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9127,8 +9129,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWorkflowTemplates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWorkflowTemplates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9138,7 +9140,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::DeleteWorkflowTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9169,7 +9171,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9179,7 +9181,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .delete_workflow_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWorkflowTemplateRequest::name].
@@ -9198,8 +9200,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWorkflowTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWorkflowTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9209,7 +9211,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9240,7 +9242,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9250,7 +9252,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -9303,8 +9305,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9314,7 +9316,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9345,7 +9347,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9355,7 +9357,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -9386,8 +9388,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9397,7 +9399,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9430,7 +9432,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9440,7 +9442,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -9466,8 +9468,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9477,8 +9479,8 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9514,7 +9516,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9524,15 +9526,15 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9541,17 +9543,17 @@ pub mod workflow_template_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9587,8 +9589,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9598,7 +9600,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9629,7 +9631,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9639,7 +9641,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9650,8 +9652,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9661,7 +9663,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9694,7 +9696,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9704,7 +9706,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -9715,8 +9717,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9726,7 +9728,7 @@ pub mod workflow_template_service {
     /// # Example
     /// ```
     /// # use google_cloud_dataproc_v1::builder::workflow_template_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dataproc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9759,7 +9761,7 @@ pub mod workflow_template_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9769,7 +9771,7 @@ pub mod workflow_template_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9780,8 +9782,8 @@ pub mod workflow_template_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/dataproc/v1/src/client.rs b/src/generated/cloud/dataproc/v1/src/client.rs
index 1ca05819fc..0b9eab6199 100644
--- a/src/generated/cloud/dataproc/v1/src/client.rs
+++ b/src/generated/cloud/dataproc/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::AutoscalingPolicyService;
 /// let client = AutoscalingPolicyService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -67,15 +67,13 @@ impl AutoscalingPolicyService {
     /// Returns a builder for [AutoscalingPolicyService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::AutoscalingPolicyService;
     /// let client = AutoscalingPolicyService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::autoscaling_policy_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::autoscaling_policy_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::autoscaling_policy_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -93,14 +91,14 @@ impl AutoscalingPolicyService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::AutoscalingPolicyService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -111,13 +109,13 @@ impl AutoscalingPolicyService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AutoscalingPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AutoscalingPolicyService> {
         super::transport::AutoscalingPolicyService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AutoscalingPolicyService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AutoscalingPolicyService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AutoscalingPolicyService::new)
@@ -223,7 +221,7 @@ impl AutoscalingPolicyService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::BatchController;
 /// let client = BatchController::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -269,15 +267,13 @@ impl BatchController {
     /// Returns a builder for [BatchController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::BatchController;
     /// let client = BatchController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::batch_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::batch_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::batch_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -295,15 +291,14 @@ impl BatchController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BatchController>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BatchController>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -312,13 +307,13 @@ impl BatchController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BatchController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BatchController> {
         super::transport::BatchController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BatchController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BatchController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BatchController::new)
@@ -414,7 +409,7 @@ impl BatchController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::ClusterController;
 /// let client = ClusterController::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -461,15 +456,13 @@ impl ClusterController {
     /// Returns a builder for [ClusterController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::ClusterController;
     /// let client = ClusterController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cluster_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cluster_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cluster_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -487,14 +480,14 @@ impl ClusterController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ClusterController>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ClusterController>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -504,13 +497,13 @@ impl ClusterController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ClusterController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ClusterController> {
         super::transport::ClusterController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ClusterController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ClusterController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ClusterController::new)
@@ -700,7 +693,7 @@ impl ClusterController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::JobController;
 /// let client = JobController::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -746,13 +739,13 @@ impl JobController {
     /// Returns a builder for [JobController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::JobController;
     /// let client = JobController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::job_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::job_controller::client::Factory)
+        crate::new_client_builder(super::builder::job_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -770,14 +763,14 @@ impl JobController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::JobController>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::JobController>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -786,13 +779,13 @@ impl JobController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::JobController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::JobController> {
         super::transport::JobController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::JobController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::JobController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::JobController::new)
@@ -907,7 +900,7 @@ impl JobController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::NodeGroupController;
 /// let client = NodeGroupController::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -954,15 +947,13 @@ impl NodeGroupController {
     /// Returns a builder for [NodeGroupController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::NodeGroupController;
     /// let client = NodeGroupController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::node_group_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::node_group_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::node_group_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -980,14 +971,14 @@ impl NodeGroupController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NodeGroupController>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NodeGroupController>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -997,13 +988,13 @@ impl NodeGroupController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeGroupController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeGroupController> {
         super::transport::NodeGroupController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NodeGroupController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NodeGroupController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NodeGroupController::new)
@@ -1114,7 +1105,7 @@ impl NodeGroupController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::SessionTemplateController;
 /// let client = SessionTemplateController::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -1160,15 +1151,13 @@ impl SessionTemplateController {
     /// Returns a builder for [SessionTemplateController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::SessionTemplateController;
     /// let client = SessionTemplateController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::session_template_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::session_template_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::session_template_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1186,14 +1175,14 @@ impl SessionTemplateController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::SessionTemplateController>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1204,13 +1193,13 @@ impl SessionTemplateController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionTemplateController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionTemplateController> {
         super::transport::SessionTemplateController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionTemplateController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionTemplateController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SessionTemplateController::new)
@@ -1312,7 +1301,7 @@ impl SessionTemplateController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::SessionController;
 /// let client = SessionController::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -1358,15 +1347,13 @@ impl SessionController {
     /// Returns a builder for [SessionController].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::SessionController;
     /// let client = SessionController::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::session_controller::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::session_controller::client::Factory,
-        )
+        crate::new_client_builder(super::builder::session_controller::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1384,14 +1371,14 @@ impl SessionController {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SessionController>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SessionController>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1401,13 +1388,13 @@ impl SessionController {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionController> {
         super::transport::SessionController::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionController> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionController> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SessionController::new)
@@ -1528,7 +1515,7 @@ impl SessionController {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dataproc_v1::client::WorkflowTemplateService;
 /// let client = WorkflowTemplateService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Dataproc API.
@@ -1575,15 +1562,13 @@ impl WorkflowTemplateService {
     /// Returns a builder for [WorkflowTemplateService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dataproc_v1::client::WorkflowTemplateService;
     /// let client = WorkflowTemplateService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::workflow_template_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::workflow_template_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::workflow_template_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1601,16 +1586,15 @@ impl WorkflowTemplateService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::WorkflowTemplateService>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::WorkflowTemplateService>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1619,13 +1603,13 @@ impl WorkflowTemplateService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::WorkflowTemplateService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::WorkflowTemplateService> {
         super::transport::WorkflowTemplateService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::WorkflowTemplateService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::WorkflowTemplateService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::WorkflowTemplateService::new)
diff --git a/src/generated/cloud/dataproc/v1/src/lib.rs b/src/generated/cloud/dataproc/v1/src/lib.rs
index bf8325c638..d31edc39e9 100644
--- a/src/generated/cloud/dataproc/v1/src/lib.rs
+++ b/src/generated/cloud/dataproc/v1/src/lib.rs
@@ -51,8 +51,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -87,3 +87,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/dataproc/v1/src/model.rs b/src/generated/cloud/dataproc/v1/src/model.rs
index 2537b1e551..4b0dfae1dd 100644
--- a/src/generated/cloud/dataproc/v1/src/model.rs
+++ b/src/generated/cloud/dataproc/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1021,7 +1021,7 @@ impl wkt::message::Message for ListAutoscalingPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAutoscalingPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAutoscalingPoliciesResponse {
     type PageItem = crate::model::AutoscalingPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1380,7 +1380,7 @@ impl wkt::message::Message for ListBatchesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBatchesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBatchesResponse {
     type PageItem = crate::model::Batch;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9409,7 +9409,7 @@ impl wkt::message::Message for ListClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListClustersResponse {
     type PageItem = crate::model::Cluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -15326,7 +15326,7 @@ impl wkt::message::Message for ListJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListJobsResponse {
     type PageItem = crate::model::Job;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17541,7 +17541,7 @@ impl wkt::message::Message for ListSessionTemplatesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSessionTemplatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSessionTemplatesResponse {
     type PageItem = crate::model::SessionTemplate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -18272,7 +18272,7 @@ impl wkt::message::Message for ListSessionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSessionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSessionsResponse {
     type PageItem = crate::model::Session;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -25221,7 +25221,7 @@ impl wkt::message::Message for ListWorkflowTemplatesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWorkflowTemplatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWorkflowTemplatesResponse {
     type PageItem = crate::model::WorkflowTemplate;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/dataproc/v1/src/stub.rs b/src/generated/cloud/dataproc/v1/src/stub.rs
index db20ed2e28..d528a8f38c 100644
--- a/src/generated/cloud/dataproc/v1/src/stub.rs
+++ b/src/generated/cloud/dataproc/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn create_autoscaling_policy(
         &self,
         _req: crate::model::CreateAutoscalingPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::AutoscalingPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn update_autoscaling_policy(
         &self,
         _req: crate::model::UpdateAutoscalingPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::AutoscalingPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn get_autoscaling_policy(
         &self,
         _req: crate::model::GetAutoscalingPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::AutoscalingPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,11 +75,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn list_autoscaling_policies(
         &self,
         _req: crate::model::ListAutoscalingPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAutoscalingPoliciesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAutoscalingPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,8 +86,8 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn delete_autoscaling_policy(
         &self,
         _req: crate::model::DeleteAutoscalingPolicyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +95,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +106,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,10 +117,10 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -132,10 +130,10 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -145,9 +143,9 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,8 +154,8 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -165,8 +163,8 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -187,9 +185,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn create_batch(
         &self,
         _req: crate::model::CreateBatchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,10 +196,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn get_batch(
         &self,
         _req: crate::model::GetBatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Batch>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Batch>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -209,9 +206,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn list_batches(
         &self,
         _req: crate::model::ListBatchesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBatchesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBatchesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,8 +217,8 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn delete_batch(
         &self,
         _req: crate::model::DeleteBatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -229,9 +226,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,9 +237,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -251,10 +248,10 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -264,10 +261,10 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -277,9 +274,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,8 +285,8 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -297,8 +294,8 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -308,9 +305,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -319,9 +316,9 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -341,9 +338,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn create_cluster(
         &self,
         _req: crate::model::CreateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -352,9 +349,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn update_cluster(
         &self,
         _req: crate::model::UpdateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -363,9 +360,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn stop_cluster(
         &self,
         _req: crate::model::StopClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -374,9 +371,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn start_cluster(
         &self,
         _req: crate::model::StartClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,9 +382,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn delete_cluster(
         &self,
         _req: crate::model::DeleteClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -396,10 +393,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn get_cluster(
         &self,
         _req: crate::model::GetClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Cluster>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Cluster>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -407,9 +403,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn list_clusters(
         &self,
         _req: crate::model::ListClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -418,9 +414,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn diagnose_cluster(
         &self,
         _req: crate::model::DiagnoseClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -429,9 +425,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -440,9 +436,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -451,10 +447,10 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -464,10 +460,10 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -477,9 +473,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -488,8 +484,8 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -497,8 +493,8 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -508,9 +504,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -519,9 +515,9 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -541,9 +537,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn submit_job(
         &self,
         _req: crate::model::SubmitJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -551,9 +547,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn submit_job_as_operation(
         &self,
         _req: crate::model::SubmitJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -562,9 +558,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn get_job(
         &self,
         _req: crate::model::GetJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -572,9 +568,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn list_jobs(
         &self,
         _req: crate::model::ListJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -583,9 +579,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn update_job(
         &self,
         _req: crate::model::UpdateJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -593,9 +589,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn cancel_job(
         &self,
         _req: crate::model::CancelJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Job>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Job>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -603,8 +599,8 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn delete_job(
         &self,
         _req: crate::model::DeleteJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -612,9 +608,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -623,9 +619,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -634,10 +630,10 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -647,10 +643,10 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -660,9 +656,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -671,8 +667,8 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -680,8 +676,8 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -691,9 +687,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -702,9 +698,9 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -724,9 +720,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn create_node_group(
         &self,
         _req: crate::model::CreateNodeGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -735,9 +731,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn resize_node_group(
         &self,
         _req: crate::model::ResizeNodeGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -746,10 +742,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn get_node_group(
         &self,
         _req: crate::model::GetNodeGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodeGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NodeGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -757,9 +752,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -768,9 +763,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -779,10 +774,10 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -792,10 +787,10 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -805,9 +800,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -816,8 +811,8 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -825,8 +820,8 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -836,9 +831,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -847,9 +842,9 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -869,9 +864,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn create_session_template(
         &self,
         _req: crate::model::CreateSessionTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::SessionTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -880,9 +875,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn update_session_template(
         &self,
         _req: crate::model::UpdateSessionTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::SessionTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -891,9 +886,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn get_session_template(
         &self,
         _req: crate::model::GetSessionTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::SessionTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -902,9 +897,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn list_session_templates(
         &self,
         _req: crate::model::ListSessionTemplatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSessionTemplatesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSessionTemplatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -913,8 +908,8 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn delete_session_template(
         &self,
         _req: crate::model::DeleteSessionTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -922,9 +917,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -933,9 +928,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -944,10 +939,10 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -957,10 +952,10 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -970,9 +965,9 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -981,8 +976,8 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -990,8 +985,8 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1012,9 +1007,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn create_session(
         &self,
         _req: crate::model::CreateSessionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1023,10 +1018,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn get_session(
         &self,
         _req: crate::model::GetSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1034,9 +1028,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn list_sessions(
         &self,
         _req: crate::model::ListSessionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSessionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1045,9 +1039,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn terminate_session(
         &self,
         _req: crate::model::TerminateSessionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1056,9 +1050,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn delete_session(
         &self,
         _req: crate::model::DeleteSessionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1067,9 +1061,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1078,9 +1072,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1089,10 +1083,10 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1102,10 +1096,10 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1115,9 +1109,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1126,8 +1120,8 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1135,8 +1129,8 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1146,9 +1140,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1157,9 +1151,9 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1179,9 +1173,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn create_workflow_template(
         &self,
         _req: crate::model::CreateWorkflowTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1190,9 +1184,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn get_workflow_template(
         &self,
         _req: crate::model::GetWorkflowTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1201,9 +1195,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn instantiate_workflow_template(
         &self,
         _req: crate::model::InstantiateWorkflowTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1212,9 +1206,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn instantiate_inline_workflow_template(
         &self,
         _req: crate::model::InstantiateInlineWorkflowTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1223,9 +1217,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn update_workflow_template(
         &self,
         _req: crate::model::UpdateWorkflowTemplateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::WorkflowTemplate>>,
+        Output = crate::Result<crate::Response<crate::model::WorkflowTemplate>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1234,11 +1228,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn list_workflow_templates(
         &self,
         _req: crate::model::ListWorkflowTemplatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListWorkflowTemplatesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListWorkflowTemplatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1247,8 +1239,8 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn delete_workflow_template(
         &self,
         _req: crate::model::DeleteWorkflowTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1256,9 +1248,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1267,9 +1259,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1278,10 +1270,10 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1291,10 +1283,10 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1304,9 +1296,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1315,8 +1307,8 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1324,8 +1316,8 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1335,9 +1327,9 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1346,8 +1338,8 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/dataproc/v1/src/stub/dynamic.rs b/src/generated/cloud/dataproc/v1/src/stub/dynamic.rs
index c7d5feb9ff..b091a50097 100644
--- a/src/generated/cloud/dataproc/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/dataproc/v1/src/stub/dynamic.rs
@@ -20,78 +20,74 @@ pub trait AutoscalingPolicyService: std::fmt::Debug + Send + Sync {
     async fn create_autoscaling_policy(
         &self,
         req: crate::model::CreateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalingPolicy>>;
 
     async fn update_autoscaling_policy(
         &self,
         req: crate::model::UpdateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalingPolicy>>;
 
     async fn get_autoscaling_policy(
         &self,
         req: crate::model::GetAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalingPolicy>>;
 
     async fn list_autoscaling_policies(
         &self,
         req: crate::model::ListAutoscalingPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAutoscalingPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAutoscalingPoliciesResponse>>;
 
     async fn delete_autoscaling_policy(
         &self,
         req: crate::model::DeleteAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::AutoscalingPolicyService] also implement [AutoscalingPolicyService].
@@ -101,8 +97,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn create_autoscaling_policy(
         &self,
         req: crate::model::CreateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalingPolicy>> {
         T::create_autoscaling_policy(self, req, options).await
     }
 
@@ -110,8 +106,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn update_autoscaling_policy(
         &self,
         req: crate::model::UpdateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalingPolicy>> {
         T::update_autoscaling_policy(self, req, options).await
     }
 
@@ -119,8 +115,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn get_autoscaling_policy(
         &self,
         req: crate::model::GetAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutoscalingPolicy>> {
         T::get_autoscaling_policy(self, req, options).await
     }
 
@@ -128,8 +124,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn list_autoscaling_policies(
         &self,
         req: crate::model::ListAutoscalingPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAutoscalingPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAutoscalingPoliciesResponse>> {
         T::list_autoscaling_policies(self, req, options).await
     }
 
@@ -137,8 +133,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn delete_autoscaling_policy(
         &self,
         req: crate::model::DeleteAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_autoscaling_policy(self, req, options).await
     }
 
@@ -146,8 +142,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -155,8 +151,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -164,10 +160,9 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -175,10 +170,9 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -186,8 +180,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -195,8 +189,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -204,8 +198,8 @@ impl<T: super::AutoscalingPolicyService> AutoscalingPolicyService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -216,82 +210,78 @@ pub trait BatchController: std::fmt::Debug + Send + Sync {
     async fn create_batch(
         &self,
         req: crate::model::CreateBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_batch(
         &self,
         req: crate::model::GetBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Batch>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Batch>>;
 
     async fn list_batches(
         &self,
         req: crate::model::ListBatchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBatchesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBatchesResponse>>;
 
     async fn delete_batch(
         &self,
         req: crate::model::DeleteBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BatchController] also implement [BatchController].
@@ -301,8 +291,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn create_batch(
         &self,
         req: crate::model::CreateBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_batch(self, req, options).await
     }
 
@@ -310,8 +300,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn get_batch(
         &self,
         req: crate::model::GetBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Batch>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Batch>> {
         T::get_batch(self, req, options).await
     }
 
@@ -319,8 +309,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn list_batches(
         &self,
         req: crate::model::ListBatchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBatchesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBatchesResponse>> {
         T::list_batches(self, req, options).await
     }
 
@@ -328,8 +318,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn delete_batch(
         &self,
         req: crate::model::DeleteBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_batch(self, req, options).await
     }
 
@@ -337,8 +327,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -346,8 +336,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -355,10 +345,9 @@ impl<T: super::BatchController> BatchController for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -366,10 +355,9 @@ impl<T: super::BatchController> BatchController for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -377,8 +365,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -386,8 +374,8 @@ impl<T: super::BatchController> BatchController for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -395,22 +383,22 @@ impl<T: super::BatchController> BatchController for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -421,106 +409,102 @@ pub trait ClusterController: std::fmt::Debug + Send + Sync {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn stop_cluster(
         &self,
         req: crate::model::StopClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn start_cluster(
         &self,
         req: crate::model::StartClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>>;
 
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>>;
 
     async fn diagnose_cluster(
         &self,
         req: crate::model::DiagnoseClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ClusterController] also implement [ClusterController].
@@ -530,8 +514,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_cluster(self, req, options).await
     }
 
@@ -539,8 +523,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_cluster(self, req, options).await
     }
 
@@ -548,8 +532,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn stop_cluster(
         &self,
         req: crate::model::StopClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::stop_cluster(self, req, options).await
     }
 
@@ -557,8 +541,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn start_cluster(
         &self,
         req: crate::model::StartClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::start_cluster(self, req, options).await
     }
 
@@ -566,8 +550,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_cluster(self, req, options).await
     }
 
@@ -575,8 +559,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>> {
         T::get_cluster(self, req, options).await
     }
 
@@ -584,8 +568,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>> {
         T::list_clusters(self, req, options).await
     }
 
@@ -593,8 +577,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn diagnose_cluster(
         &self,
         req: crate::model::DiagnoseClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::diagnose_cluster(self, req, options).await
     }
 
@@ -602,8 +586,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -611,8 +595,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -620,10 +604,9 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -631,10 +614,9 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -642,8 +624,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -651,8 +633,8 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -660,22 +642,22 @@ impl<T: super::ClusterController> ClusterController for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -686,100 +668,96 @@ pub trait JobController: std::fmt::Debug + Send + Sync {
     async fn submit_job(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn submit_job_as_operation(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListJobsResponse>>;
 
     async fn update_job(
         &self,
         req: crate::model::UpdateJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>>;
 
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::JobController] also implement [JobController].
@@ -789,8 +767,8 @@ impl<T: super::JobController> JobController for T {
     async fn submit_job(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::submit_job(self, req, options).await
     }
 
@@ -798,8 +776,8 @@ impl<T: super::JobController> JobController for T {
     async fn submit_job_as_operation(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::submit_job_as_operation(self, req, options).await
     }
 
@@ -807,8 +785,8 @@ impl<T: super::JobController> JobController for T {
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::get_job(self, req, options).await
     }
 
@@ -816,8 +794,8 @@ impl<T: super::JobController> JobController for T {
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListJobsResponse>> {
         T::list_jobs(self, req, options).await
     }
 
@@ -825,8 +803,8 @@ impl<T: super::JobController> JobController for T {
     async fn update_job(
         &self,
         req: crate::model::UpdateJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::update_job(self, req, options).await
     }
 
@@ -834,8 +812,8 @@ impl<T: super::JobController> JobController for T {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Job>> {
         T::cancel_job(self, req, options).await
     }
 
@@ -843,8 +821,8 @@ impl<T: super::JobController> JobController for T {
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_job(self, req, options).await
     }
 
@@ -852,8 +830,8 @@ impl<T: super::JobController> JobController for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -861,8 +839,8 @@ impl<T: super::JobController> JobController for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -870,10 +848,9 @@ impl<T: super::JobController> JobController for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -881,10 +858,9 @@ impl<T: super::JobController> JobController for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -892,8 +868,8 @@ impl<T: super::JobController> JobController for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -901,8 +877,8 @@ impl<T: super::JobController> JobController for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -910,22 +886,22 @@ impl<T: super::JobController> JobController for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -936,76 +912,72 @@ pub trait NodeGroupController: std::fmt::Debug + Send + Sync {
     async fn create_node_group(
         &self,
         req: crate::model::CreateNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn resize_node_group(
         &self,
         req: crate::model::ResizeNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_node_group(
         &self,
         req: crate::model::GetNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroup>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NodeGroupController] also implement [NodeGroupController].
@@ -1015,8 +987,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn create_node_group(
         &self,
         req: crate::model::CreateNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_node_group(self, req, options).await
     }
 
@@ -1024,8 +996,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn resize_node_group(
         &self,
         req: crate::model::ResizeNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::resize_node_group(self, req, options).await
     }
 
@@ -1033,8 +1005,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn get_node_group(
         &self,
         req: crate::model::GetNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodeGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodeGroup>> {
         T::get_node_group(self, req, options).await
     }
 
@@ -1042,8 +1014,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1051,8 +1023,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1060,10 +1032,9 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1071,10 +1042,9 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1082,8 +1052,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1091,8 +1061,8 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1100,22 +1070,22 @@ impl<T: super::NodeGroupController> NodeGroupController for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1126,78 +1096,74 @@ pub trait SessionTemplateController: std::fmt::Debug + Send + Sync {
     async fn create_session_template(
         &self,
         req: crate::model::CreateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionTemplate>>;
 
     async fn update_session_template(
         &self,
         req: crate::model::UpdateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionTemplate>>;
 
     async fn get_session_template(
         &self,
         req: crate::model::GetSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionTemplate>>;
 
     async fn list_session_templates(
         &self,
         req: crate::model::ListSessionTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionTemplatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionTemplatesResponse>>;
 
     async fn delete_session_template(
         &self,
         req: crate::model::DeleteSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SessionTemplateController] also implement [SessionTemplateController].
@@ -1207,8 +1173,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn create_session_template(
         &self,
         req: crate::model::CreateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionTemplate>> {
         T::create_session_template(self, req, options).await
     }
 
@@ -1216,8 +1182,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn update_session_template(
         &self,
         req: crate::model::UpdateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionTemplate>> {
         T::update_session_template(self, req, options).await
     }
 
@@ -1225,8 +1191,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn get_session_template(
         &self,
         req: crate::model::GetSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionTemplate>> {
         T::get_session_template(self, req, options).await
     }
 
@@ -1234,8 +1200,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn list_session_templates(
         &self,
         req: crate::model::ListSessionTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionTemplatesResponse>> {
         T::list_session_templates(self, req, options).await
     }
 
@@ -1243,8 +1209,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn delete_session_template(
         &self,
         req: crate::model::DeleteSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_session_template(self, req, options).await
     }
 
@@ -1252,8 +1218,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1261,8 +1227,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1270,10 +1236,9 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1281,10 +1246,9 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1292,8 +1256,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1301,8 +1265,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1310,8 +1274,8 @@ impl<T: super::SessionTemplateController> SessionTemplateController for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1322,88 +1286,84 @@ pub trait SessionController: std::fmt::Debug + Send + Sync {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>>;
 
     async fn terminate_session(
         &self,
         req: crate::model::TerminateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SessionController] also implement [SessionController].
@@ -1413,8 +1373,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_session(self, req, options).await
     }
 
@@ -1422,8 +1382,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::get_session(self, req, options).await
     }
 
@@ -1431,8 +1391,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>> {
         T::list_sessions(self, req, options).await
     }
 
@@ -1440,8 +1400,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn terminate_session(
         &self,
         req: crate::model::TerminateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::terminate_session(self, req, options).await
     }
 
@@ -1449,8 +1409,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_session(self, req, options).await
     }
 
@@ -1458,8 +1418,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1467,8 +1427,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1476,10 +1436,9 @@ impl<T: super::SessionController> SessionController for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1487,10 +1446,9 @@ impl<T: super::SessionController> SessionController for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1498,8 +1456,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1507,8 +1465,8 @@ impl<T: super::SessionController> SessionController for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1516,22 +1474,22 @@ impl<T: super::SessionController> SessionController for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1542,100 +1500,96 @@ pub trait WorkflowTemplateService: std::fmt::Debug + Send + Sync {
     async fn create_workflow_template(
         &self,
         req: crate::model::CreateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowTemplate>>;
 
     async fn get_workflow_template(
         &self,
         req: crate::model::GetWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowTemplate>>;
 
     async fn instantiate_workflow_template(
         &self,
         req: crate::model::InstantiateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn instantiate_inline_workflow_template(
         &self,
         req: crate::model::InstantiateInlineWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_workflow_template(
         &self,
         req: crate::model::UpdateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowTemplate>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowTemplate>>;
 
     async fn list_workflow_templates(
         &self,
         req: crate::model::ListWorkflowTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkflowTemplatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkflowTemplatesResponse>>;
 
     async fn delete_workflow_template(
         &self,
         req: crate::model::DeleteWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::WorkflowTemplateService] also implement [WorkflowTemplateService].
@@ -1645,8 +1599,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn create_workflow_template(
         &self,
         req: crate::model::CreateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowTemplate>> {
         T::create_workflow_template(self, req, options).await
     }
 
@@ -1654,8 +1608,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn get_workflow_template(
         &self,
         req: crate::model::GetWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowTemplate>> {
         T::get_workflow_template(self, req, options).await
     }
 
@@ -1663,8 +1617,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn instantiate_workflow_template(
         &self,
         req: crate::model::InstantiateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::instantiate_workflow_template(self, req, options).await
     }
 
@@ -1672,8 +1626,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn instantiate_inline_workflow_template(
         &self,
         req: crate::model::InstantiateInlineWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::instantiate_inline_workflow_template(self, req, options).await
     }
 
@@ -1681,8 +1635,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn update_workflow_template(
         &self,
         req: crate::model::UpdateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::WorkflowTemplate>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::WorkflowTemplate>> {
         T::update_workflow_template(self, req, options).await
     }
 
@@ -1690,8 +1644,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn list_workflow_templates(
         &self,
         req: crate::model::ListWorkflowTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWorkflowTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWorkflowTemplatesResponse>> {
         T::list_workflow_templates(self, req, options).await
     }
 
@@ -1699,8 +1653,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn delete_workflow_template(
         &self,
         req: crate::model::DeleteWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_workflow_template(self, req, options).await
     }
 
@@ -1708,8 +1662,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1717,8 +1671,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1726,10 +1680,9 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1737,10 +1690,9 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1748,8 +1700,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1757,8 +1709,8 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1766,22 +1718,22 @@ impl<T: super::WorkflowTemplateService> WorkflowTemplateService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/dataproc/v1/src/tracing.rs b/src/generated/cloud/dataproc/v1/src/tracing.rs
index 543a16ee69..125aedc476 100644
--- a/src/generated/cloud/dataproc/v1/src/tracing.rs
+++ b/src/generated/cloud/dataproc/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_autoscaling_policy(
         &self,
         req: crate::model::CreateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalingPolicy>> {
         self.inner.create_autoscaling_policy(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_autoscaling_policy(
         &self,
         req: crate::model::UpdateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalingPolicy>> {
         self.inner.update_autoscaling_policy(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_autoscaling_policy(
         &self,
         req: crate::model::GetAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalingPolicy>> {
         self.inner.get_autoscaling_policy(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_autoscaling_policies(
         &self,
         req: crate::model::ListAutoscalingPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAutoscalingPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAutoscalingPoliciesResponse>> {
         self.inner.list_autoscaling_policies(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_autoscaling_policy(
         &self,
         req: crate::model::DeleteAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_autoscaling_policy(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -104,9 +104,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -114,9 +113,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -124,8 +122,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -133,8 +131,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -142,8 +140,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -174,8 +172,8 @@ where
     async fn create_batch(
         &self,
         req: crate::model::CreateBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_batch(req, options).await
     }
 
@@ -183,8 +181,8 @@ where
     async fn get_batch(
         &self,
         req: crate::model::GetBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Batch>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Batch>> {
         self.inner.get_batch(req, options).await
     }
 
@@ -192,8 +190,8 @@ where
     async fn list_batches(
         &self,
         req: crate::model::ListBatchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBatchesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBatchesResponse>> {
         self.inner.list_batches(req, options).await
     }
 
@@ -201,8 +199,8 @@ where
     async fn delete_batch(
         &self,
         req: crate::model::DeleteBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_batch(req, options).await
     }
 
@@ -210,8 +208,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -219,8 +217,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -228,9 +226,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -238,9 +235,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -248,8 +244,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -257,8 +253,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -266,22 +262,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -312,8 +308,8 @@ where
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_cluster(req, options).await
     }
 
@@ -321,8 +317,8 @@ where
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_cluster(req, options).await
     }
 
@@ -330,8 +326,8 @@ where
     async fn stop_cluster(
         &self,
         req: crate::model::StopClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.stop_cluster(req, options).await
     }
 
@@ -339,8 +335,8 @@ where
     async fn start_cluster(
         &self,
         req: crate::model::StartClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.start_cluster(req, options).await
     }
 
@@ -348,8 +344,8 @@ where
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_cluster(req, options).await
     }
 
@@ -357,8 +353,8 @@ where
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         self.inner.get_cluster(req, options).await
     }
 
@@ -366,8 +362,8 @@ where
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         self.inner.list_clusters(req, options).await
     }
 
@@ -375,8 +371,8 @@ where
     async fn diagnose_cluster(
         &self,
         req: crate::model::DiagnoseClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.diagnose_cluster(req, options).await
     }
 
@@ -384,8 +380,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -393,8 +389,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -402,9 +398,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -412,9 +407,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -422,8 +416,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -431,8 +425,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -440,22 +434,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -486,8 +480,8 @@ where
     async fn submit_job(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.submit_job(req, options).await
     }
 
@@ -495,8 +489,8 @@ where
     async fn submit_job_as_operation(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.submit_job_as_operation(req, options).await
     }
 
@@ -504,8 +498,8 @@ where
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.get_job(req, options).await
     }
 
@@ -513,8 +507,8 @@ where
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListJobsResponse>> {
         self.inner.list_jobs(req, options).await
     }
 
@@ -522,8 +516,8 @@ where
     async fn update_job(
         &self,
         req: crate::model::UpdateJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.update_job(req, options).await
     }
 
@@ -531,8 +525,8 @@ where
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         self.inner.cancel_job(req, options).await
     }
 
@@ -540,8 +534,8 @@ where
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_job(req, options).await
     }
 
@@ -549,8 +543,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -558,8 +552,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -567,9 +561,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -577,9 +570,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -587,8 +579,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -596,8 +588,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -605,22 +597,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -651,8 +643,8 @@ where
     async fn create_node_group(
         &self,
         req: crate::model::CreateNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_node_group(req, options).await
     }
 
@@ -660,8 +652,8 @@ where
     async fn resize_node_group(
         &self,
         req: crate::model::ResizeNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.resize_node_group(req, options).await
     }
 
@@ -669,8 +661,8 @@ where
     async fn get_node_group(
         &self,
         req: crate::model::GetNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroup>> {
         self.inner.get_node_group(req, options).await
     }
 
@@ -678,8 +670,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -687,8 +679,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -696,9 +688,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -706,9 +697,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -716,8 +706,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -725,8 +715,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -734,22 +724,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -780,8 +770,8 @@ where
     async fn create_session_template(
         &self,
         req: crate::model::CreateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionTemplate>> {
         self.inner.create_session_template(req, options).await
     }
 
@@ -789,8 +779,8 @@ where
     async fn update_session_template(
         &self,
         req: crate::model::UpdateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionTemplate>> {
         self.inner.update_session_template(req, options).await
     }
 
@@ -798,8 +788,8 @@ where
     async fn get_session_template(
         &self,
         req: crate::model::GetSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionTemplate>> {
         self.inner.get_session_template(req, options).await
     }
 
@@ -807,8 +797,8 @@ where
     async fn list_session_templates(
         &self,
         req: crate::model::ListSessionTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionTemplatesResponse>> {
         self.inner.list_session_templates(req, options).await
     }
 
@@ -816,8 +806,8 @@ where
     async fn delete_session_template(
         &self,
         req: crate::model::DeleteSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_session_template(req, options).await
     }
 
@@ -825,8 +815,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -834,8 +824,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -843,9 +833,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -853,9 +842,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -863,8 +851,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -872,8 +860,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -881,8 +869,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -913,8 +901,8 @@ where
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_session(req, options).await
     }
 
@@ -922,8 +910,8 @@ where
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.get_session(req, options).await
     }
 
@@ -931,8 +919,8 @@ where
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         self.inner.list_sessions(req, options).await
     }
 
@@ -940,8 +928,8 @@ where
     async fn terminate_session(
         &self,
         req: crate::model::TerminateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.terminate_session(req, options).await
     }
 
@@ -949,8 +937,8 @@ where
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_session(req, options).await
     }
 
@@ -958,8 +946,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -967,8 +955,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -976,9 +964,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -986,9 +973,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -996,8 +982,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1005,8 +991,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1014,22 +1000,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1060,8 +1046,8 @@ where
     async fn create_workflow_template(
         &self,
         req: crate::model::CreateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowTemplate>> {
         self.inner.create_workflow_template(req, options).await
     }
 
@@ -1069,8 +1055,8 @@ where
     async fn get_workflow_template(
         &self,
         req: crate::model::GetWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowTemplate>> {
         self.inner.get_workflow_template(req, options).await
     }
 
@@ -1078,8 +1064,8 @@ where
     async fn instantiate_workflow_template(
         &self,
         req: crate::model::InstantiateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.instantiate_workflow_template(req, options).await
     }
 
@@ -1087,8 +1073,8 @@ where
     async fn instantiate_inline_workflow_template(
         &self,
         req: crate::model::InstantiateInlineWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .instantiate_inline_workflow_template(req, options)
             .await
@@ -1098,8 +1084,8 @@ where
     async fn update_workflow_template(
         &self,
         req: crate::model::UpdateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowTemplate>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowTemplate>> {
         self.inner.update_workflow_template(req, options).await
     }
 
@@ -1107,8 +1093,8 @@ where
     async fn list_workflow_templates(
         &self,
         req: crate::model::ListWorkflowTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkflowTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkflowTemplatesResponse>> {
         self.inner.list_workflow_templates(req, options).await
     }
 
@@ -1116,8 +1102,8 @@ where
     async fn delete_workflow_template(
         &self,
         req: crate::model::DeleteWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_workflow_template(req, options).await
     }
 
@@ -1125,8 +1111,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1134,8 +1120,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1143,9 +1129,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1153,9 +1138,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1163,8 +1147,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1172,8 +1156,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1181,22 +1165,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/dataproc/v1/src/transport.rs b/src/generated/cloud/dataproc/v1/src/transport.rs
index c54a07d3c8..3cca3ca326 100644
--- a/src/generated/cloud/dataproc/v1/src/transport.rs
+++ b/src/generated/cloud/dataproc/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AutoscalingPolicyService](super::stub::AutoscalingPolicyService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AutoscalingPolicyService {
 }
 
 impl AutoscalingPolicyService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn create_autoscaling_policy(
         &self,
         req: crate::model::CreateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalingPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -119,9 +119,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -136,13 +136,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn update_autoscaling_policy(
         &self,
         req: crate::model::UpdateAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalingPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -232,9 +232,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -249,13 +249,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn get_autoscaling_policy(
         &self,
         req: crate::model::GetAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutoscalingPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutoscalingPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -333,9 +333,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -350,13 +350,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn list_autoscaling_policies(
         &self,
         req: crate::model::ListAutoscalingPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAutoscalingPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAutoscalingPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430,9 +430,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -447,13 +447,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn delete_autoscaling_policy(
         &self,
         req: crate::model::DeleteAutoscalingPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -531,9 +531,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -542,24 +542,25 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -822,9 +823,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -839,13 +840,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1108,9 +1109,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1125,14 +1126,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1395,9 +1395,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1412,14 +1412,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1503,9 +1502,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1520,13 +1519,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1604,9 +1603,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1621,13 +1620,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1705,9 +1704,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1716,24 +1715,25 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1811,9 +1811,9 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1822,12 +1822,13 @@ impl super::stub::AutoscalingPolicyService for AutoscalingPolicyService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1846,7 +1847,7 @@ impl std::fmt::Debug for BatchController {
 }
 
 impl BatchController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1856,13 +1857,13 @@ impl super::stub::BatchController for BatchController {
     async fn create_batch(
         &self,
         req: crate::model::CreateBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1901,9 +1902,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1918,13 +1919,13 @@ impl super::stub::BatchController for BatchController {
     async fn get_batch(
         &self,
         req: crate::model::GetBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Batch>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Batch>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1965,9 +1966,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1982,13 +1983,13 @@ impl super::stub::BatchController for BatchController {
     async fn list_batches(
         &self,
         req: crate::model::ListBatchesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBatchesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBatchesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2029,9 +2030,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2046,13 +2047,13 @@ impl super::stub::BatchController for BatchController {
     async fn delete_batch(
         &self,
         req: crate::model::DeleteBatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2093,9 +2094,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2104,24 +2105,25 @@ impl super::stub::BatchController for BatchController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2384,9 +2386,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2401,13 +2403,13 @@ impl super::stub::BatchController for BatchController {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2670,9 +2672,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2687,14 +2689,13 @@ impl super::stub::BatchController for BatchController {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2957,9 +2958,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2974,14 +2975,13 @@ impl super::stub::BatchController for BatchController {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3065,9 +3065,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3082,13 +3082,13 @@ impl super::stub::BatchController for BatchController {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3166,9 +3166,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3183,13 +3183,13 @@ impl super::stub::BatchController for BatchController {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3267,9 +3267,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3278,24 +3278,25 @@ impl super::stub::BatchController for BatchController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3373,9 +3374,9 @@ impl super::stub::BatchController for BatchController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3384,25 +3385,26 @@ impl super::stub::BatchController for BatchController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3422,7 +3424,7 @@ impl std::fmt::Debug for ClusterController {
 }
 
 impl ClusterController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3432,13 +3434,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3480,9 +3482,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3497,13 +3499,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3573,9 +3575,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3590,13 +3592,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn stop_cluster(
         &self,
         req: crate::model::StopClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3643,9 +3645,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3660,13 +3662,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn start_cluster(
         &self,
         req: crate::model::StartClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3713,9 +3715,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3730,13 +3732,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3785,9 +3787,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3802,13 +3804,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3855,9 +3857,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3872,13 +3874,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3918,9 +3920,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3935,13 +3937,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn diagnose_cluster(
         &self,
         req: crate::model::DiagnoseClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3988,9 +3990,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4005,13 +4007,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4274,9 +4276,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4291,13 +4293,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4560,9 +4562,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4577,14 +4579,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4847,9 +4848,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4864,14 +4865,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4955,9 +4955,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4972,13 +4972,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5056,9 +5056,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5073,13 +5073,13 @@ impl super::stub::ClusterController for ClusterController {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5157,9 +5157,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5168,24 +5168,25 @@ impl super::stub::ClusterController for ClusterController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5263,9 +5264,9 @@ impl super::stub::ClusterController for ClusterController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5274,25 +5275,26 @@ impl super::stub::ClusterController for ClusterController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5312,7 +5314,7 @@ impl std::fmt::Debug for JobController {
 }
 
 impl JobController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5322,13 +5324,13 @@ impl super::stub::JobController for JobController {
     async fn submit_job(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5365,9 +5367,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5382,13 +5384,13 @@ impl super::stub::JobController for JobController {
     async fn submit_job_as_operation(
         &self,
         req: crate::model::SubmitJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5425,9 +5427,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5442,13 +5444,13 @@ impl super::stub::JobController for JobController {
     async fn get_job(
         &self,
         req: crate::model::GetJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5495,9 +5497,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5512,13 +5514,13 @@ impl super::stub::JobController for JobController {
     async fn list_jobs(
         &self,
         req: crate::model::ListJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5560,9 +5562,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5577,13 +5579,13 @@ impl super::stub::JobController for JobController {
     async fn update_job(
         &self,
         req: crate::model::UpdateJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5642,9 +5644,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5659,13 +5661,13 @@ impl super::stub::JobController for JobController {
     async fn cancel_job(
         &self,
         req: crate::model::CancelJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Job>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Job>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5712,9 +5714,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5729,13 +5731,13 @@ impl super::stub::JobController for JobController {
     async fn delete_job(
         &self,
         req: crate::model::DeleteJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5782,9 +5784,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5793,24 +5795,25 @@ impl super::stub::JobController for JobController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6073,9 +6076,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6090,13 +6093,13 @@ impl super::stub::JobController for JobController {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6359,9 +6362,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6376,14 +6379,13 @@ impl super::stub::JobController for JobController {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6646,9 +6648,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6663,14 +6665,13 @@ impl super::stub::JobController for JobController {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6754,9 +6755,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6771,13 +6772,13 @@ impl super::stub::JobController for JobController {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6855,9 +6856,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6872,13 +6873,13 @@ impl super::stub::JobController for JobController {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6956,9 +6957,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6967,24 +6968,25 @@ impl super::stub::JobController for JobController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7062,9 +7064,9 @@ impl super::stub::JobController for JobController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7073,25 +7075,26 @@ impl super::stub::JobController for JobController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7111,7 +7114,7 @@ impl std::fmt::Debug for NodeGroupController {
 }
 
 impl NodeGroupController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -7121,13 +7124,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn create_node_group(
         &self,
         req: crate::model::CreateNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7170,9 +7173,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7187,13 +7190,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn resize_node_group(
         &self,
         req: crate::model::ResizeNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7238,9 +7241,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7255,13 +7258,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn get_node_group(
         &self,
         req: crate::model::GetNodeGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodeGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodeGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7306,9 +7309,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7323,13 +7326,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7592,9 +7595,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7609,13 +7612,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7878,9 +7881,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7895,14 +7898,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8165,9 +8167,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8182,14 +8184,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8273,9 +8274,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8290,13 +8291,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8374,9 +8375,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8391,13 +8392,13 @@ impl super::stub::NodeGroupController for NodeGroupController {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8475,9 +8476,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8486,24 +8487,25 @@ impl super::stub::NodeGroupController for NodeGroupController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8581,9 +8583,9 @@ impl super::stub::NodeGroupController for NodeGroupController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8592,25 +8594,26 @@ impl super::stub::NodeGroupController for NodeGroupController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8630,7 +8633,7 @@ impl std::fmt::Debug for SessionTemplateController {
 }
 
 impl SessionTemplateController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8640,13 +8643,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn create_session_template(
         &self,
         req: crate::model::CreateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8683,9 +8686,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8700,13 +8703,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn update_session_template(
         &self,
         req: crate::model::UpdateSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8753,9 +8756,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8770,13 +8773,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn get_session_template(
         &self,
         req: crate::model::GetSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8817,9 +8820,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8834,13 +8837,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn list_session_templates(
         &self,
         req: crate::model::ListSessionTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionTemplatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionTemplatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8880,9 +8883,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8897,13 +8900,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn delete_session_template(
         &self,
         req: crate::model::DeleteSessionTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8944,9 +8947,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8955,24 +8958,25 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9235,9 +9239,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9252,13 +9256,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9521,9 +9525,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9538,14 +9542,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9808,9 +9811,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9825,14 +9828,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9916,9 +9918,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9933,13 +9935,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10017,9 +10019,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10034,13 +10036,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10118,9 +10120,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10129,24 +10131,25 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10224,9 +10227,9 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10235,12 +10238,13 @@ impl super::stub::SessionTemplateController for SessionTemplateController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -10259,7 +10263,7 @@ impl std::fmt::Debug for SessionController {
 }
 
 impl SessionController {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -10269,13 +10273,13 @@ impl super::stub::SessionController for SessionController {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10314,9 +10318,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10331,13 +10335,13 @@ impl super::stub::SessionController for SessionController {
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10378,9 +10382,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10395,13 +10399,13 @@ impl super::stub::SessionController for SessionController {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10441,9 +10445,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10458,13 +10462,13 @@ impl super::stub::SessionController for SessionController {
     async fn terminate_session(
         &self,
         req: crate::model::TerminateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10505,9 +10509,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10522,13 +10526,13 @@ impl super::stub::SessionController for SessionController {
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10570,9 +10574,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10587,13 +10591,13 @@ impl super::stub::SessionController for SessionController {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10856,9 +10860,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10873,13 +10877,13 @@ impl super::stub::SessionController for SessionController {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11142,9 +11146,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11159,14 +11163,13 @@ impl super::stub::SessionController for SessionController {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11429,9 +11432,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11446,14 +11449,13 @@ impl super::stub::SessionController for SessionController {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11537,9 +11539,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11554,13 +11556,13 @@ impl super::stub::SessionController for SessionController {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11638,9 +11640,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11655,13 +11657,13 @@ impl super::stub::SessionController for SessionController {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11739,9 +11741,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11750,24 +11752,25 @@ impl super::stub::SessionController for SessionController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11845,9 +11848,9 @@ impl super::stub::SessionController for SessionController {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11856,25 +11859,26 @@ impl super::stub::SessionController for SessionController {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11894,7 +11898,7 @@ impl std::fmt::Debug for WorkflowTemplateService {
 }
 
 impl WorkflowTemplateService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11904,13 +11908,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn create_workflow_template(
         &self,
         req: crate::model::CreateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11980,9 +11984,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11997,13 +12001,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn get_workflow_template(
         &self,
         req: crate::model::GetWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12083,9 +12087,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12100,13 +12104,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn instantiate_workflow_template(
         &self,
         req: crate::model::InstantiateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12184,9 +12188,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12201,13 +12205,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn instantiate_inline_workflow_template(
         &self,
         req: crate::model::InstantiateInlineWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12279,9 +12283,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12296,13 +12300,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn update_workflow_template(
         &self,
         req: crate::model::UpdateWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::WorkflowTemplate>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::WorkflowTemplate>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12392,9 +12396,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12409,13 +12413,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn list_workflow_templates(
         &self,
         req: crate::model::ListWorkflowTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWorkflowTemplatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWorkflowTemplatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12489,9 +12493,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12506,13 +12510,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn delete_workflow_template(
         &self,
         req: crate::model::DeleteWorkflowTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12592,9 +12596,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12603,24 +12607,25 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12883,9 +12888,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12900,13 +12905,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13169,9 +13174,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13186,14 +13191,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13456,9 +13460,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13473,14 +13477,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13564,9 +13567,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13581,13 +13584,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13665,9 +13668,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13682,13 +13685,13 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13766,9 +13769,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13777,24 +13780,25 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13872,9 +13876,9 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13883,25 +13887,26 @@ impl super::stub::WorkflowTemplateService for WorkflowTemplateService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/datastream/v1/Cargo.toml b/src/generated/cloud/datastream/v1/Cargo.toml
index 8bda6b1204..d50b1f0d58 100644
--- a/src/generated/cloud/datastream/v1/Cargo.toml
+++ b/src/generated/cloud/datastream/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/datastream/v1/src/builder.rs b/src/generated/cloud/datastream/v1/src/builder.rs
index a29d76546f..ed5701d336 100644
--- a/src/generated/cloud/datastream/v1/src/builder.rs
+++ b/src/generated/cloud/datastream/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod datastream {
     /// A builder for [Datastream][crate::client::Datastream].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datastream_v1::*;
     /// # use builder::datastream::ClientBuilder;
     /// # use client::Datastream;
@@ -30,19 +30,18 @@ pub mod datastream {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Datastream;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Datastream;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod datastream {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Datastream>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod datastream {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListConnectionProfiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,15 +120,15 @@ pub mod datastream {
             (*self.0.stub)
                 .list_connection_profiles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConnectionProfilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -138,17 +137,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConnectionProfilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -186,8 +185,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnectionProfiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnectionProfiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -197,7 +196,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -228,7 +227,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -238,7 +237,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectionProfileRequest::name].
@@ -251,8 +250,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -262,7 +261,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::CreateConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -296,7 +295,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -311,7 +310,7 @@ pub mod datastream {
             (*self.0.stub)
                 .create_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_connection_profile`.
@@ -330,7 +329,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -415,8 +414,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -426,7 +425,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::UpdateConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -460,7 +459,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -475,7 +474,7 @@ pub mod datastream {
             (*self.0.stub)
                 .update_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_connection_profile`.
@@ -494,7 +493,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -581,8 +580,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -592,7 +591,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::DeleteConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -626,7 +625,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -641,7 +640,7 @@ pub mod datastream {
             (*self.0.stub)
                 .delete_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_connection_profile`.
@@ -653,7 +652,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -696,8 +695,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -707,7 +706,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::DiscoverConnectionProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -740,7 +739,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -750,7 +749,7 @@ pub mod datastream {
             (*self.0.stub)
                 .discover_connection_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::DiscoverConnectionProfileRequest::parent].
@@ -941,8 +940,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DiscoverConnectionProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DiscoverConnectionProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -952,8 +951,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListStreams;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -984,7 +983,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -994,13 +993,13 @@ pub mod datastream {
             (*self.0.stub)
                 .list_streams(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListStreamsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListStreamsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1009,15 +1008,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListStreamsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListStreamsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1055,8 +1056,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListStreams {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListStreams {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1066,7 +1067,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetStream;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1094,7 +1095,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1104,7 +1105,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_stream(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetStreamRequest::name].
@@ -1117,8 +1118,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStream {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStream {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1128,7 +1129,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::CreateStream;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1157,7 +1158,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1172,7 +1173,7 @@ pub mod datastream {
             (*self.0.stub)
                 .create_stream(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_stream`.
@@ -1189,7 +1190,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1274,8 +1275,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateStream {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateStream {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1285,7 +1286,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::UpdateStream;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1314,7 +1315,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1329,7 +1330,7 @@ pub mod datastream {
             (*self.0.stub)
                 .update_stream(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_stream`.
@@ -1346,7 +1347,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1433,8 +1434,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateStream {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateStream {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1444,7 +1445,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::DeleteStream;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1473,7 +1474,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1488,7 +1489,7 @@ pub mod datastream {
             (*self.0.stub)
                 .delete_stream(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_stream`.
@@ -1500,7 +1501,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1543,8 +1544,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteStream {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteStream {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1554,7 +1555,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::RunStream;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1583,7 +1584,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1598,7 +1599,7 @@ pub mod datastream {
             (*self.0.stub)
                 .run_stream(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `run_stream`.
@@ -1615,7 +1616,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1676,8 +1677,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RunStream {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RunStream {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1687,7 +1688,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetStreamObject;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1715,7 +1716,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1725,7 +1726,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_stream_object(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetStreamObjectRequest::name].
@@ -1738,8 +1739,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStreamObject {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStreamObject {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1749,7 +1750,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::LookupStreamObject;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1780,7 +1781,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1790,7 +1791,7 @@ pub mod datastream {
             (*self.0.stub)
                 .lookup_stream_object(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::LookupStreamObjectRequest::parent].
@@ -1825,8 +1826,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupStreamObject {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupStreamObject {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1836,8 +1837,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListStreamObjects;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1871,7 +1872,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1881,14 +1882,16 @@ pub mod datastream {
             (*self.0.stub)
                 .list_stream_objects(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListStreamObjectsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListStreamObjectsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1896,15 +1899,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListStreamObjectsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListStreamObjectsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1930,8 +1935,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListStreamObjects {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListStreamObjects {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1941,7 +1946,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::StartBackfillJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1972,7 +1977,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1982,7 +1987,7 @@ pub mod datastream {
             (*self.0.stub)
                 .start_backfill_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [object][crate::model::StartBackfillJobRequest::object].
@@ -1995,8 +2000,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartBackfillJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartBackfillJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2006,7 +2011,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::StopBackfillJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2034,7 +2039,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2044,7 +2049,7 @@ pub mod datastream {
             (*self.0.stub)
                 .stop_backfill_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [object][crate::model::StopBackfillJobRequest::object].
@@ -2057,8 +2062,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopBackfillJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopBackfillJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2068,7 +2073,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::FetchStaticIps;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2096,7 +2101,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2106,7 +2111,7 @@ pub mod datastream {
             (*self.0.stub)
                 .fetch_static_ips(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchStaticIpsRequest::name].
@@ -2131,8 +2136,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchStaticIps {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchStaticIps {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2142,7 +2147,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::CreatePrivateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2176,7 +2181,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2191,7 +2196,7 @@ pub mod datastream {
             (*self.0.stub)
                 .create_private_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_private_connection`.
@@ -2210,7 +2215,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2295,8 +2300,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePrivateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePrivateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2306,7 +2311,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetPrivateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2337,7 +2342,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2347,7 +2352,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_private_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPrivateConnectionRequest::name].
@@ -2360,8 +2365,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPrivateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPrivateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2371,8 +2376,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListPrivateConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2406,7 +2411,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2416,15 +2421,15 @@ pub mod datastream {
             (*self.0.stub)
                 .list_private_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListPrivateConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2433,17 +2438,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPrivateConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2481,8 +2486,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPrivateConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPrivateConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2492,7 +2497,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::DeletePrivateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2526,7 +2531,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2541,7 +2546,7 @@ pub mod datastream {
             (*self.0.stub)
                 .delete_private_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_private_connection`.
@@ -2553,7 +2558,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2602,8 +2607,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePrivateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePrivateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2613,7 +2618,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::CreateRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2642,7 +2647,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2657,7 +2662,7 @@ pub mod datastream {
             (*self.0.stub)
                 .create_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_route`.
@@ -2674,7 +2679,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2747,8 +2752,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2758,7 +2763,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2786,7 +2791,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2796,7 +2801,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRouteRequest::name].
@@ -2809,8 +2814,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2820,8 +2825,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListRoutes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2852,7 +2857,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2862,13 +2867,13 @@ pub mod datastream {
             (*self.0.stub)
                 .list_routes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRoutesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRoutesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2877,15 +2882,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRoutesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRoutesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2923,8 +2930,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRoutes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRoutes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2934,7 +2941,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::DeleteRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2963,7 +2970,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2978,7 +2985,7 @@ pub mod datastream {
             (*self.0.stub)
                 .delete_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_route`.
@@ -2990,7 +2997,7 @@ pub mod datastream {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3033,8 +3040,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3044,8 +3051,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3079,7 +3086,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3089,15 +3096,15 @@ pub mod datastream {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3106,17 +3113,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3146,8 +3153,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3157,7 +3164,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3188,7 +3195,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3198,7 +3205,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3209,8 +3216,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3220,8 +3227,8 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3257,7 +3264,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3267,15 +3274,15 @@ pub mod datastream {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3284,17 +3291,17 @@ pub mod datastream {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3330,8 +3337,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3341,7 +3348,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3372,7 +3379,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3382,7 +3389,7 @@ pub mod datastream {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3393,8 +3400,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3404,7 +3411,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3437,7 +3444,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3447,7 +3454,7 @@ pub mod datastream {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3458,8 +3465,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3469,7 +3476,7 @@ pub mod datastream {
     /// # Example
     /// ```
     /// # use google_cloud_datastream_v1::builder::datastream::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_datastream_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3502,7 +3509,7 @@ pub mod datastream {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3512,7 +3519,7 @@ pub mod datastream {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3523,8 +3530,8 @@ pub mod datastream {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/datastream/v1/src/client.rs b/src/generated/cloud/datastream/v1/src/client.rs
index 1de2101c05..2df5afe5f0 100644
--- a/src/generated/cloud/datastream/v1/src/client.rs
+++ b/src/generated/cloud/datastream/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_datastream_v1::client::Datastream;
 /// let client = Datastream::builder().build().await?;
 /// // use `client` to make requests to the Datastream API.
@@ -66,13 +66,13 @@ impl Datastream {
     /// Returns a builder for [Datastream].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_datastream_v1::client::Datastream;
     /// let client = Datastream::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::datastream::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::datastream::client::Factory)
+        crate::new_client_builder(super::builder::datastream::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Datastream {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Datastream>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Datastream>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Datastream {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Datastream> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Datastream> {
         super::transport::Datastream::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Datastream> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Datastream> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Datastream::new)
diff --git a/src/generated/cloud/datastream/v1/src/lib.rs b/src/generated/cloud/datastream/v1/src/lib.rs
index 7cd551e543..643be95442 100644
--- a/src/generated/cloud/datastream/v1/src/lib.rs
+++ b/src/generated/cloud/datastream/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/datastream/v1/src/model.rs b/src/generated/cloud/datastream/v1/src/model.rs
index 9a30027e16..cc8d636a63 100644
--- a/src/generated/cloud/datastream/v1/src/model.rs
+++ b/src/generated/cloud/datastream/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1247,7 +1247,7 @@ impl wkt::message::Message for ListConnectionProfilesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectionProfilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectionProfilesResponse {
     type PageItem = crate::model::ConnectionProfile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1835,7 +1835,7 @@ impl wkt::message::Message for ListStreamsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListStreamsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListStreamsResponse {
     type PageItem = crate::model::Stream;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2742,7 +2742,7 @@ impl wkt::message::Message for ListStreamObjectsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListStreamObjectsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListStreamObjectsResponse {
     type PageItem = crate::model::StreamObject;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3296,7 +3296,7 @@ impl wkt::message::Message for ListPrivateConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPrivateConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPrivateConnectionsResponse {
     type PageItem = crate::model::PrivateConnection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3715,7 +3715,7 @@ impl wkt::message::Message for ListRoutesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRoutesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRoutesResponse {
     type PageItem = crate::model::Route;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/datastream/v1/src/stub.rs b/src/generated/cloud/datastream/v1/src/stub.rs
index 3e4cc4fc3f..ffe510e09b 100644
--- a/src/generated/cloud/datastream/v1/src/stub.rs
+++ b/src/generated/cloud/datastream/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_connection_profiles(
         &self,
         _req: crate::model::ListConnectionProfilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConnectionProfilesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConnectionProfilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,9 +53,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_connection_profile(
         &self,
         _req: crate::model::GetConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConnectionProfile>>,
+        Output = crate::Result<crate::Response<crate::model::ConnectionProfile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn create_connection_profile(
         &self,
         _req: crate::model::CreateConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn update_connection_profile(
         &self,
         _req: crate::model::UpdateConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,9 +86,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn delete_connection_profile(
         &self,
         _req: crate::model::DeleteConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,11 +97,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn discover_connection_profile(
         &self,
         _req: crate::model::DiscoverConnectionProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::DiscoverConnectionProfileResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::DiscoverConnectionProfileResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -112,9 +108,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_streams(
         &self,
         _req: crate::model::ListStreamsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListStreamsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListStreamsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,10 +119,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_stream(
         &self,
         _req: crate::model::GetStreamRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Stream>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Stream>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -134,9 +129,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn create_stream(
         &self,
         _req: crate::model::CreateStreamRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,9 +140,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn update_stream(
         &self,
         _req: crate::model::UpdateStreamRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,9 +151,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn delete_stream(
         &self,
         _req: crate::model::DeleteStreamRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,9 +162,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn run_stream(
         &self,
         _req: crate::model::RunStreamRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +173,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_stream_object(
         &self,
         _req: crate::model::GetStreamObjectRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StreamObject>>,
+        Output = crate::Result<crate::Response<crate::model::StreamObject>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,9 +184,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn lookup_stream_object(
         &self,
         _req: crate::model::LookupStreamObjectRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StreamObject>>,
+        Output = crate::Result<crate::Response<crate::model::StreamObject>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,9 +195,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_stream_objects(
         &self,
         _req: crate::model::ListStreamObjectsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListStreamObjectsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListStreamObjectsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,9 +206,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn start_backfill_job(
         &self,
         _req: crate::model::StartBackfillJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StartBackfillJobResponse>>,
+        Output = crate::Result<crate::Response<crate::model::StartBackfillJobResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -222,9 +217,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn stop_backfill_job(
         &self,
         _req: crate::model::StopBackfillJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StopBackfillJobResponse>>,
+        Output = crate::Result<crate::Response<crate::model::StopBackfillJobResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -233,9 +228,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn fetch_static_ips(
         &self,
         _req: crate::model::FetchStaticIpsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchStaticIpsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchStaticIpsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -244,9 +239,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn create_private_connection(
         &self,
         _req: crate::model::CreatePrivateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -255,9 +250,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_private_connection(
         &self,
         _req: crate::model::GetPrivateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PrivateConnection>>,
+        Output = crate::Result<crate::Response<crate::model::PrivateConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -266,11 +261,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_private_connections(
         &self,
         _req: crate::model::ListPrivateConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListPrivateConnectionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListPrivateConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -279,9 +272,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn delete_private_connection(
         &self,
         _req: crate::model::DeletePrivateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -290,9 +283,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn create_route(
         &self,
         _req: crate::model::CreateRouteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -301,10 +294,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_route(
         &self,
         _req: crate::model::GetRouteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Route>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Route>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -312,9 +304,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_routes(
         &self,
         _req: crate::model::ListRoutesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRoutesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRoutesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -323,9 +315,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn delete_route(
         &self,
         _req: crate::model::DeleteRouteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -334,10 +326,10 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -347,9 +339,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -358,10 +350,10 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -371,9 +363,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -382,8 +374,8 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -391,8 +383,8 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -402,9 +394,9 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -413,8 +405,8 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/datastream/v1/src/stub/dynamic.rs b/src/generated/cloud/datastream/v1/src/stub/dynamic.rs
index 49293b92e8..6e4fd9c3e1 100644
--- a/src/generated/cloud/datastream/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/datastream/v1/src/stub/dynamic.rs
@@ -20,206 +20,204 @@ pub trait Datastream: std::fmt::Debug + Send + Sync {
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionProfilesResponse>>;
 
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionProfile>>;
 
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn discover_connection_profile(
         &self,
         req: crate::model::DiscoverConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoverConnectionProfileResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoverConnectionProfileResponse>>;
 
     async fn list_streams(
         &self,
         req: crate::model::ListStreamsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStreamsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStreamsResponse>>;
 
     async fn get_stream(
         &self,
         req: crate::model::GetStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Stream>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Stream>>;
 
     async fn create_stream(
         &self,
         req: crate::model::CreateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_stream(
         &self,
         req: crate::model::UpdateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_stream(
         &self,
         req: crate::model::DeleteStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn run_stream(
         &self,
         req: crate::model::RunStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_stream_object(
         &self,
         req: crate::model::GetStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StreamObject>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StreamObject>>;
 
     async fn lookup_stream_object(
         &self,
         req: crate::model::LookupStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StreamObject>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StreamObject>>;
 
     async fn list_stream_objects(
         &self,
         req: crate::model::ListStreamObjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStreamObjectsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStreamObjectsResponse>>;
 
     async fn start_backfill_job(
         &self,
         req: crate::model::StartBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StartBackfillJobResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StartBackfillJobResponse>>;
 
     async fn stop_backfill_job(
         &self,
         req: crate::model::StopBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StopBackfillJobResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StopBackfillJobResponse>>;
 
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchStaticIpsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchStaticIpsResponse>>;
 
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PrivateConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PrivateConnection>>;
 
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPrivateConnectionsResponse>>;
 
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_route(
         &self,
         req: crate::model::CreateRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Route>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Route>>;
 
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutesResponse>>;
 
     async fn delete_route(
         &self,
         req: crate::model::DeleteRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Datastream] also implement [Datastream].
@@ -229,8 +227,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionProfilesResponse>> {
         T::list_connection_profiles(self, req, options).await
     }
 
@@ -238,8 +236,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectionProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectionProfile>> {
         T::get_connection_profile(self, req, options).await
     }
 
@@ -247,8 +245,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_connection_profile(self, req, options).await
     }
 
@@ -256,8 +254,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_connection_profile(self, req, options).await
     }
 
@@ -265,8 +263,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_connection_profile(self, req, options).await
     }
 
@@ -274,9 +272,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn discover_connection_profile(
         &self,
         req: crate::model::DiscoverConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiscoverConnectionProfileResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiscoverConnectionProfileResponse>> {
         T::discover_connection_profile(self, req, options).await
     }
 
@@ -284,8 +281,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_streams(
         &self,
         req: crate::model::ListStreamsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStreamsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStreamsResponse>> {
         T::list_streams(self, req, options).await
     }
 
@@ -293,8 +290,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_stream(
         &self,
         req: crate::model::GetStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Stream>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Stream>> {
         T::get_stream(self, req, options).await
     }
 
@@ -302,8 +299,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn create_stream(
         &self,
         req: crate::model::CreateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_stream(self, req, options).await
     }
 
@@ -311,8 +308,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn update_stream(
         &self,
         req: crate::model::UpdateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_stream(self, req, options).await
     }
 
@@ -320,8 +317,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn delete_stream(
         &self,
         req: crate::model::DeleteStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_stream(self, req, options).await
     }
 
@@ -329,8 +326,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn run_stream(
         &self,
         req: crate::model::RunStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::run_stream(self, req, options).await
     }
 
@@ -338,8 +335,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_stream_object(
         &self,
         req: crate::model::GetStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StreamObject>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StreamObject>> {
         T::get_stream_object(self, req, options).await
     }
 
@@ -347,8 +344,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn lookup_stream_object(
         &self,
         req: crate::model::LookupStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StreamObject>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StreamObject>> {
         T::lookup_stream_object(self, req, options).await
     }
 
@@ -356,8 +353,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_stream_objects(
         &self,
         req: crate::model::ListStreamObjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStreamObjectsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStreamObjectsResponse>> {
         T::list_stream_objects(self, req, options).await
     }
 
@@ -365,8 +362,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn start_backfill_job(
         &self,
         req: crate::model::StartBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StartBackfillJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StartBackfillJobResponse>> {
         T::start_backfill_job(self, req, options).await
     }
 
@@ -374,8 +371,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn stop_backfill_job(
         &self,
         req: crate::model::StopBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StopBackfillJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StopBackfillJobResponse>> {
         T::stop_backfill_job(self, req, options).await
     }
 
@@ -383,8 +380,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchStaticIpsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchStaticIpsResponse>> {
         T::fetch_static_ips(self, req, options).await
     }
 
@@ -392,8 +389,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_private_connection(self, req, options).await
     }
 
@@ -401,8 +398,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PrivateConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PrivateConnection>> {
         T::get_private_connection(self, req, options).await
     }
 
@@ -410,8 +407,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPrivateConnectionsResponse>> {
         T::list_private_connections(self, req, options).await
     }
 
@@ -419,8 +416,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_private_connection(self, req, options).await
     }
 
@@ -428,8 +425,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn create_route(
         &self,
         req: crate::model::CreateRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_route(self, req, options).await
     }
 
@@ -437,8 +434,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Route>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Route>> {
         T::get_route(self, req, options).await
     }
 
@@ -446,8 +443,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutesResponse>> {
         T::list_routes(self, req, options).await
     }
 
@@ -455,8 +452,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn delete_route(
         &self,
         req: crate::model::DeleteRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_route(self, req, options).await
     }
 
@@ -464,9 +461,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -474,8 +470,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -483,10 +479,9 @@ impl<T: super::Datastream> Datastream for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -494,8 +489,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -503,8 +498,8 @@ impl<T: super::Datastream> Datastream for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -512,22 +507,22 @@ impl<T: super::Datastream> Datastream for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/datastream/v1/src/tracing.rs b/src/generated/cloud/datastream/v1/src/tracing.rs
index 3e37e6f414..c04c45598c 100644
--- a/src/generated/cloud/datastream/v1/src/tracing.rs
+++ b/src/generated/cloud/datastream/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionProfilesResponse>> {
         self.inner.list_connection_profiles(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionProfile>> {
         self.inner.get_connection_profile(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_connection_profile(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_connection_profile(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_connection_profile(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn discover_connection_profile(
         &self,
         req: crate::model::DiscoverConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoverConnectionProfileResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoverConnectionProfileResponse>> {
         self.inner.discover_connection_profile(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_streams(
         &self,
         req: crate::model::ListStreamsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStreamsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStreamsResponse>> {
         self.inner.list_streams(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_stream(
         &self,
         req: crate::model::GetStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Stream>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Stream>> {
         self.inner.get_stream(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn create_stream(
         &self,
         req: crate::model::CreateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_stream(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn update_stream(
         &self,
         req: crate::model::UpdateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_stream(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_stream(
         &self,
         req: crate::model::DeleteStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_stream(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn run_stream(
         &self,
         req: crate::model::RunStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.run_stream(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn get_stream_object(
         &self,
         req: crate::model::GetStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StreamObject>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StreamObject>> {
         self.inner.get_stream_object(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn lookup_stream_object(
         &self,
         req: crate::model::LookupStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StreamObject>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StreamObject>> {
         self.inner.lookup_stream_object(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn list_stream_objects(
         &self,
         req: crate::model::ListStreamObjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStreamObjectsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStreamObjectsResponse>> {
         self.inner.list_stream_objects(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn start_backfill_job(
         &self,
         req: crate::model::StartBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StartBackfillJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StartBackfillJobResponse>> {
         self.inner.start_backfill_job(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn stop_backfill_job(
         &self,
         req: crate::model::StopBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StopBackfillJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StopBackfillJobResponse>> {
         self.inner.stop_backfill_job(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchStaticIpsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchStaticIpsResponse>> {
         self.inner.fetch_static_ips(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_private_connection(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PrivateConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PrivateConnection>> {
         self.inner.get_private_connection(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPrivateConnectionsResponse>> {
         self.inner.list_private_connections(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_private_connection(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn create_route(
         &self,
         req: crate::model::CreateRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_route(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Route>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Route>> {
         self.inner.get_route(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutesResponse>> {
         self.inner.list_routes(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn delete_route(
         &self,
         req: crate::model::DeleteRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_route(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -293,9 +293,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -303,8 +302,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -312,8 +311,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -321,22 +320,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/datastream/v1/src/transport.rs b/src/generated/cloud/datastream/v1/src/transport.rs
index 755ad20e31..1cd74288af 100644
--- a/src/generated/cloud/datastream/v1/src/transport.rs
+++ b/src/generated/cloud/datastream/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Datastream](super::stub::Datastream) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Datastream {
 }
 
 impl Datastream {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_connection_profiles(
         &self,
         req: crate::model::ListConnectionProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionProfilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionProfilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_connection_profile(
         &self,
         req: crate::model::GetConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectionProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectionProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Datastream for Datastream {
     async fn create_connection_profile(
         &self,
         req: crate::model::CreateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -218,9 +218,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -235,13 +235,13 @@ impl super::stub::Datastream for Datastream {
     async fn update_connection_profile(
         &self,
         req: crate::model::UpdateConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -303,9 +303,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -320,13 +320,13 @@ impl super::stub::Datastream for Datastream {
     async fn delete_connection_profile(
         &self,
         req: crate::model::DeleteConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -368,9 +368,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -385,13 +385,13 @@ impl super::stub::Datastream for Datastream {
     async fn discover_connection_profile(
         &self,
         req: crate::model::DiscoverConnectionProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiscoverConnectionProfileResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiscoverConnectionProfileResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +428,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +445,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_streams(
         &self,
         req: crate::model::ListStreamsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStreamsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStreamsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +492,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +509,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_stream(
         &self,
         req: crate::model::GetStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Stream>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Stream>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -556,9 +556,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -573,13 +573,13 @@ impl super::stub::Datastream for Datastream {
     async fn create_stream(
         &self,
         req: crate::model::CreateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -620,9 +620,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -637,13 +637,13 @@ impl super::stub::Datastream for Datastream {
     async fn update_stream(
         &self,
         req: crate::model::UpdateStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -705,9 +705,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -722,13 +722,13 @@ impl super::stub::Datastream for Datastream {
     async fn delete_stream(
         &self,
         req: crate::model::DeleteStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -770,9 +770,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -787,13 +787,13 @@ impl super::stub::Datastream for Datastream {
     async fn run_stream(
         &self,
         req: crate::model::RunStreamRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -834,9 +834,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -851,13 +851,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_stream_object(
         &self,
         req: crate::model::GetStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StreamObject>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StreamObject>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -902,9 +902,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -919,13 +919,13 @@ impl super::stub::Datastream for Datastream {
     async fn lookup_stream_object(
         &self,
         req: crate::model::LookupStreamObjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StreamObject>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StreamObject>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -966,9 +966,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -983,13 +983,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_stream_objects(
         &self,
         req: crate::model::ListStreamObjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStreamObjectsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStreamObjectsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1032,9 +1032,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1049,13 +1049,13 @@ impl super::stub::Datastream for Datastream {
     async fn start_backfill_job(
         &self,
         req: crate::model::StartBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StartBackfillJobResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StartBackfillJobResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1100,9 +1100,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1117,13 +1117,13 @@ impl super::stub::Datastream for Datastream {
     async fn stop_backfill_job(
         &self,
         req: crate::model::StopBackfillJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StopBackfillJobResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StopBackfillJobResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1168,9 +1168,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1185,13 +1185,13 @@ impl super::stub::Datastream for Datastream {
     async fn fetch_static_ips(
         &self,
         req: crate::model::FetchStaticIpsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchStaticIpsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchStaticIpsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1230,9 +1230,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1247,13 +1247,13 @@ impl super::stub::Datastream for Datastream {
     async fn create_private_connection(
         &self,
         req: crate::model::CreatePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1294,9 +1294,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1311,13 +1311,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_private_connection(
         &self,
         req: crate::model::GetPrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PrivateConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PrivateConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1358,9 +1358,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1375,13 +1375,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_private_connections(
         &self,
         req: crate::model::ListPrivateConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPrivateConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPrivateConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1422,9 +1422,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1439,13 +1439,13 @@ impl super::stub::Datastream for Datastream {
     async fn delete_private_connection(
         &self,
         req: crate::model::DeletePrivateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1488,9 +1488,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1505,13 +1505,13 @@ impl super::stub::Datastream for Datastream {
     async fn create_route(
         &self,
         req: crate::model::CreateRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1554,9 +1554,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1571,13 +1571,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Route>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Route>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1622,9 +1622,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1639,13 +1639,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1690,9 +1690,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1707,13 +1707,13 @@ impl super::stub::Datastream for Datastream {
     async fn delete_route(
         &self,
         req: crate::model::DeleteRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1759,9 +1759,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1776,13 +1776,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1812,9 +1812,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1829,13 +1829,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1872,9 +1872,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1889,14 +1889,13 @@ impl super::stub::Datastream for Datastream {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1938,9 +1937,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1955,13 +1954,13 @@ impl super::stub::Datastream for Datastream {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2002,9 +2001,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2019,13 +2018,13 @@ impl super::stub::Datastream for Datastream {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2066,9 +2065,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2077,24 +2076,25 @@ impl super::stub::Datastream for Datastream {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2135,9 +2135,9 @@ impl super::stub::Datastream for Datastream {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2146,25 +2146,26 @@ impl super::stub::Datastream for Datastream {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/deploy/v1/Cargo.toml b/src/generated/cloud/deploy/v1/Cargo.toml
index f4afaa604e..95a3214b24 100644
--- a/src/generated/cloud/deploy/v1/Cargo.toml
+++ b/src/generated/cloud/deploy/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/deploy/v1/src/builder.rs b/src/generated/cloud/deploy/v1/src/builder.rs
index 1541077751..c034e1f8ee 100644
--- a/src/generated/cloud/deploy/v1/src/builder.rs
+++ b/src/generated/cloud/deploy/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_deploy {
     /// A builder for [CloudDeploy][crate::client::CloudDeploy].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_deploy_v1::*;
     /// # use builder::cloud_deploy::ClientBuilder;
     /// # use client::CloudDeploy;
@@ -30,19 +30,18 @@ pub mod cloud_deploy {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudDeploy;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudDeploy;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_deploy {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudDeploy>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_deploy {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListDeliveryPipelines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_delivery_pipelines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeliveryPipelinesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeliveryPipelinesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDeliveryPipelinesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -184,8 +185,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeliveryPipelines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeliveryPipelines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -195,7 +196,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetDeliveryPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -226,7 +227,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -236,7 +237,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_delivery_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeliveryPipelineRequest::name].
@@ -249,8 +250,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeliveryPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeliveryPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +261,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateDeliveryPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -292,7 +293,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +308,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_delivery_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_delivery_pipeline`.
@@ -324,7 +325,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -403,8 +404,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeliveryPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeliveryPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -414,7 +415,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::UpdateDeliveryPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -446,7 +447,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -461,7 +462,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .update_delivery_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_delivery_pipeline`.
@@ -478,7 +479,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -569,8 +570,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDeliveryPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDeliveryPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -580,7 +581,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::DeleteDeliveryPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -612,7 +613,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -627,7 +628,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .delete_delivery_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_delivery_pipeline`.
@@ -639,7 +640,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -706,8 +707,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDeliveryPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDeliveryPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -717,8 +718,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListTargets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -749,7 +750,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -759,13 +760,13 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_targets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTargetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTargetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -774,15 +775,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTargetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTargetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -820,8 +823,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTargets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTargets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -831,7 +834,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::RollbackTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -859,7 +862,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -869,7 +872,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .rollback_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RollbackTargetRequest::name].
@@ -945,8 +948,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RollbackTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RollbackTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -956,7 +959,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -984,7 +987,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -994,7 +997,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTargetRequest::name].
@@ -1007,8 +1010,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1018,7 +1021,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1047,7 +1050,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1062,7 +1065,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_target`.
@@ -1079,7 +1082,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1158,8 +1161,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1169,7 +1172,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::UpdateTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1198,7 +1201,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1213,7 +1216,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .update_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_target`.
@@ -1230,7 +1233,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1321,8 +1324,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1332,7 +1335,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::DeleteTarget;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1361,7 +1364,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1376,7 +1379,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .delete_target(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_target`.
@@ -1388,7 +1391,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1449,8 +1452,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTarget {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTarget {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1460,8 +1463,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListCustomTargetTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1495,7 +1498,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1505,14 +1508,16 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_custom_target_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCustomTargetTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCustomTargetTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1520,17 +1525,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCustomTargetTypesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1568,8 +1573,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCustomTargetTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCustomTargetTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1579,7 +1584,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetCustomTargetType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1610,7 +1615,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1620,7 +1625,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_custom_target_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCustomTargetTypeRequest::name].
@@ -1633,8 +1638,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCustomTargetType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCustomTargetType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1644,7 +1649,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateCustomTargetType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1676,7 +1681,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1691,7 +1696,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_custom_target_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_custom_target_type`.
@@ -1708,7 +1713,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1787,8 +1792,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCustomTargetType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCustomTargetType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1798,7 +1803,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::UpdateCustomTargetType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1830,7 +1835,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1845,7 +1850,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .update_custom_target_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_custom_target_type`.
@@ -1862,7 +1867,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1953,8 +1958,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCustomTargetType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCustomTargetType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1964,7 +1969,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::DeleteCustomTargetType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1996,7 +2001,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2011,7 +2016,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .delete_custom_target_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_custom_target_type`.
@@ -2023,7 +2028,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2084,8 +2089,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCustomTargetType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCustomTargetType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2095,8 +2100,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListReleases;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2127,7 +2132,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2137,13 +2142,13 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_releases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReleasesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListReleasesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2152,15 +2157,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListReleasesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListReleasesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2198,8 +2205,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReleases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReleases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2209,7 +2216,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2237,7 +2244,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2247,7 +2254,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReleaseRequest::name].
@@ -2260,8 +2267,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2271,7 +2278,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2300,7 +2307,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2315,7 +2322,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_release`.
@@ -2332,7 +2339,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2422,8 +2429,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2433,7 +2440,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::AbandonRelease;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2461,7 +2468,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2471,7 +2478,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .abandon_release(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::AbandonReleaseRequest::name].
@@ -2484,8 +2491,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AbandonRelease {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AbandonRelease {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2495,7 +2502,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateDeployPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2527,7 +2534,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2542,7 +2549,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_deploy_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_deploy_policy`.
@@ -2559,7 +2566,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2638,8 +2645,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeployPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeployPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2649,7 +2656,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::UpdateDeployPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2681,7 +2688,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2696,7 +2703,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .update_deploy_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_deploy_policy`.
@@ -2713,7 +2720,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2804,8 +2811,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDeployPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDeployPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2815,7 +2822,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::DeleteDeployPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2847,7 +2854,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2862,7 +2869,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .delete_deploy_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_deploy_policy`.
@@ -2874,7 +2881,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2935,8 +2942,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDeployPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDeployPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2946,8 +2953,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListDeployPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2981,7 +2988,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2991,14 +2998,16 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_deploy_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeployPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeployPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3006,17 +3015,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDeployPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3054,8 +3063,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeployPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeployPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3065,7 +3074,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetDeployPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3093,7 +3102,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3103,7 +3112,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_deploy_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeployPolicyRequest::name].
@@ -3116,8 +3125,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeployPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeployPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3127,7 +3136,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ApproveRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3155,7 +3164,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3165,7 +3174,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .approve_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ApproveRolloutRequest::name].
@@ -3197,8 +3206,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApproveRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApproveRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3208,7 +3217,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::AdvanceRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3236,7 +3245,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3246,7 +3255,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .advance_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::AdvanceRolloutRequest::name].
@@ -3278,8 +3287,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AdvanceRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AdvanceRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3289,7 +3298,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CancelRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3317,7 +3326,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3327,7 +3336,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .cancel_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelRolloutRequest::name].
@@ -3351,8 +3360,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3362,8 +3371,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListRollouts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3394,7 +3403,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3404,13 +3413,13 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_rollouts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRolloutsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRolloutsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3419,15 +3428,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRolloutsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRolloutsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3465,8 +3476,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRollouts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRollouts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3476,7 +3487,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3504,7 +3515,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3514,7 +3525,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRolloutRequest::name].
@@ -3527,8 +3538,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3538,7 +3549,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateRollout;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3567,7 +3578,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3582,7 +3593,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_rollout(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_rollout`.
@@ -3599,7 +3610,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3695,8 +3706,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRollout {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRollout {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3706,7 +3717,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::IgnoreJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3734,7 +3745,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3744,7 +3755,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .ignore_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [rollout][crate::model::IgnoreJobRequest::rollout].
@@ -3784,8 +3795,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for IgnoreJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for IgnoreJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3795,7 +3806,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::RetryJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3823,7 +3834,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3833,7 +3844,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .retry_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [rollout][crate::model::RetryJobRequest::rollout].
@@ -3873,8 +3884,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetryJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetryJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3884,8 +3895,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListJobRuns;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3916,7 +3927,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3926,13 +3937,13 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_job_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListJobRunsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListJobRunsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3941,15 +3952,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListJobRunsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListJobRunsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3987,8 +4000,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListJobRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListJobRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3998,7 +4011,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetJobRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4026,7 +4039,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4036,7 +4049,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_job_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetJobRunRequest::name].
@@ -4049,8 +4062,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetJobRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetJobRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4060,7 +4073,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::TerminateJobRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4088,7 +4101,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4098,7 +4111,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .terminate_job_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::TerminateJobRunRequest::name].
@@ -4122,8 +4135,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TerminateJobRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TerminateJobRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4133,7 +4146,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4161,7 +4174,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4171,7 +4184,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConfigRequest::name].
@@ -4184,8 +4197,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4195,7 +4208,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CreateAutomation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4227,7 +4240,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4242,7 +4255,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .create_automation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_automation`.
@@ -4259,7 +4272,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4338,8 +4351,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAutomation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAutomation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4349,7 +4362,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::UpdateAutomation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4381,7 +4394,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4396,7 +4409,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .update_automation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_automation`.
@@ -4413,7 +4426,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4504,8 +4517,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAutomation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAutomation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4515,7 +4528,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::DeleteAutomation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4547,7 +4560,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4562,7 +4575,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .delete_automation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_automation`.
@@ -4574,7 +4587,7 @@ pub mod cloud_deploy {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4635,8 +4648,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAutomation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAutomation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4646,7 +4659,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetAutomation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4674,7 +4687,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4684,7 +4697,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_automation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAutomationRequest::name].
@@ -4697,8 +4710,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAutomation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAutomation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4708,8 +4721,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListAutomations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4740,7 +4753,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4750,14 +4763,16 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_automations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAutomationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAutomationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4765,15 +4780,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAutomationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAutomationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4811,8 +4828,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAutomations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAutomations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4822,7 +4839,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetAutomationRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4853,7 +4870,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4863,7 +4880,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_automation_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAutomationRunRequest::name].
@@ -4876,8 +4893,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAutomationRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAutomationRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4887,8 +4904,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListAutomationRuns;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4922,7 +4939,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4932,14 +4949,16 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_automation_runs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAutomationRunsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAutomationRunsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4947,17 +4966,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAutomationRunsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4995,8 +5014,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAutomationRuns {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAutomationRuns {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5006,7 +5025,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CancelAutomationRun;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5037,7 +5056,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5047,7 +5066,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .cancel_automation_run(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelAutomationRunRequest::name].
@@ -5060,8 +5079,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelAutomationRun {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelAutomationRun {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5071,8 +5090,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5106,7 +5125,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5116,15 +5135,15 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5133,17 +5152,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5173,8 +5192,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5184,7 +5203,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5215,7 +5234,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5225,7 +5244,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5236,8 +5255,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5247,7 +5266,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5278,7 +5297,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5288,7 +5307,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -5341,8 +5360,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5352,7 +5371,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5383,7 +5402,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5393,7 +5412,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -5424,8 +5443,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5435,7 +5454,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5468,7 +5487,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5478,7 +5497,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -5504,8 +5523,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5515,8 +5534,8 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5552,7 +5571,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5562,15 +5581,15 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5579,17 +5598,17 @@ pub mod cloud_deploy {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5625,8 +5644,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5636,7 +5655,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5667,7 +5686,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5677,7 +5696,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5688,8 +5707,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5699,7 +5718,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5732,7 +5751,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5742,7 +5761,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5753,8 +5772,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5764,7 +5783,7 @@ pub mod cloud_deploy {
     /// # Example
     /// ```
     /// # use google_cloud_deploy_v1::builder::cloud_deploy::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_deploy_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5797,7 +5816,7 @@ pub mod cloud_deploy {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5807,7 +5826,7 @@ pub mod cloud_deploy {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5818,8 +5837,8 @@ pub mod cloud_deploy {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/deploy/v1/src/client.rs b/src/generated/cloud/deploy/v1/src/client.rs
index 9fae2e4070..8a0f809ce0 100644
--- a/src/generated/cloud/deploy/v1/src/client.rs
+++ b/src/generated/cloud/deploy/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_deploy_v1::client::CloudDeploy;
 /// let client = CloudDeploy::builder().build().await?;
 /// // use `client` to make requests to the Cloud Deploy API.
@@ -67,13 +67,13 @@ impl CloudDeploy {
     /// Returns a builder for [CloudDeploy].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_deploy_v1::client::CloudDeploy;
     /// let client = CloudDeploy::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_deploy::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::cloud_deploy::client::Factory)
+        crate::new_client_builder(super::builder::cloud_deploy::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl CloudDeploy {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudDeploy>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudDeploy>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl CloudDeploy {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudDeploy> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudDeploy> {
         super::transport::CloudDeploy::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudDeploy> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudDeploy> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudDeploy::new)
diff --git a/src/generated/cloud/deploy/v1/src/lib.rs b/src/generated/cloud/deploy/v1/src/lib.rs
index 794fc33e5c..9cf097c77d 100644
--- a/src/generated/cloud/deploy/v1/src/lib.rs
+++ b/src/generated/cloud/deploy/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/deploy/v1/src/model.rs b/src/generated/cloud/deploy/v1/src/model.rs
index 6de559da56..545a001e40 100644
--- a/src/generated/cloud/deploy/v1/src/model.rs
+++ b/src/generated/cloud/deploy/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -2961,7 +2961,7 @@ impl wkt::message::Message for ListDeliveryPipelinesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeliveryPipelinesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeliveryPipelinesResponse {
     type PageItem = crate::model::DeliveryPipeline;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5361,7 +5361,7 @@ impl wkt::message::Message for ListTargetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTargetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTargetsResponse {
     type PageItem = crate::model::Target;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6780,7 +6780,7 @@ impl wkt::message::Message for ListCustomTargetTypesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCustomTargetTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCustomTargetTypesResponse {
     type PageItem = crate::model::CustomTargetType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10820,7 +10820,7 @@ impl wkt::message::Message for ListDeployPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeployPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeployPoliciesResponse {
     type PageItem = crate::model::DeployPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11511,7 +11511,7 @@ impl wkt::message::Message for ListReleasesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReleasesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReleasesResponse {
     type PageItem = crate::model::Release;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -14773,7 +14773,7 @@ impl wkt::message::Message for ListRolloutsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRolloutsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRolloutsResponse {
     type PageItem = crate::model::Rollout;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17723,7 +17723,7 @@ impl wkt::message::Message for ListJobRunsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListJobRunsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListJobRunsResponse {
     type PageItem = crate::model::JobRun;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -20443,7 +20443,7 @@ impl wkt::message::Message for ListAutomationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAutomationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAutomationsResponse {
     type PageItem = crate::model::Automation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -22226,7 +22226,7 @@ impl wkt::message::Message for ListAutomationRunsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAutomationRunsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAutomationRunsResponse {
     type PageItem = crate::model::AutomationRun;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/deploy/v1/src/stub.rs b/src/generated/cloud/deploy/v1/src/stub.rs
index be87f71a2b..4b1cae4fd2 100644
--- a/src/generated/cloud/deploy/v1/src/stub.rs
+++ b/src/generated/cloud/deploy/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_delivery_pipelines(
         &self,
         _req: crate::model::ListDeliveryPipelinesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListDeliveryPipelinesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListDeliveryPipelinesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,9 +53,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_delivery_pipeline(
         &self,
         _req: crate::model::GetDeliveryPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DeliveryPipeline>>,
+        Output = crate::Result<crate::Response<crate::model::DeliveryPipeline>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_delivery_pipeline(
         &self,
         _req: crate::model::CreateDeliveryPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn update_delivery_pipeline(
         &self,
         _req: crate::model::UpdateDeliveryPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,9 +86,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn delete_delivery_pipeline(
         &self,
         _req: crate::model::DeleteDeliveryPipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +97,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_targets(
         &self,
         _req: crate::model::ListTargetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTargetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTargetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +108,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn rollback_target(
         &self,
         _req: crate::model::RollbackTargetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RollbackTargetResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RollbackTargetResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,10 +119,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_target(
         &self,
         _req: crate::model::GetTargetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Target>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Target>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -132,9 +129,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_target(
         &self,
         _req: crate::model::CreateTargetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,9 +140,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn update_target(
         &self,
         _req: crate::model::UpdateTargetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,9 +151,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn delete_target(
         &self,
         _req: crate::model::DeleteTargetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,11 +162,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_custom_target_types(
         &self,
         _req: crate::model::ListCustomTargetTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListCustomTargetTypesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListCustomTargetTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +173,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_custom_target_type(
         &self,
         _req: crate::model::GetCustomTargetTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CustomTargetType>>,
+        Output = crate::Result<crate::Response<crate::model::CustomTargetType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,9 +184,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_custom_target_type(
         &self,
         _req: crate::model::CreateCustomTargetTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,9 +195,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn update_custom_target_type(
         &self,
         _req: crate::model::UpdateCustomTargetTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,9 +206,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn delete_custom_target_type(
         &self,
         _req: crate::model::DeleteCustomTargetTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -222,9 +217,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_releases(
         &self,
         _req: crate::model::ListReleasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReleasesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReleasesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -233,10 +228,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_release(
         &self,
         _req: crate::model::GetReleaseRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Release>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Release>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -244,9 +238,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_release(
         &self,
         _req: crate::model::CreateReleaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -255,9 +249,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn abandon_release(
         &self,
         _req: crate::model::AbandonReleaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AbandonReleaseResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AbandonReleaseResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -266,9 +260,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_deploy_policy(
         &self,
         _req: crate::model::CreateDeployPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -277,9 +271,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn update_deploy_policy(
         &self,
         _req: crate::model::UpdateDeployPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,9 +282,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn delete_deploy_policy(
         &self,
         _req: crate::model::DeleteDeployPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -299,9 +293,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_deploy_policies(
         &self,
         _req: crate::model::ListDeployPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDeployPoliciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDeployPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -310,9 +304,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_deploy_policy(
         &self,
         _req: crate::model::GetDeployPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DeployPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::DeployPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -321,9 +315,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn approve_rollout(
         &self,
         _req: crate::model::ApproveRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ApproveRolloutResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ApproveRolloutResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -332,9 +326,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn advance_rollout(
         &self,
         _req: crate::model::AdvanceRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AdvanceRolloutResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AdvanceRolloutResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -343,9 +337,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn cancel_rollout(
         &self,
         _req: crate::model::CancelRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CancelRolloutResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CancelRolloutResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -354,9 +348,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_rollouts(
         &self,
         _req: crate::model::ListRolloutsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRolloutsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRolloutsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -365,10 +359,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_rollout(
         &self,
         _req: crate::model::GetRolloutRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Rollout>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Rollout>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -376,9 +369,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_rollout(
         &self,
         _req: crate::model::CreateRolloutRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -387,9 +380,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn ignore_job(
         &self,
         _req: crate::model::IgnoreJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IgnoreJobResponse>>,
+        Output = crate::Result<crate::Response<crate::model::IgnoreJobResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -398,9 +391,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn retry_job(
         &self,
         _req: crate::model::RetryJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RetryJobResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RetryJobResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,9 +402,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_job_runs(
         &self,
         _req: crate::model::ListJobRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListJobRunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListJobRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -420,10 +413,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_job_run(
         &self,
         _req: crate::model::GetJobRunRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::JobRun>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::JobRun>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -431,9 +423,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn terminate_job_run(
         &self,
         _req: crate::model::TerminateJobRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TerminateJobRunResponse>>,
+        Output = crate::Result<crate::Response<crate::model::TerminateJobRunResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -442,10 +434,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_config(
         &self,
         _req: crate::model::GetConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Config>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Config>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -453,9 +444,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn create_automation(
         &self,
         _req: crate::model::CreateAutomationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -464,9 +455,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn update_automation(
         &self,
         _req: crate::model::UpdateAutomationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -475,9 +466,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn delete_automation(
         &self,
         _req: crate::model::DeleteAutomationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -486,10 +477,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_automation(
         &self,
         _req: crate::model::GetAutomationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Automation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Automation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -497,9 +487,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_automations(
         &self,
         _req: crate::model::ListAutomationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAutomationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAutomationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -508,9 +498,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_automation_run(
         &self,
         _req: crate::model::GetAutomationRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutomationRun>>,
+        Output = crate::Result<crate::Response<crate::model::AutomationRun>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -519,9 +509,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_automation_runs(
         &self,
         _req: crate::model::ListAutomationRunsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAutomationRunsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAutomationRunsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -530,9 +520,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn cancel_automation_run(
         &self,
         _req: crate::model::CancelAutomationRunRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CancelAutomationRunResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CancelAutomationRunResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -541,10 +531,10 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -554,9 +544,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -565,9 +555,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -576,9 +566,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -587,10 +577,10 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -600,10 +590,10 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -613,9 +603,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -624,8 +614,8 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -633,8 +623,8 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -644,9 +634,9 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -655,8 +645,8 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/deploy/v1/src/stub/dynamic.rs b/src/generated/cloud/deploy/v1/src/stub/dynamic.rs
index 4658987963..515dccf711 100644
--- a/src/generated/cloud/deploy/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/deploy/v1/src/stub/dynamic.rs
@@ -20,340 +20,336 @@ pub trait CloudDeploy: std::fmt::Debug + Send + Sync {
     async fn list_delivery_pipelines(
         &self,
         req: crate::model::ListDeliveryPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeliveryPipelinesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeliveryPipelinesResponse>>;
 
     async fn get_delivery_pipeline(
         &self,
         req: crate::model::GetDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeliveryPipeline>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeliveryPipeline>>;
 
     async fn create_delivery_pipeline(
         &self,
         req: crate::model::CreateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_delivery_pipeline(
         &self,
         req: crate::model::UpdateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_delivery_pipeline(
         &self,
         req: crate::model::DeleteDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_targets(
         &self,
         req: crate::model::ListTargetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTargetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTargetsResponse>>;
 
     async fn rollback_target(
         &self,
         req: crate::model::RollbackTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RollbackTargetResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RollbackTargetResponse>>;
 
     async fn get_target(
         &self,
         req: crate::model::GetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Target>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Target>>;
 
     async fn create_target(
         &self,
         req: crate::model::CreateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_target(
         &self,
         req: crate::model::UpdateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_target(
         &self,
         req: crate::model::DeleteTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_custom_target_types(
         &self,
         req: crate::model::ListCustomTargetTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomTargetTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomTargetTypesResponse>>;
 
     async fn get_custom_target_type(
         &self,
         req: crate::model::GetCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CustomTargetType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CustomTargetType>>;
 
     async fn create_custom_target_type(
         &self,
         req: crate::model::CreateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_custom_target_type(
         &self,
         req: crate::model::UpdateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_custom_target_type(
         &self,
         req: crate::model::DeleteCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReleasesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReleasesResponse>>;
 
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Release>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Release>>;
 
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn abandon_release(
         &self,
         req: crate::model::AbandonReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AbandonReleaseResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AbandonReleaseResponse>>;
 
     async fn create_deploy_policy(
         &self,
         req: crate::model::CreateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_deploy_policy(
         &self,
         req: crate::model::UpdateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_deploy_policy(
         &self,
         req: crate::model::DeleteDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_deploy_policies(
         &self,
         req: crate::model::ListDeployPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeployPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeployPoliciesResponse>>;
 
     async fn get_deploy_policy(
         &self,
         req: crate::model::GetDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeployPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeployPolicy>>;
 
     async fn approve_rollout(
         &self,
         req: crate::model::ApproveRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApproveRolloutResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApproveRolloutResponse>>;
 
     async fn advance_rollout(
         &self,
         req: crate::model::AdvanceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AdvanceRolloutResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AdvanceRolloutResponse>>;
 
     async fn cancel_rollout(
         &self,
         req: crate::model::CancelRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CancelRolloutResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CancelRolloutResponse>>;
 
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRolloutsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRolloutsResponse>>;
 
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rollout>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rollout>>;
 
     async fn create_rollout(
         &self,
         req: crate::model::CreateRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn ignore_job(
         &self,
         req: crate::model::IgnoreJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IgnoreJobResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IgnoreJobResponse>>;
 
     async fn retry_job(
         &self,
         req: crate::model::RetryJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetryJobResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetryJobResponse>>;
 
     async fn list_job_runs(
         &self,
         req: crate::model::ListJobRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListJobRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListJobRunsResponse>>;
 
     async fn get_job_run(
         &self,
         req: crate::model::GetJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::JobRun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::JobRun>>;
 
     async fn terminate_job_run(
         &self,
         req: crate::model::TerminateJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TerminateJobRunResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TerminateJobRunResponse>>;
 
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Config>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Config>>;
 
     async fn create_automation(
         &self,
         req: crate::model::CreateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_automation(
         &self,
         req: crate::model::UpdateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_automation(
         &self,
         req: crate::model::DeleteAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_automation(
         &self,
         req: crate::model::GetAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Automation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Automation>>;
 
     async fn list_automations(
         &self,
         req: crate::model::ListAutomationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAutomationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAutomationsResponse>>;
 
     async fn get_automation_run(
         &self,
         req: crate::model::GetAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutomationRun>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutomationRun>>;
 
     async fn list_automation_runs(
         &self,
         req: crate::model::ListAutomationRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAutomationRunsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAutomationRunsResponse>>;
 
     async fn cancel_automation_run(
         &self,
         req: crate::model::CancelAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CancelAutomationRunResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CancelAutomationRunResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CloudDeploy] also implement [CloudDeploy].
@@ -363,8 +359,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_delivery_pipelines(
         &self,
         req: crate::model::ListDeliveryPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeliveryPipelinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeliveryPipelinesResponse>> {
         T::list_delivery_pipelines(self, req, options).await
     }
 
@@ -372,8 +368,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_delivery_pipeline(
         &self,
         req: crate::model::GetDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeliveryPipeline>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeliveryPipeline>> {
         T::get_delivery_pipeline(self, req, options).await
     }
 
@@ -381,8 +377,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_delivery_pipeline(
         &self,
         req: crate::model::CreateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_delivery_pipeline(self, req, options).await
     }
 
@@ -390,8 +386,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn update_delivery_pipeline(
         &self,
         req: crate::model::UpdateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_delivery_pipeline(self, req, options).await
     }
 
@@ -399,8 +395,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn delete_delivery_pipeline(
         &self,
         req: crate::model::DeleteDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_delivery_pipeline(self, req, options).await
     }
 
@@ -408,8 +404,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_targets(
         &self,
         req: crate::model::ListTargetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTargetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTargetsResponse>> {
         T::list_targets(self, req, options).await
     }
 
@@ -417,8 +413,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn rollback_target(
         &self,
         req: crate::model::RollbackTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RollbackTargetResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RollbackTargetResponse>> {
         T::rollback_target(self, req, options).await
     }
 
@@ -426,8 +422,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_target(
         &self,
         req: crate::model::GetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Target>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Target>> {
         T::get_target(self, req, options).await
     }
 
@@ -435,8 +431,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_target(
         &self,
         req: crate::model::CreateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_target(self, req, options).await
     }
 
@@ -444,8 +440,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn update_target(
         &self,
         req: crate::model::UpdateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_target(self, req, options).await
     }
 
@@ -453,8 +449,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn delete_target(
         &self,
         req: crate::model::DeleteTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_target(self, req, options).await
     }
 
@@ -462,8 +458,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_custom_target_types(
         &self,
         req: crate::model::ListCustomTargetTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomTargetTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomTargetTypesResponse>> {
         T::list_custom_target_types(self, req, options).await
     }
 
@@ -471,8 +467,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_custom_target_type(
         &self,
         req: crate::model::GetCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CustomTargetType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CustomTargetType>> {
         T::get_custom_target_type(self, req, options).await
     }
 
@@ -480,8 +476,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_custom_target_type(
         &self,
         req: crate::model::CreateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_custom_target_type(self, req, options).await
     }
 
@@ -489,8 +485,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn update_custom_target_type(
         &self,
         req: crate::model::UpdateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_custom_target_type(self, req, options).await
     }
 
@@ -498,8 +494,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn delete_custom_target_type(
         &self,
         req: crate::model::DeleteCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_custom_target_type(self, req, options).await
     }
 
@@ -507,8 +503,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReleasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReleasesResponse>> {
         T::list_releases(self, req, options).await
     }
 
@@ -516,8 +512,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Release>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Release>> {
         T::get_release(self, req, options).await
     }
 
@@ -525,8 +521,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_release(self, req, options).await
     }
 
@@ -534,8 +530,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn abandon_release(
         &self,
         req: crate::model::AbandonReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AbandonReleaseResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AbandonReleaseResponse>> {
         T::abandon_release(self, req, options).await
     }
 
@@ -543,8 +539,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_deploy_policy(
         &self,
         req: crate::model::CreateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_deploy_policy(self, req, options).await
     }
 
@@ -552,8 +548,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn update_deploy_policy(
         &self,
         req: crate::model::UpdateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_deploy_policy(self, req, options).await
     }
 
@@ -561,8 +557,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn delete_deploy_policy(
         &self,
         req: crate::model::DeleteDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_deploy_policy(self, req, options).await
     }
 
@@ -570,8 +566,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_deploy_policies(
         &self,
         req: crate::model::ListDeployPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeployPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeployPoliciesResponse>> {
         T::list_deploy_policies(self, req, options).await
     }
 
@@ -579,8 +575,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_deploy_policy(
         &self,
         req: crate::model::GetDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeployPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeployPolicy>> {
         T::get_deploy_policy(self, req, options).await
     }
 
@@ -588,8 +584,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn approve_rollout(
         &self,
         req: crate::model::ApproveRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ApproveRolloutResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApproveRolloutResponse>> {
         T::approve_rollout(self, req, options).await
     }
 
@@ -597,8 +593,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn advance_rollout(
         &self,
         req: crate::model::AdvanceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AdvanceRolloutResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AdvanceRolloutResponse>> {
         T::advance_rollout(self, req, options).await
     }
 
@@ -606,8 +602,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn cancel_rollout(
         &self,
         req: crate::model::CancelRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CancelRolloutResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CancelRolloutResponse>> {
         T::cancel_rollout(self, req, options).await
     }
 
@@ -615,8 +611,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRolloutsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRolloutsResponse>> {
         T::list_rollouts(self, req, options).await
     }
 
@@ -624,8 +620,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Rollout>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Rollout>> {
         T::get_rollout(self, req, options).await
     }
 
@@ -633,8 +629,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_rollout(
         &self,
         req: crate::model::CreateRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_rollout(self, req, options).await
     }
 
@@ -642,8 +638,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn ignore_job(
         &self,
         req: crate::model::IgnoreJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IgnoreJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IgnoreJobResponse>> {
         T::ignore_job(self, req, options).await
     }
 
@@ -651,8 +647,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn retry_job(
         &self,
         req: crate::model::RetryJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetryJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetryJobResponse>> {
         T::retry_job(self, req, options).await
     }
 
@@ -660,8 +656,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_job_runs(
         &self,
         req: crate::model::ListJobRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListJobRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListJobRunsResponse>> {
         T::list_job_runs(self, req, options).await
     }
 
@@ -669,8 +665,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_job_run(
         &self,
         req: crate::model::GetJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::JobRun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::JobRun>> {
         T::get_job_run(self, req, options).await
     }
 
@@ -678,8 +674,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn terminate_job_run(
         &self,
         req: crate::model::TerminateJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TerminateJobRunResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TerminateJobRunResponse>> {
         T::terminate_job_run(self, req, options).await
     }
 
@@ -687,8 +683,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Config>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Config>> {
         T::get_config(self, req, options).await
     }
 
@@ -696,8 +692,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn create_automation(
         &self,
         req: crate::model::CreateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_automation(self, req, options).await
     }
 
@@ -705,8 +701,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn update_automation(
         &self,
         req: crate::model::UpdateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_automation(self, req, options).await
     }
 
@@ -714,8 +710,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn delete_automation(
         &self,
         req: crate::model::DeleteAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_automation(self, req, options).await
     }
 
@@ -723,8 +719,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_automation(
         &self,
         req: crate::model::GetAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Automation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Automation>> {
         T::get_automation(self, req, options).await
     }
 
@@ -732,8 +728,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_automations(
         &self,
         req: crate::model::ListAutomationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAutomationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAutomationsResponse>> {
         T::list_automations(self, req, options).await
     }
 
@@ -741,8 +737,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_automation_run(
         &self,
         req: crate::model::GetAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutomationRun>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutomationRun>> {
         T::get_automation_run(self, req, options).await
     }
 
@@ -750,8 +746,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_automation_runs(
         &self,
         req: crate::model::ListAutomationRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAutomationRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAutomationRunsResponse>> {
         T::list_automation_runs(self, req, options).await
     }
 
@@ -759,8 +755,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn cancel_automation_run(
         &self,
         req: crate::model::CancelAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CancelAutomationRunResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CancelAutomationRunResponse>> {
         T::cancel_automation_run(self, req, options).await
     }
 
@@ -768,9 +764,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -778,8 +773,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -787,8 +782,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -796,8 +791,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -805,10 +800,9 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -816,10 +810,9 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -827,8 +820,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -836,8 +829,8 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -845,22 +838,22 @@ impl<T: super::CloudDeploy> CloudDeploy for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/deploy/v1/src/tracing.rs b/src/generated/cloud/deploy/v1/src/tracing.rs
index 21d9a5a292..edc27d4f71 100644
--- a/src/generated/cloud/deploy/v1/src/tracing.rs
+++ b/src/generated/cloud/deploy/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_delivery_pipelines(
         &self,
         req: crate::model::ListDeliveryPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeliveryPipelinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeliveryPipelinesResponse>> {
         self.inner.list_delivery_pipelines(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_delivery_pipeline(
         &self,
         req: crate::model::GetDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeliveryPipeline>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeliveryPipeline>> {
         self.inner.get_delivery_pipeline(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_delivery_pipeline(
         &self,
         req: crate::model::CreateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_delivery_pipeline(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_delivery_pipeline(
         &self,
         req: crate::model::UpdateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_delivery_pipeline(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_delivery_pipeline(
         &self,
         req: crate::model::DeleteDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_delivery_pipeline(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_targets(
         &self,
         req: crate::model::ListTargetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTargetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTargetsResponse>> {
         self.inner.list_targets(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn rollback_target(
         &self,
         req: crate::model::RollbackTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RollbackTargetResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RollbackTargetResponse>> {
         self.inner.rollback_target(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_target(
         &self,
         req: crate::model::GetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Target>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Target>> {
         self.inner.get_target(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn create_target(
         &self,
         req: crate::model::CreateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_target(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn update_target(
         &self,
         req: crate::model::UpdateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_target(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_target(
         &self,
         req: crate::model::DeleteTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_target(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn list_custom_target_types(
         &self,
         req: crate::model::ListCustomTargetTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomTargetTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomTargetTypesResponse>> {
         self.inner.list_custom_target_types(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn get_custom_target_type(
         &self,
         req: crate::model::GetCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CustomTargetType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CustomTargetType>> {
         self.inner.get_custom_target_type(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn create_custom_target_type(
         &self,
         req: crate::model::CreateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_custom_target_type(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn update_custom_target_type(
         &self,
         req: crate::model::UpdateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_custom_target_type(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn delete_custom_target_type(
         &self,
         req: crate::model::DeleteCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_custom_target_type(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReleasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReleasesResponse>> {
         self.inner.list_releases(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Release>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Release>> {
         self.inner.get_release(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_release(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn abandon_release(
         &self,
         req: crate::model::AbandonReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AbandonReleaseResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AbandonReleaseResponse>> {
         self.inner.abandon_release(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn create_deploy_policy(
         &self,
         req: crate::model::CreateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_deploy_policy(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn update_deploy_policy(
         &self,
         req: crate::model::UpdateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_deploy_policy(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn delete_deploy_policy(
         &self,
         req: crate::model::DeleteDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_deploy_policy(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn list_deploy_policies(
         &self,
         req: crate::model::ListDeployPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeployPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeployPoliciesResponse>> {
         self.inner.list_deploy_policies(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn get_deploy_policy(
         &self,
         req: crate::model::GetDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeployPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeployPolicy>> {
         self.inner.get_deploy_policy(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn approve_rollout(
         &self,
         req: crate::model::ApproveRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApproveRolloutResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApproveRolloutResponse>> {
         self.inner.approve_rollout(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn advance_rollout(
         &self,
         req: crate::model::AdvanceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AdvanceRolloutResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AdvanceRolloutResponse>> {
         self.inner.advance_rollout(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn cancel_rollout(
         &self,
         req: crate::model::CancelRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CancelRolloutResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CancelRolloutResponse>> {
         self.inner.cancel_rollout(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRolloutsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRolloutsResponse>> {
         self.inner.list_rollouts(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rollout>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rollout>> {
         self.inner.get_rollout(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn create_rollout(
         &self,
         req: crate::model::CreateRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_rollout(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn ignore_job(
         &self,
         req: crate::model::IgnoreJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IgnoreJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IgnoreJobResponse>> {
         self.inner.ignore_job(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn retry_job(
         &self,
         req: crate::model::RetryJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetryJobResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetryJobResponse>> {
         self.inner.retry_job(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn list_job_runs(
         &self,
         req: crate::model::ListJobRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListJobRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListJobRunsResponse>> {
         self.inner.list_job_runs(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn get_job_run(
         &self,
         req: crate::model::GetJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::JobRun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::JobRun>> {
         self.inner.get_job_run(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn terminate_job_run(
         &self,
         req: crate::model::TerminateJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TerminateJobRunResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TerminateJobRunResponse>> {
         self.inner.terminate_job_run(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Config>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Config>> {
         self.inner.get_config(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn create_automation(
         &self,
         req: crate::model::CreateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_automation(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn update_automation(
         &self,
         req: crate::model::UpdateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_automation(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn delete_automation(
         &self,
         req: crate::model::DeleteAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_automation(req, options).await
     }
 
@@ -401,8 +401,8 @@ where
     async fn get_automation(
         &self,
         req: crate::model::GetAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Automation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Automation>> {
         self.inner.get_automation(req, options).await
     }
 
@@ -410,8 +410,8 @@ where
     async fn list_automations(
         &self,
         req: crate::model::ListAutomationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAutomationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAutomationsResponse>> {
         self.inner.list_automations(req, options).await
     }
 
@@ -419,8 +419,8 @@ where
     async fn get_automation_run(
         &self,
         req: crate::model::GetAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutomationRun>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutomationRun>> {
         self.inner.get_automation_run(req, options).await
     }
 
@@ -428,8 +428,8 @@ where
     async fn list_automation_runs(
         &self,
         req: crate::model::ListAutomationRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAutomationRunsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAutomationRunsResponse>> {
         self.inner.list_automation_runs(req, options).await
     }
 
@@ -437,8 +437,8 @@ where
     async fn cancel_automation_run(
         &self,
         req: crate::model::CancelAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CancelAutomationRunResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CancelAutomationRunResponse>> {
         self.inner.cancel_automation_run(req, options).await
     }
 
@@ -446,8 +446,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -455,8 +455,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -464,8 +464,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -473,8 +473,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -482,9 +482,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -492,9 +491,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -502,8 +500,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -511,8 +509,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -520,22 +518,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/deploy/v1/src/transport.rs b/src/generated/cloud/deploy/v1/src/transport.rs
index c0249db3a4..8ec8d7d550 100644
--- a/src/generated/cloud/deploy/v1/src/transport.rs
+++ b/src/generated/cloud/deploy/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudDeploy](super::stub::CloudDeploy) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudDeploy {
 }
 
 impl CloudDeploy {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_delivery_pipelines(
         &self,
         req: crate::model::ListDeliveryPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeliveryPipelinesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeliveryPipelinesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_delivery_pipeline(
         &self,
         req: crate::model::GetDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeliveryPipeline>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeliveryPipeline>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_delivery_pipeline(
         &self,
         req: crate::model::CreateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn update_delivery_pipeline(
         &self,
         req: crate::model::UpdateDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -302,9 +302,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -319,13 +319,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn delete_delivery_pipeline(
         &self,
         req: crate::model::DeleteDeliveryPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -371,9 +371,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -388,13 +388,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_targets(
         &self,
         req: crate::model::ListTargetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTargetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTargetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -435,9 +435,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -452,13 +452,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn rollback_target(
         &self,
         req: crate::model::RollbackTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RollbackTargetResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RollbackTargetResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -499,9 +499,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -516,13 +516,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_target(
         &self,
         req: crate::model::GetTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Target>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Target>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -563,9 +563,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -580,13 +580,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_target(
         &self,
         req: crate::model::CreateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -626,9 +626,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -643,13 +643,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn update_target(
         &self,
         req: crate::model::UpdateTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -711,9 +711,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -728,13 +728,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn delete_target(
         &self,
         req: crate::model::DeleteTargetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -779,9 +779,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -796,13 +796,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_custom_target_types(
         &self,
         req: crate::model::ListCustomTargetTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomTargetTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomTargetTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -843,9 +843,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -860,13 +860,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_custom_target_type(
         &self,
         req: crate::model::GetCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CustomTargetType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CustomTargetType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -907,9 +907,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -924,13 +924,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_custom_target_type(
         &self,
         req: crate::model::CreateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -970,9 +970,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -987,13 +987,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn update_custom_target_type(
         &self,
         req: crate::model::UpdateCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1055,9 +1055,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1072,13 +1072,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn delete_custom_target_type(
         &self,
         req: crate::model::DeleteCustomTargetTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1123,9 +1123,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1140,13 +1140,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_releases(
         &self,
         req: crate::model::ListReleasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReleasesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReleasesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1191,9 +1191,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1208,13 +1208,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_release(
         &self,
         req: crate::model::GetReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Release>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Release>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1259,9 +1259,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1276,13 +1276,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_release(
         &self,
         req: crate::model::CreateReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1332,9 +1332,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1349,13 +1349,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn abandon_release(
         &self,
         req: crate::model::AbandonReleaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AbandonReleaseResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AbandonReleaseResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1400,9 +1400,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1417,13 +1417,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_deploy_policy(
         &self,
         req: crate::model::CreateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1463,9 +1463,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1480,13 +1480,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn update_deploy_policy(
         &self,
         req: crate::model::UpdateDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1548,9 +1548,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1565,13 +1565,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn delete_deploy_policy(
         &self,
         req: crate::model::DeleteDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1616,9 +1616,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1633,13 +1633,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_deploy_policies(
         &self,
         req: crate::model::ListDeployPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeployPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeployPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1680,9 +1680,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1697,13 +1697,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_deploy_policy(
         &self,
         req: crate::model::GetDeployPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeployPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeployPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1744,9 +1744,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1761,13 +1761,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn approve_rollout(
         &self,
         req: crate::model::ApproveRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApproveRolloutResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApproveRolloutResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1816,9 +1816,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1833,13 +1833,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn advance_rollout(
         &self,
         req: crate::model::AdvanceRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AdvanceRolloutResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AdvanceRolloutResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1888,9 +1888,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1905,13 +1905,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn cancel_rollout(
         &self,
         req: crate::model::CancelRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CancelRolloutResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CancelRolloutResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1960,9 +1960,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1977,13 +1977,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_rollouts(
         &self,
         req: crate::model::ListRolloutsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRolloutsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRolloutsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2032,9 +2032,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2049,13 +2049,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_rollout(
         &self,
         req: crate::model::GetRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Rollout>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Rollout>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2104,9 +2104,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2121,13 +2121,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_rollout(
         &self,
         req: crate::model::CreateRolloutRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2182,9 +2182,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2199,13 +2199,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn ignore_job(
         &self,
         req: crate::model::IgnoreJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IgnoreJobResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IgnoreJobResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2254,9 +2254,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2271,13 +2271,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn retry_job(
         &self,
         req: crate::model::RetryJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetryJobResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetryJobResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2326,9 +2326,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2343,13 +2343,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_job_runs(
         &self,
         req: crate::model::ListJobRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListJobRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListJobRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2402,9 +2402,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2419,13 +2419,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_job_run(
         &self,
         req: crate::model::GetJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::JobRun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::JobRun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -2448,9 +2448,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     "projects/*/locations/*/deliveryPipelines/*/releases/*/rollouts/*/jobRuns/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2465,13 +2465,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn terminate_job_run(
         &self,
         req: crate::model::TerminateJobRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TerminateJobRunResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TerminateJobRunResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -2494,9 +2494,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     "projects/*/locations/*/deliveryPipelines/*/releases/*/rollouts/*/jobRuns/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2511,13 +2511,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_config(
         &self,
         req: crate::model::GetConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Config>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Config>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2556,9 +2556,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2573,13 +2573,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn create_automation(
         &self,
         req: crate::model::CreateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2623,9 +2623,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2640,13 +2640,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn update_automation(
         &self,
         req: crate::model::UpdateAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2712,9 +2712,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2729,13 +2729,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn delete_automation(
         &self,
         req: crate::model::DeleteAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2784,9 +2784,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2801,13 +2801,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_automation(
         &self,
         req: crate::model::GetAutomationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Automation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Automation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2852,9 +2852,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2869,13 +2869,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_automations(
         &self,
         req: crate::model::ListAutomationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAutomationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAutomationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2920,9 +2920,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2937,13 +2937,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_automation_run(
         &self,
         req: crate::model::GetAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutomationRun>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutomationRun>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2988,9 +2988,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3005,13 +3005,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_automation_runs(
         &self,
         req: crate::model::ListAutomationRunsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAutomationRunsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAutomationRunsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3056,9 +3056,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3073,13 +3073,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn cancel_automation_run(
         &self,
         req: crate::model::CancelAutomationRunRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CancelAutomationRunResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CancelAutomationRunResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3124,9 +3124,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3141,13 +3141,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3177,9 +3177,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3194,13 +3194,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3237,9 +3237,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3254,13 +3254,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3412,9 +3412,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3429,13 +3429,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3635,9 +3635,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3652,14 +3652,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3737,9 +3736,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3754,14 +3753,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3803,9 +3801,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3820,13 +3818,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3867,9 +3865,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3884,13 +3882,13 @@ impl super::stub::CloudDeploy for CloudDeploy {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3931,9 +3929,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3942,24 +3940,25 @@ impl super::stub::CloudDeploy for CloudDeploy {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4000,9 +3999,9 @@ impl super::stub::CloudDeploy for CloudDeploy {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4011,25 +4010,26 @@ impl super::stub::CloudDeploy for CloudDeploy {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/developerconnect/v1/Cargo.toml b/src/generated/cloud/developerconnect/v1/Cargo.toml
index 9f4b8e91b8..9fc3eed3a2 100644
--- a/src/generated/cloud/developerconnect/v1/Cargo.toml
+++ b/src/generated/cloud/developerconnect/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/developerconnect/v1/src/builder.rs b/src/generated/cloud/developerconnect/v1/src/builder.rs
index 6827220237..5f4103f188 100644
--- a/src/generated/cloud/developerconnect/v1/src/builder.rs
+++ b/src/generated/cloud/developerconnect/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod developer_connect {
     /// A builder for [DeveloperConnect][crate::client::DeveloperConnect].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_developerconnect_v1::*;
     /// # use builder::developer_connect::ClientBuilder;
     /// # use client::DeveloperConnect;
@@ -30,19 +30,18 @@ pub mod developer_connect {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DeveloperConnect;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DeveloperConnect;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod developer_connect {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DeveloperConnect>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod developer_connect {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::ListConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,14 +117,16 @@ pub mod developer_connect {
             (*self.0.stub)
                 .list_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -133,15 +134,17 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConnectionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConnectionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +182,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +193,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::GetConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +221,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +231,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .get_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectionRequest::name].
@@ -241,8 +244,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +255,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::CreateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -284,7 +287,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -299,7 +302,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .create_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_connection`.
@@ -316,7 +319,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -395,8 +398,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -406,7 +409,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::UpdateConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -438,7 +441,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -453,7 +456,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .update_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_connection`.
@@ -470,7 +473,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -561,8 +564,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -572,7 +575,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::DeleteConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -604,7 +607,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -619,7 +622,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .delete_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_connection`.
@@ -631,7 +634,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -686,8 +689,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -697,7 +700,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::CreateGitRepositoryLink;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -731,7 +734,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -746,7 +749,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .create_git_repository_link(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_git_repository_link`.
@@ -765,7 +768,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -844,8 +847,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGitRepositoryLink {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGitRepositoryLink {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -855,7 +858,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::DeleteGitRepositoryLink;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -889,7 +892,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -904,7 +907,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .delete_git_repository_link(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_git_repository_link`.
@@ -916,7 +919,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -971,8 +974,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGitRepositoryLink {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGitRepositoryLink {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -982,8 +985,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::ListGitRepositoryLinks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1017,7 +1020,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1027,15 +1030,15 @@ pub mod developer_connect {
             (*self.0.stub)
                 .list_git_repository_links(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListGitRepositoryLinksResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1044,17 +1047,17 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListGitRepositoryLinksResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1092,8 +1095,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGitRepositoryLinks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGitRepositoryLinks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1103,7 +1106,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::GetGitRepositoryLink;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1134,7 +1137,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1144,7 +1147,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .get_git_repository_link(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGitRepositoryLinkRequest::name].
@@ -1157,8 +1160,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGitRepositoryLink {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGitRepositoryLink {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1168,7 +1171,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchReadWriteToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1199,7 +1202,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1209,7 +1212,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_read_write_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [git_repository_link][crate::model::FetchReadWriteTokenRequest::git_repository_link].
@@ -1222,8 +1225,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchReadWriteToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchReadWriteToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1233,7 +1236,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchReadToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1261,7 +1264,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1271,7 +1274,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_read_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [git_repository_link][crate::model::FetchReadTokenRequest::git_repository_link].
@@ -1284,8 +1287,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchReadToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchReadToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1295,8 +1298,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchLinkableGitRepositories;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1332,7 +1335,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1342,15 +1345,15 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_linkable_git_repositories(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchLinkableGitRepositoriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1359,17 +1362,17 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchLinkableGitRepositoriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1395,8 +1398,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchLinkableGitRepositories {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchLinkableGitRepositories {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1406,7 +1409,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchGitHubInstallations;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1439,7 +1442,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1449,7 +1452,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_git_hub_installations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [connection][crate::model::FetchGitHubInstallationsRequest::connection].
@@ -1462,8 +1465,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchGitHubInstallations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchGitHubInstallations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1473,7 +1476,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchGitRefs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1501,7 +1504,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1511,7 +1514,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_git_refs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [git_repository_link][crate::model::FetchGitRefsRequest::git_repository_link].
@@ -1547,8 +1550,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchGitRefs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchGitRefs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1558,8 +1561,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::ListAccountConnectors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1593,7 +1596,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1603,14 +1606,16 @@ pub mod developer_connect {
             (*self.0.stub)
                 .list_account_connectors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAccountConnectorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAccountConnectorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1618,17 +1623,17 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAccountConnectorsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1666,8 +1671,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAccountConnectors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAccountConnectors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1677,7 +1682,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::GetAccountConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1708,7 +1713,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1718,7 +1723,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .get_account_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAccountConnectorRequest::name].
@@ -1731,8 +1736,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAccountConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAccountConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1742,7 +1747,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::CreateAccountConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1774,7 +1779,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1789,7 +1794,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .create_account_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_account_connector`.
@@ -1806,7 +1811,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1885,8 +1890,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAccountConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAccountConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1896,7 +1901,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::UpdateAccountConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1928,7 +1933,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1943,7 +1948,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .update_account_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_account_connector`.
@@ -1960,7 +1965,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2047,8 +2052,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAccountConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAccountConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2058,7 +2063,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::DeleteAccountConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2090,7 +2095,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2105,7 +2110,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .delete_account_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_account_connector`.
@@ -2117,7 +2122,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2178,8 +2183,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAccountConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAccountConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2189,7 +2194,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchAccessToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2220,7 +2225,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2230,7 +2235,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_access_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [account_connector][crate::model::FetchAccessTokenRequest::account_connector].
@@ -2243,8 +2248,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchAccessToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchAccessToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2254,8 +2259,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::ListUsers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2286,7 +2291,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2296,13 +2301,13 @@ pub mod developer_connect {
             (*self.0.stub)
                 .list_users(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListUsersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListUsersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2311,15 +2316,15 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListUsersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListUsersResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2357,8 +2362,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListUsers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListUsers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2368,7 +2373,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::DeleteUser;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2397,7 +2402,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2412,7 +2417,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .delete_user(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_user`.
@@ -2424,7 +2429,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2479,8 +2484,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteUser {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteUser {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2490,7 +2495,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::FetchSelf;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2518,7 +2523,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2528,7 +2533,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .fetch_self(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::FetchSelfRequest::name].
@@ -2541,8 +2546,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchSelf {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchSelf {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2552,7 +2557,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::DeleteSelf;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2581,7 +2586,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2596,7 +2601,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .delete_self(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_self`.
@@ -2608,7 +2613,7 @@ pub mod developer_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2645,8 +2650,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSelf {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSelf {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2656,8 +2661,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2691,7 +2696,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2701,15 +2706,15 @@ pub mod developer_connect {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2718,17 +2723,17 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2758,8 +2763,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2769,7 +2774,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2800,7 +2805,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2810,7 +2815,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2821,8 +2826,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2832,8 +2837,8 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2869,7 +2874,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2879,15 +2884,15 @@ pub mod developer_connect {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2896,17 +2901,17 @@ pub mod developer_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2942,8 +2947,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2953,7 +2958,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2984,7 +2989,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2994,7 +2999,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3005,8 +3010,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3016,7 +3021,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3049,7 +3054,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3059,7 +3064,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3070,8 +3075,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3081,7 +3086,7 @@ pub mod developer_connect {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::developer_connect::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3114,7 +3119,7 @@ pub mod developer_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3124,7 +3129,7 @@ pub mod developer_connect {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3135,8 +3140,8 @@ pub mod developer_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3148,7 +3153,7 @@ pub mod insights_config_service {
     /// A builder for [InsightsConfigService][crate::client::InsightsConfigService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_developerconnect_v1::*;
     /// # use builder::insights_config_service::ClientBuilder;
     /// # use client::InsightsConfigService;
@@ -3158,19 +3163,18 @@ pub mod insights_config_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InsightsConfigService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InsightsConfigService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3181,7 +3185,7 @@ pub mod insights_config_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InsightsConfigService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3194,7 +3198,7 @@ pub mod insights_config_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3204,8 +3208,8 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::ListInsightsConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3239,7 +3243,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3249,14 +3253,16 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .list_insights_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInsightsConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListInsightsConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3264,17 +3270,17 @@ pub mod insights_config_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListInsightsConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3312,8 +3318,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInsightsConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInsightsConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3323,7 +3329,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::CreateInsightsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3355,7 +3361,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3370,7 +3376,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .create_insights_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_insights_config`.
@@ -3387,7 +3393,7 @@ pub mod insights_config_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3460,8 +3466,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInsightsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInsightsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3471,7 +3477,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::GetInsightsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3502,7 +3508,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3512,7 +3518,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .get_insights_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInsightsConfigRequest::name].
@@ -3525,8 +3531,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInsightsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInsightsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3536,7 +3542,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::UpdateInsightsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3568,7 +3574,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3583,7 +3589,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .update_insights_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_insights_config`.
@@ -3600,7 +3606,7 @@ pub mod insights_config_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3669,8 +3675,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInsightsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInsightsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3680,7 +3686,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::DeleteInsightsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3712,7 +3718,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3727,7 +3733,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .delete_insights_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_insights_config`.
@@ -3739,7 +3745,7 @@ pub mod insights_config_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3794,8 +3800,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInsightsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInsightsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3805,8 +3811,8 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3840,7 +3846,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3850,15 +3856,15 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3867,17 +3873,17 @@ pub mod insights_config_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3907,8 +3913,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3918,7 +3924,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3949,7 +3955,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3959,7 +3965,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3970,8 +3976,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3981,8 +3987,8 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4018,7 +4024,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4028,15 +4034,15 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4045,17 +4051,17 @@ pub mod insights_config_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4091,8 +4097,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4102,7 +4108,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4133,7 +4139,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4143,7 +4149,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4154,8 +4160,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4165,7 +4171,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4198,7 +4204,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4208,7 +4214,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4219,8 +4225,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4230,7 +4236,7 @@ pub mod insights_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_developerconnect_v1::builder::insights_config_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_developerconnect_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4263,7 +4269,7 @@ pub mod insights_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4273,7 +4279,7 @@ pub mod insights_config_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4284,8 +4290,8 @@ pub mod insights_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/developerconnect/v1/src/client.rs b/src/generated/cloud/developerconnect/v1/src/client.rs
index 815629d7f8..ea64ed2921 100644
--- a/src/generated/cloud/developerconnect/v1/src/client.rs
+++ b/src/generated/cloud/developerconnect/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_developerconnect_v1::client::DeveloperConnect;
 /// let client = DeveloperConnect::builder().build().await?;
 /// // use `client` to make requests to the Developer Connect API.
@@ -66,15 +66,13 @@ impl DeveloperConnect {
     /// Returns a builder for [DeveloperConnect].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_developerconnect_v1::client::DeveloperConnect;
     /// let client = DeveloperConnect::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::developer_connect::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::developer_connect::client::Factory,
-        )
+        crate::new_client_builder(super::builder::developer_connect::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl DeveloperConnect {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DeveloperConnect>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DeveloperConnect>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl DeveloperConnect {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DeveloperConnect> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DeveloperConnect> {
         super::transport::DeveloperConnect::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DeveloperConnect> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DeveloperConnect> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DeveloperConnect::new)
@@ -412,7 +410,7 @@ impl DeveloperConnect {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_developerconnect_v1::client::InsightsConfigService;
 /// let client = InsightsConfigService::builder().build().await?;
 /// // use `client` to make requests to the Developer Connect API.
@@ -466,15 +464,13 @@ impl InsightsConfigService {
     /// Returns a builder for [InsightsConfigService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_developerconnect_v1::client::InsightsConfigService;
     /// let client = InsightsConfigService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::insights_config_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::insights_config_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::insights_config_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -492,14 +488,14 @@ impl InsightsConfigService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InsightsConfigService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InsightsConfigService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -509,13 +505,13 @@ impl InsightsConfigService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InsightsConfigService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InsightsConfigService> {
         super::transport::InsightsConfigService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InsightsConfigService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InsightsConfigService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InsightsConfigService::new)
diff --git a/src/generated/cloud/developerconnect/v1/src/lib.rs b/src/generated/cloud/developerconnect/v1/src/lib.rs
index 7a0d07d342..64af0673ab 100644
--- a/src/generated/cloud/developerconnect/v1/src/lib.rs
+++ b/src/generated/cloud/developerconnect/v1/src/lib.rs
@@ -45,8 +45,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -81,3 +81,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/developerconnect/v1/src/model.rs b/src/generated/cloud/developerconnect/v1/src/model.rs
index c78e8155d0..8d03268caa 100644
--- a/src/generated/cloud/developerconnect/v1/src/model.rs
+++ b/src/generated/cloud/developerconnect/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -212,7 +212,7 @@ impl wkt::message::Message for ListUsersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListUsersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListUsersResponse {
     type PageItem = crate::model::User;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2648,7 +2648,7 @@ impl wkt::message::Message for ListConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectionsResponse {
     type PageItem = crate::model::Connection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3248,7 +3248,7 @@ impl wkt::message::Message for ListAccountConnectorsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAccountConnectorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAccountConnectorsResponse {
     type PageItem = crate::model::AccountConnector;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4925,7 +4925,7 @@ impl wkt::message::Message for ListGitRepositoryLinksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGitRepositoryLinksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGitRepositoryLinksResponse {
     type PageItem = crate::model::GitRepositoryLink;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5347,7 +5347,9 @@ impl wkt::message::Message for FetchLinkableGitRepositoriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FetchLinkableGitRepositoriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for FetchLinkableGitRepositoriesResponse
+{
     type PageItem = crate::model::LinkableGitRepository;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7900,7 +7902,7 @@ impl wkt::message::Message for ListInsightsConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInsightsConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInsightsConfigsResponse {
     type PageItem = crate::model::InsightsConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/developerconnect/v1/src/stub.rs b/src/generated/cloud/developerconnect/v1/src/stub.rs
index d30f269c71..baa08ccde0 100644
--- a/src/generated/cloud/developerconnect/v1/src/stub.rs
+++ b/src/generated/cloud/developerconnect/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn list_connections(
         &self,
         _req: crate::model::ListConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn get_connection(
         &self,
         _req: crate::model::GetConnectionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connection>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connection>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn create_connection(
         &self,
         _req: crate::model::CreateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn update_connection(
         &self,
         _req: crate::model::UpdateConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn delete_connection(
         &self,
         _req: crate::model::DeleteConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn create_git_repository_link(
         &self,
         _req: crate::model::CreateGitRepositoryLinkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn delete_git_repository_link(
         &self,
         _req: crate::model::DeleteGitRepositoryLinkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,11 +118,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn list_git_repository_links(
         &self,
         _req: crate::model::ListGitRepositoryLinksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListGitRepositoryLinksResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListGitRepositoryLinksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,9 +129,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn get_git_repository_link(
         &self,
         _req: crate::model::GetGitRepositoryLinkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GitRepositoryLink>>,
+        Output = crate::Result<crate::Response<crate::model::GitRepositoryLink>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,9 +140,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_read_write_token(
         &self,
         _req: crate::model::FetchReadWriteTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchReadWriteTokenResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchReadWriteTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,9 +151,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_read_token(
         &self,
         _req: crate::model::FetchReadTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchReadTokenResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchReadTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,11 +162,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_linkable_git_repositories(
         &self,
         _req: crate::model::FetchLinkableGitRepositoriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchLinkableGitRepositoriesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchLinkableGitRepositoriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,11 +173,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_git_hub_installations(
         &self,
         _req: crate::model::FetchGitHubInstallationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchGitHubInstallationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchGitHubInstallationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -191,9 +184,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_git_refs(
         &self,
         _req: crate::model::FetchGitRefsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchGitRefsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchGitRefsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -202,11 +195,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn list_account_connectors(
         &self,
         _req: crate::model::ListAccountConnectorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListAccountConnectorsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListAccountConnectorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -215,9 +206,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn get_account_connector(
         &self,
         _req: crate::model::GetAccountConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AccountConnector>>,
+        Output = crate::Result<crate::Response<crate::model::AccountConnector>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -226,9 +217,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn create_account_connector(
         &self,
         _req: crate::model::CreateAccountConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -237,9 +228,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn update_account_connector(
         &self,
         _req: crate::model::UpdateAccountConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -248,9 +239,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn delete_account_connector(
         &self,
         _req: crate::model::DeleteAccountConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -259,9 +250,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_access_token(
         &self,
         _req: crate::model::FetchAccessTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchAccessTokenResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchAccessTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -270,9 +261,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn list_users(
         &self,
         _req: crate::model::ListUsersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListUsersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListUsersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -281,9 +272,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn delete_user(
         &self,
         _req: crate::model::DeleteUserRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -292,10 +283,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn fetch_self(
         &self,
         _req: crate::model::FetchSelfRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::User>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::User>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -303,9 +293,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn delete_self(
         &self,
         _req: crate::model::DeleteSelfRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -314,10 +304,10 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -327,9 +317,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -338,10 +328,10 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -351,9 +341,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -362,8 +352,8 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -371,8 +361,8 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -382,9 +372,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -393,9 +383,9 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -415,9 +405,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn list_insights_configs(
         &self,
         _req: crate::model::ListInsightsConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInsightsConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInsightsConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -426,9 +416,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn create_insights_config(
         &self,
         _req: crate::model::CreateInsightsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -437,9 +427,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn get_insights_config(
         &self,
         _req: crate::model::GetInsightsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InsightsConfig>>,
+        Output = crate::Result<crate::Response<crate::model::InsightsConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -448,9 +438,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn update_insights_config(
         &self,
         _req: crate::model::UpdateInsightsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -459,9 +449,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn delete_insights_config(
         &self,
         _req: crate::model::DeleteInsightsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -470,10 +460,10 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -483,9 +473,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -494,10 +484,10 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -507,9 +497,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -518,8 +508,8 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -527,8 +517,8 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -538,9 +528,9 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -549,8 +539,8 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/developerconnect/v1/src/stub/dynamic.rs b/src/generated/cloud/developerconnect/v1/src/stub/dynamic.rs
index 4fb559c49c..0b03f02522 100644
--- a/src/generated/cloud/developerconnect/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/developerconnect/v1/src/stub/dynamic.rs
@@ -20,194 +20,192 @@ pub trait DeveloperConnect: std::fmt::Debug + Send + Sync {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>>;
 
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>>;
 
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_git_repository_link(
         &self,
         req: crate::model::CreateGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_git_repository_link(
         &self,
         req: crate::model::DeleteGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_git_repository_links(
         &self,
         req: crate::model::ListGitRepositoryLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGitRepositoryLinksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGitRepositoryLinksResponse>>;
 
     async fn get_git_repository_link(
         &self,
         req: crate::model::GetGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GitRepositoryLink>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GitRepositoryLink>>;
 
     async fn fetch_read_write_token(
         &self,
         req: crate::model::FetchReadWriteTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchReadWriteTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchReadWriteTokenResponse>>;
 
     async fn fetch_read_token(
         &self,
         req: crate::model::FetchReadTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchReadTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchReadTokenResponse>>;
 
     async fn fetch_linkable_git_repositories(
         &self,
         req: crate::model::FetchLinkableGitRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchLinkableGitRepositoriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchLinkableGitRepositoriesResponse>>;
 
     async fn fetch_git_hub_installations(
         &self,
         req: crate::model::FetchGitHubInstallationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchGitHubInstallationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchGitHubInstallationsResponse>>;
 
     async fn fetch_git_refs(
         &self,
         req: crate::model::FetchGitRefsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchGitRefsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchGitRefsResponse>>;
 
     async fn list_account_connectors(
         &self,
         req: crate::model::ListAccountConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAccountConnectorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAccountConnectorsResponse>>;
 
     async fn get_account_connector(
         &self,
         req: crate::model::GetAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccountConnector>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccountConnector>>;
 
     async fn create_account_connector(
         &self,
         req: crate::model::CreateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_account_connector(
         &self,
         req: crate::model::UpdateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_account_connector(
         &self,
         req: crate::model::DeleteAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn fetch_access_token(
         &self,
         req: crate::model::FetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchAccessTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchAccessTokenResponse>>;
 
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListUsersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListUsersResponse>>;
 
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn fetch_self(
         &self,
         req: crate::model::FetchSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>>;
 
     async fn delete_self(
         &self,
         req: crate::model::DeleteSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DeveloperConnect] also implement [DeveloperConnect].
@@ -217,8 +215,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectionsResponse>> {
         T::list_connections(self, req, options).await
     }
 
@@ -226,8 +224,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connection>> {
         T::get_connection(self, req, options).await
     }
 
@@ -235,8 +233,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_connection(self, req, options).await
     }
 
@@ -244,8 +242,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_connection(self, req, options).await
     }
 
@@ -253,8 +251,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_connection(self, req, options).await
     }
 
@@ -262,8 +260,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn create_git_repository_link(
         &self,
         req: crate::model::CreateGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_git_repository_link(self, req, options).await
     }
 
@@ -271,8 +269,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn delete_git_repository_link(
         &self,
         req: crate::model::DeleteGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_git_repository_link(self, req, options).await
     }
 
@@ -280,8 +278,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn list_git_repository_links(
         &self,
         req: crate::model::ListGitRepositoryLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGitRepositoryLinksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGitRepositoryLinksResponse>> {
         T::list_git_repository_links(self, req, options).await
     }
 
@@ -289,8 +287,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn get_git_repository_link(
         &self,
         req: crate::model::GetGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GitRepositoryLink>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GitRepositoryLink>> {
         T::get_git_repository_link(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_read_write_token(
         &self,
         req: crate::model::FetchReadWriteTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchReadWriteTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchReadWriteTokenResponse>> {
         T::fetch_read_write_token(self, req, options).await
     }
 
@@ -307,8 +305,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_read_token(
         &self,
         req: crate::model::FetchReadTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchReadTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchReadTokenResponse>> {
         T::fetch_read_token(self, req, options).await
     }
 
@@ -316,9 +314,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_linkable_git_repositories(
         &self,
         req: crate::model::FetchLinkableGitRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchLinkableGitRepositoriesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchLinkableGitRepositoriesResponse>> {
         T::fetch_linkable_git_repositories(self, req, options).await
     }
 
@@ -326,9 +323,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_git_hub_installations(
         &self,
         req: crate::model::FetchGitHubInstallationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchGitHubInstallationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchGitHubInstallationsResponse>> {
         T::fetch_git_hub_installations(self, req, options).await
     }
 
@@ -336,8 +332,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_git_refs(
         &self,
         req: crate::model::FetchGitRefsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchGitRefsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchGitRefsResponse>> {
         T::fetch_git_refs(self, req, options).await
     }
 
@@ -345,8 +341,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn list_account_connectors(
         &self,
         req: crate::model::ListAccountConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAccountConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAccountConnectorsResponse>> {
         T::list_account_connectors(self, req, options).await
     }
 
@@ -354,8 +350,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn get_account_connector(
         &self,
         req: crate::model::GetAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AccountConnector>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AccountConnector>> {
         T::get_account_connector(self, req, options).await
     }
 
@@ -363,8 +359,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn create_account_connector(
         &self,
         req: crate::model::CreateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_account_connector(self, req, options).await
     }
 
@@ -372,8 +368,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn update_account_connector(
         &self,
         req: crate::model::UpdateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_account_connector(self, req, options).await
     }
 
@@ -381,8 +377,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn delete_account_connector(
         &self,
         req: crate::model::DeleteAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_account_connector(self, req, options).await
     }
 
@@ -390,8 +386,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_access_token(
         &self,
         req: crate::model::FetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchAccessTokenResponse>> {
         T::fetch_access_token(self, req, options).await
     }
 
@@ -399,8 +395,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListUsersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListUsersResponse>> {
         T::list_users(self, req, options).await
     }
 
@@ -408,8 +404,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_user(self, req, options).await
     }
 
@@ -417,8 +413,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn fetch_self(
         &self,
         req: crate::model::FetchSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::User>> {
         T::fetch_self(self, req, options).await
     }
 
@@ -426,8 +422,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn delete_self(
         &self,
         req: crate::model::DeleteSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_self(self, req, options).await
     }
 
@@ -435,9 +431,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -445,8 +440,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -454,10 +449,9 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -465,8 +459,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -474,8 +468,8 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -483,22 +477,22 @@ impl<T: super::DeveloperConnect> DeveloperConnect for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -509,80 +503,78 @@ pub trait InsightsConfigService: std::fmt::Debug + Send + Sync {
     async fn list_insights_configs(
         &self,
         req: crate::model::ListInsightsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInsightsConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInsightsConfigsResponse>>;
 
     async fn create_insights_config(
         &self,
         req: crate::model::CreateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_insights_config(
         &self,
         req: crate::model::GetInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InsightsConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InsightsConfig>>;
 
     async fn update_insights_config(
         &self,
         req: crate::model::UpdateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_insights_config(
         &self,
         req: crate::model::DeleteInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InsightsConfigService] also implement [InsightsConfigService].
@@ -592,8 +584,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn list_insights_configs(
         &self,
         req: crate::model::ListInsightsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInsightsConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInsightsConfigsResponse>> {
         T::list_insights_configs(self, req, options).await
     }
 
@@ -601,8 +593,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn create_insights_config(
         &self,
         req: crate::model::CreateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_insights_config(self, req, options).await
     }
 
@@ -610,8 +602,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn get_insights_config(
         &self,
         req: crate::model::GetInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InsightsConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InsightsConfig>> {
         T::get_insights_config(self, req, options).await
     }
 
@@ -619,8 +611,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn update_insights_config(
         &self,
         req: crate::model::UpdateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_insights_config(self, req, options).await
     }
 
@@ -628,8 +620,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn delete_insights_config(
         &self,
         req: crate::model::DeleteInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_insights_config(self, req, options).await
     }
 
@@ -637,9 +629,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -647,8 +638,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -656,10 +647,9 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -667,8 +657,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -676,8 +666,8 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -685,22 +675,22 @@ impl<T: super::InsightsConfigService> InsightsConfigService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/developerconnect/v1/src/tracing.rs b/src/generated/cloud/developerconnect/v1/src/tracing.rs
index 4b8556e02e..dfaccfa062 100644
--- a/src/generated/cloud/developerconnect/v1/src/tracing.rs
+++ b/src/generated/cloud/developerconnect/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         self.inner.list_connections(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         self.inner.get_connection(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_connection(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_connection(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_connection(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn create_git_repository_link(
         &self,
         req: crate::model::CreateGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_git_repository_link(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn delete_git_repository_link(
         &self,
         req: crate::model::DeleteGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_git_repository_link(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_git_repository_links(
         &self,
         req: crate::model::ListGitRepositoryLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGitRepositoryLinksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGitRepositoryLinksResponse>> {
         self.inner.list_git_repository_links(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_git_repository_link(
         &self,
         req: crate::model::GetGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GitRepositoryLink>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GitRepositoryLink>> {
         self.inner.get_git_repository_link(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn fetch_read_write_token(
         &self,
         req: crate::model::FetchReadWriteTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchReadWriteTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchReadWriteTokenResponse>> {
         self.inner.fetch_read_write_token(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn fetch_read_token(
         &self,
         req: crate::model::FetchReadTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchReadTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchReadTokenResponse>> {
         self.inner.fetch_read_token(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn fetch_linkable_git_repositories(
         &self,
         req: crate::model::FetchLinkableGitRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchLinkableGitRepositoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchLinkableGitRepositoriesResponse>> {
         self.inner
             .fetch_linkable_git_repositories(req, options)
             .await
@@ -151,8 +151,8 @@ where
     async fn fetch_git_hub_installations(
         &self,
         req: crate::model::FetchGitHubInstallationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchGitHubInstallationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchGitHubInstallationsResponse>> {
         self.inner.fetch_git_hub_installations(req, options).await
     }
 
@@ -160,8 +160,8 @@ where
     async fn fetch_git_refs(
         &self,
         req: crate::model::FetchGitRefsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchGitRefsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchGitRefsResponse>> {
         self.inner.fetch_git_refs(req, options).await
     }
 
@@ -169,8 +169,8 @@ where
     async fn list_account_connectors(
         &self,
         req: crate::model::ListAccountConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAccountConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAccountConnectorsResponse>> {
         self.inner.list_account_connectors(req, options).await
     }
 
@@ -178,8 +178,8 @@ where
     async fn get_account_connector(
         &self,
         req: crate::model::GetAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccountConnector>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccountConnector>> {
         self.inner.get_account_connector(req, options).await
     }
 
@@ -187,8 +187,8 @@ where
     async fn create_account_connector(
         &self,
         req: crate::model::CreateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_account_connector(req, options).await
     }
 
@@ -196,8 +196,8 @@ where
     async fn update_account_connector(
         &self,
         req: crate::model::UpdateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_account_connector(req, options).await
     }
 
@@ -205,8 +205,8 @@ where
     async fn delete_account_connector(
         &self,
         req: crate::model::DeleteAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_account_connector(req, options).await
     }
 
@@ -214,8 +214,8 @@ where
     async fn fetch_access_token(
         &self,
         req: crate::model::FetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchAccessTokenResponse>> {
         self.inner.fetch_access_token(req, options).await
     }
 
@@ -223,8 +223,8 @@ where
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListUsersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListUsersResponse>> {
         self.inner.list_users(req, options).await
     }
 
@@ -232,8 +232,8 @@ where
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_user(req, options).await
     }
 
@@ -241,8 +241,8 @@ where
     async fn fetch_self(
         &self,
         req: crate::model::FetchSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         self.inner.fetch_self(req, options).await
     }
 
@@ -250,8 +250,8 @@ where
     async fn delete_self(
         &self,
         req: crate::model::DeleteSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_self(req, options).await
     }
 
@@ -259,8 +259,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -268,8 +268,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -277,9 +277,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -287,8 +286,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -296,8 +295,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -305,22 +304,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -351,8 +350,8 @@ where
     async fn list_insights_configs(
         &self,
         req: crate::model::ListInsightsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInsightsConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInsightsConfigsResponse>> {
         self.inner.list_insights_configs(req, options).await
     }
 
@@ -360,8 +359,8 @@ where
     async fn create_insights_config(
         &self,
         req: crate::model::CreateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_insights_config(req, options).await
     }
 
@@ -369,8 +368,8 @@ where
     async fn get_insights_config(
         &self,
         req: crate::model::GetInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InsightsConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InsightsConfig>> {
         self.inner.get_insights_config(req, options).await
     }
 
@@ -378,8 +377,8 @@ where
     async fn update_insights_config(
         &self,
         req: crate::model::UpdateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_insights_config(req, options).await
     }
 
@@ -387,8 +386,8 @@ where
     async fn delete_insights_config(
         &self,
         req: crate::model::DeleteInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_insights_config(req, options).await
     }
 
@@ -396,8 +395,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -405,8 +404,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -414,9 +413,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -424,8 +422,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -433,8 +431,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -442,22 +440,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/developerconnect/v1/src/transport.rs b/src/generated/cloud/developerconnect/v1/src/transport.rs
index 1c99041fa8..808d8b69eb 100644
--- a/src/generated/cloud/developerconnect/v1/src/transport.rs
+++ b/src/generated/cloud/developerconnect/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DeveloperConnect](super::stub::DeveloperConnect) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DeveloperConnect {
 }
 
 impl DeveloperConnect {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn list_connections(
         &self,
         req: crate::model::ListConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn get_connection(
         &self,
         req: crate::model::GetConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn create_connection(
         &self,
         req: crate::model::CreateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn update_connection(
         &self,
         req: crate::model::UpdateConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -302,9 +302,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -319,13 +319,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn delete_connection(
         &self,
         req: crate::model::DeleteConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -369,9 +369,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -386,13 +386,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn create_git_repository_link(
         &self,
         req: crate::model::CreateGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -437,9 +437,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -454,13 +454,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn delete_git_repository_link(
         &self,
         req: crate::model::DeleteGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -508,9 +508,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -525,13 +525,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn list_git_repository_links(
         &self,
         req: crate::model::ListGitRepositoryLinksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGitRepositoryLinksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGitRepositoryLinksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -576,9 +576,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -593,13 +593,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn get_git_repository_link(
         &self,
         req: crate::model::GetGitRepositoryLinkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GitRepositoryLink>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GitRepositoryLink>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -644,9 +644,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -661,13 +661,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_read_write_token(
         &self,
         req: crate::model::FetchReadWriteTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchReadWriteTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchReadWriteTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -716,9 +716,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -733,13 +733,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_read_token(
         &self,
         req: crate::model::FetchReadTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchReadTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchReadTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -788,9 +788,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -805,13 +805,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_linkable_git_repositories(
         &self,
         req: crate::model::FetchLinkableGitRepositoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchLinkableGitRepositoriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchLinkableGitRepositoriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -854,9 +854,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -871,13 +871,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_git_hub_installations(
         &self,
         req: crate::model::FetchGitHubInstallationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchGitHubInstallationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchGitHubInstallationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -918,9 +918,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -935,13 +935,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_git_refs(
         &self,
         req: crate::model::FetchGitRefsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchGitRefsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchGitRefsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -993,9 +993,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1010,13 +1010,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn list_account_connectors(
         &self,
         req: crate::model::ListAccountConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAccountConnectorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAccountConnectorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1057,9 +1057,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1074,13 +1074,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn get_account_connector(
         &self,
         req: crate::model::GetAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AccountConnector>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AccountConnector>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1121,9 +1121,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1138,13 +1138,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn create_account_connector(
         &self,
         req: crate::model::CreateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1184,9 +1184,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1201,13 +1201,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn update_account_connector(
         &self,
         req: crate::model::UpdateAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1269,9 +1269,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1286,13 +1286,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn delete_account_connector(
         &self,
         req: crate::model::DeleteAccountConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1337,9 +1337,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1354,13 +1354,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_access_token(
         &self,
         req: crate::model::FetchAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchAccessTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchAccessTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1401,9 +1401,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1418,13 +1418,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn list_users(
         &self,
         req: crate::model::ListUsersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListUsersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListUsersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1469,9 +1469,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1486,13 +1486,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn delete_user(
         &self,
         req: crate::model::DeleteUserRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1540,9 +1540,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1557,13 +1557,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn fetch_self(
         &self,
         req: crate::model::FetchSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::User>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::User>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1604,9 +1604,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1621,13 +1621,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn delete_self(
         &self,
         req: crate::model::DeleteSelfRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1668,9 +1668,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1685,13 +1685,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1721,9 +1721,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1738,13 +1738,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1781,9 +1781,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1798,14 +1798,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1847,9 +1846,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1864,13 +1863,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1911,9 +1910,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1928,13 +1927,13 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1975,9 +1974,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1986,24 +1985,25 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2044,9 +2044,9 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2055,25 +2055,26 @@ impl super::stub::DeveloperConnect for DeveloperConnect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2093,7 +2094,7 @@ impl std::fmt::Debug for InsightsConfigService {
 }
 
 impl InsightsConfigService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2103,13 +2104,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn list_insights_configs(
         &self,
         req: crate::model::ListInsightsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInsightsConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInsightsConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2150,9 +2151,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2167,13 +2168,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn create_insights_config(
         &self,
         req: crate::model::CreateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2212,9 +2213,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2229,13 +2230,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn get_insights_config(
         &self,
         req: crate::model::GetInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InsightsConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InsightsConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2276,9 +2277,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2293,13 +2294,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn update_insights_config(
         &self,
         req: crate::model::UpdateInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2349,9 +2350,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2366,13 +2367,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn delete_insights_config(
         &self,
         req: crate::model::DeleteInsightsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2416,9 +2417,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2433,13 +2434,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2469,9 +2470,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2486,13 +2487,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2529,9 +2530,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2546,14 +2547,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2595,9 +2595,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2612,13 +2612,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2659,9 +2659,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2676,13 +2676,13 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2723,9 +2723,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2734,24 +2734,25 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2792,9 +2793,9 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2803,25 +2804,26 @@ impl super::stub::InsightsConfigService for InsightsConfigService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/devicestreaming/v1/Cargo.toml b/src/generated/cloud/devicestreaming/v1/Cargo.toml
index d426e3fac8..b0c46ad359 100644
--- a/src/generated/cloud/devicestreaming/v1/Cargo.toml
+++ b/src/generated/cloud/devicestreaming/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/devicestreaming/v1/src/builder.rs b/src/generated/cloud/devicestreaming/v1/src/builder.rs
index 03bf58c1f5..0574afeec0 100644
--- a/src/generated/cloud/devicestreaming/v1/src/builder.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod direct_access_service {
     /// A builder for [DirectAccessService][crate::client::DirectAccessService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_devicestreaming_v1::*;
     /// # use builder::direct_access_service::ClientBuilder;
     /// # use client::DirectAccessService;
@@ -30,19 +30,18 @@ pub mod direct_access_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DirectAccessService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DirectAccessService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod direct_access_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DirectAccessService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod direct_access_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod direct_access_service {
     /// # Example
     /// ```
     /// # use google_cloud_devicestreaming_v1::builder::direct_access_service::CreateDeviceSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_devicestreaming_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod direct_access_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod direct_access_service {
             (*self.0.stub)
                 .create_device_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDeviceSessionRequest::parent].
@@ -158,8 +157,8 @@ pub mod direct_access_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeviceSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeviceSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -169,8 +168,8 @@ pub mod direct_access_service {
     /// # Example
     /// ```
     /// # use google_cloud_devicestreaming_v1::builder::direct_access_service::ListDeviceSessions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_devicestreaming_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -204,7 +203,7 @@ pub mod direct_access_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -214,14 +213,16 @@ pub mod direct_access_service {
             (*self.0.stub)
                 .list_device_sessions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeviceSessionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeviceSessionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -229,17 +230,17 @@ pub mod direct_access_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListDeviceSessionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -271,8 +272,8 @@ pub mod direct_access_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeviceSessions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeviceSessions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -282,7 +283,7 @@ pub mod direct_access_service {
     /// # Example
     /// ```
     /// # use google_cloud_devicestreaming_v1::builder::direct_access_service::GetDeviceSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_devicestreaming_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -313,7 +314,7 @@ pub mod direct_access_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -323,7 +324,7 @@ pub mod direct_access_service {
             (*self.0.stub)
                 .get_device_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeviceSessionRequest::name].
@@ -336,8 +337,8 @@ pub mod direct_access_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeviceSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeviceSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -347,7 +348,7 @@ pub mod direct_access_service {
     /// # Example
     /// ```
     /// # use google_cloud_devicestreaming_v1::builder::direct_access_service::CancelDeviceSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_devicestreaming_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -378,7 +379,7 @@ pub mod direct_access_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -388,7 +389,7 @@ pub mod direct_access_service {
             (*self.0.stub)
                 .cancel_device_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CancelDeviceSessionRequest::name].
@@ -401,8 +402,8 @@ pub mod direct_access_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelDeviceSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelDeviceSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -412,7 +413,7 @@ pub mod direct_access_service {
     /// # Example
     /// ```
     /// # use google_cloud_devicestreaming_v1::builder::direct_access_service::UpdateDeviceSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_devicestreaming_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -443,7 +444,7 @@ pub mod direct_access_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -453,7 +454,7 @@ pub mod direct_access_service {
             (*self.0.stub)
                 .update_device_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [device_session][crate::model::UpdateDeviceSessionRequest::device_session].
@@ -498,8 +499,8 @@ pub mod direct_access_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDeviceSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDeviceSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/devicestreaming/v1/src/client.rs b/src/generated/cloud/devicestreaming/v1/src/client.rs
index d7ded663b2..f1abd776a6 100644
--- a/src/generated/cloud/devicestreaming/v1/src/client.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_devicestreaming_v1::client::DirectAccessService;
 /// let client = DirectAccessService::builder().build().await?;
 /// // use `client` to make requests to the Device Streaming API.
@@ -75,15 +75,13 @@ impl DirectAccessService {
     /// Returns a builder for [DirectAccessService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_devicestreaming_v1::client::DirectAccessService;
     /// let client = DirectAccessService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::direct_access_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::direct_access_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::direct_access_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -101,14 +99,14 @@ impl DirectAccessService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DirectAccessService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DirectAccessService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -118,13 +116,13 @@ impl DirectAccessService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DirectAccessService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DirectAccessService> {
         super::transport::DirectAccessService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DirectAccessService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DirectAccessService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DirectAccessService::new)
diff --git a/src/generated/cloud/devicestreaming/v1/src/lib.rs b/src/generated/cloud/devicestreaming/v1/src/lib.rs
index 3b4e1f7996..da2728a540 100644
--- a/src/generated/cloud/devicestreaming/v1/src/lib.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/lib.rs
@@ -51,8 +51,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -87,3 +87,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/devicestreaming/v1/src/model.rs b/src/generated/cloud/devicestreaming/v1/src/model.rs
index b8a44a6d76..8e4dae44a5 100644
--- a/src/generated/cloud/devicestreaming/v1/src/model.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -1235,7 +1235,7 @@ impl wkt::message::Message for ListDeviceSessionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeviceSessionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeviceSessionsResponse {
     type PageItem = crate::model::DeviceSession;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/devicestreaming/v1/src/stub.rs b/src/generated/cloud/devicestreaming/v1/src/stub.rs
index eed3cf0973..b09e5ba0f3 100644
--- a/src/generated/cloud/devicestreaming/v1/src/stub.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DirectAccessService: std::fmt::Debug + Send + Sync {
     fn create_device_session(
         &self,
         _req: crate::model::CreateDeviceSessionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DeviceSession>>,
+        Output = crate::Result<crate::Response<crate::model::DeviceSession>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait DirectAccessService: std::fmt::Debug + Send + Sync {
     fn list_device_sessions(
         &self,
         _req: crate::model::ListDeviceSessionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDeviceSessionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDeviceSessionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait DirectAccessService: std::fmt::Debug + Send + Sync {
     fn get_device_session(
         &self,
         _req: crate::model::GetDeviceSessionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DeviceSession>>,
+        Output = crate::Result<crate::Response<crate::model::DeviceSession>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,8 +75,8 @@ pub trait DirectAccessService: std::fmt::Debug + Send + Sync {
     fn cancel_device_session(
         &self,
         _req: crate::model::CancelDeviceSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -84,9 +84,9 @@ pub trait DirectAccessService: std::fmt::Debug + Send + Sync {
     fn update_device_session(
         &self,
         _req: crate::model::UpdateDeviceSessionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DeviceSession>>,
+        Output = crate::Result<crate::Response<crate::model::DeviceSession>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/devicestreaming/v1/src/stub/dynamic.rs b/src/generated/cloud/devicestreaming/v1/src/stub/dynamic.rs
index 939884008d..ed4c331ccf 100644
--- a/src/generated/cloud/devicestreaming/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/stub/dynamic.rs
@@ -20,32 +20,32 @@ pub trait DirectAccessService: std::fmt::Debug + Send + Sync {
     async fn create_device_session(
         &self,
         req: crate::model::CreateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeviceSession>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeviceSession>>;
 
     async fn list_device_sessions(
         &self,
         req: crate::model::ListDeviceSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeviceSessionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeviceSessionsResponse>>;
 
     async fn get_device_session(
         &self,
         req: crate::model::GetDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeviceSession>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeviceSession>>;
 
     async fn cancel_device_session(
         &self,
         req: crate::model::CancelDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_device_session(
         &self,
         req: crate::model::UpdateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeviceSession>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeviceSession>>;
 }
 
 /// All implementations of [super::DirectAccessService] also implement [DirectAccessService].
@@ -55,8 +55,8 @@ impl<T: super::DirectAccessService> DirectAccessService for T {
     async fn create_device_session(
         &self,
         req: crate::model::CreateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeviceSession>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeviceSession>> {
         T::create_device_session(self, req, options).await
     }
 
@@ -64,8 +64,8 @@ impl<T: super::DirectAccessService> DirectAccessService for T {
     async fn list_device_sessions(
         &self,
         req: crate::model::ListDeviceSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeviceSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeviceSessionsResponse>> {
         T::list_device_sessions(self, req, options).await
     }
 
@@ -73,8 +73,8 @@ impl<T: super::DirectAccessService> DirectAccessService for T {
     async fn get_device_session(
         &self,
         req: crate::model::GetDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeviceSession>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeviceSession>> {
         T::get_device_session(self, req, options).await
     }
 
@@ -82,8 +82,8 @@ impl<T: super::DirectAccessService> DirectAccessService for T {
     async fn cancel_device_session(
         &self,
         req: crate::model::CancelDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_device_session(self, req, options).await
     }
 
@@ -91,8 +91,8 @@ impl<T: super::DirectAccessService> DirectAccessService for T {
     async fn update_device_session(
         &self,
         req: crate::model::UpdateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DeviceSession>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DeviceSession>> {
         T::update_device_session(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/devicestreaming/v1/src/tracing.rs b/src/generated/cloud/devicestreaming/v1/src/tracing.rs
index b9a562abe6..786a6aac0d 100644
--- a/src/generated/cloud/devicestreaming/v1/src/tracing.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_device_session(
         &self,
         req: crate::model::CreateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeviceSession>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeviceSession>> {
         self.inner.create_device_session(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_device_sessions(
         &self,
         req: crate::model::ListDeviceSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeviceSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeviceSessionsResponse>> {
         self.inner.list_device_sessions(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_device_session(
         &self,
         req: crate::model::GetDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeviceSession>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeviceSession>> {
         self.inner.get_device_session(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn cancel_device_session(
         &self,
         req: crate::model::CancelDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_device_session(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_device_session(
         &self,
         req: crate::model::UpdateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeviceSession>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeviceSession>> {
         self.inner.update_device_session(req, options).await
     }
 }
diff --git a/src/generated/cloud/devicestreaming/v1/src/transport.rs b/src/generated/cloud/devicestreaming/v1/src/transport.rs
index 845cdd1419..b17d956145 100644
--- a/src/generated/cloud/devicestreaming/v1/src/transport.rs
+++ b/src/generated/cloud/devicestreaming/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DirectAccessService](super::stub::DirectAccessService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DirectAccessService {
 }
 
 impl DirectAccessService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DirectAccessService for DirectAccessService {
     async fn create_device_session(
         &self,
         req: crate::model::CreateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeviceSession>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeviceSession>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -77,9 +77,9 @@ impl super::stub::DirectAccessService for DirectAccessService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -94,13 +94,13 @@ impl super::stub::DirectAccessService for DirectAccessService {
     async fn list_device_sessions(
         &self,
         req: crate::model::ListDeviceSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeviceSessionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeviceSessionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -130,9 +130,9 @@ impl super::stub::DirectAccessService for DirectAccessService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -147,13 +147,13 @@ impl super::stub::DirectAccessService for DirectAccessService {
     async fn get_device_session(
         &self,
         req: crate::model::GetDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeviceSession>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeviceSession>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -190,9 +190,9 @@ impl super::stub::DirectAccessService for DirectAccessService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -207,13 +207,13 @@ impl super::stub::DirectAccessService for DirectAccessService {
     async fn cancel_device_session(
         &self,
         req: crate::model::CancelDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -250,9 +250,9 @@ impl super::stub::DirectAccessService for DirectAccessService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -261,24 +261,25 @@ impl super::stub::DirectAccessService for DirectAccessService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_device_session(
         &self,
         req: crate::model::UpdateDeviceSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DeviceSession>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DeviceSession>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -333,9 +334,9 @@ impl super::stub::DirectAccessService for DirectAccessService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/dialogflow/cx/v3/Cargo.toml b/src/generated/cloud/dialogflow/cx/v3/Cargo.toml
index d5b161497b..95b3e01d19 100644
--- a/src/generated/cloud/dialogflow/cx/v3/Cargo.toml
+++ b/src/generated/cloud/dialogflow/cx/v3/Cargo.toml
@@ -102,8 +102,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/builder.rs b/src/generated/cloud/dialogflow/cx/v3/src/builder.rs
index fe16683c85..a632774022 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/builder.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/builder.rs
@@ -22,7 +22,7 @@ pub mod agents {
     /// A builder for [Agents][crate::client::Agents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::agents::ClientBuilder;
     /// # use client::Agents;
@@ -32,19 +32,18 @@ pub mod agents {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Agents;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Agents;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -55,7 +54,7 @@ pub mod agents {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Agents>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod agents {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::ListAgents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -106,7 +105,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116,13 +115,13 @@ pub mod agents {
             (*self.0.stub)
                 .list_agents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAgentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAgentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -131,15 +130,17 @@ pub mod agents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAgentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAgentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -165,8 +166,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAgents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAgents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -176,7 +177,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::GetAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -202,7 +203,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -212,7 +213,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAgentRequest::name].
@@ -225,8 +226,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -236,7 +237,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::CreateAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -262,7 +263,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -272,7 +273,7 @@ pub mod agents {
             (*self.0.stub)
                 .create_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAgentRequest::parent].
@@ -307,8 +308,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -318,7 +319,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::UpdateAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -344,7 +345,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -354,7 +355,7 @@ pub mod agents {
             (*self.0.stub)
                 .update_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [agent][crate::model::UpdateAgentRequest::agent].
@@ -399,8 +400,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -410,7 +411,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::DeleteAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -436,7 +437,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -446,7 +447,7 @@ pub mod agents {
             (*self.0.stub)
                 .delete_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAgentRequest::name].
@@ -459,8 +460,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -470,7 +471,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::ExportAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -497,7 +498,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -512,7 +513,7 @@ pub mod agents {
             (*self.0.stub)
                 .export_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_agent`.
@@ -528,7 +529,7 @@ pub mod agents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -610,8 +611,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -621,7 +622,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::RestoreAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -648,7 +649,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -663,7 +664,7 @@ pub mod agents {
             (*self.0.stub)
                 .restore_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_agent`.
@@ -674,7 +675,7 @@ pub mod agents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -767,8 +768,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -778,7 +779,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::ValidateAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -804,7 +805,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -814,7 +815,7 @@ pub mod agents {
             (*self.0.stub)
                 .validate_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ValidateAgentRequest::name].
@@ -833,8 +834,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -844,7 +845,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::GetAgentValidationResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -875,7 +876,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -885,7 +886,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_agent_validation_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAgentValidationResultRequest::name].
@@ -904,8 +905,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAgentValidationResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAgentValidationResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -915,7 +916,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::GetGenerativeSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -944,7 +945,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -954,7 +955,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_generative_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGenerativeSettingsRequest::name].
@@ -975,8 +976,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGenerativeSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGenerativeSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -986,7 +987,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::UpdateGenerativeSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1017,7 +1018,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1027,7 +1028,7 @@ pub mod agents {
             (*self.0.stub)
                 .update_generative_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [generative_settings][crate::model::UpdateGenerativeSettingsRequest::generative_settings].
@@ -1072,8 +1073,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGenerativeSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGenerativeSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1083,8 +1084,8 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1116,7 +1117,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1126,15 +1127,15 @@ pub mod agents {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1143,17 +1144,17 @@ pub mod agents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1183,8 +1184,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1194,7 +1195,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1223,7 +1224,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1233,7 +1234,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1244,8 +1245,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1255,8 +1256,8 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1290,7 +1291,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1300,15 +1301,15 @@ pub mod agents {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1317,17 +1318,17 @@ pub mod agents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1363,8 +1364,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1374,7 +1375,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1403,7 +1404,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1413,7 +1414,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1424,8 +1425,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1435,7 +1436,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::agents::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1466,7 +1467,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1476,7 +1477,7 @@ pub mod agents {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1487,8 +1488,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1502,7 +1503,7 @@ pub mod changelogs {
     /// A builder for [Changelogs][crate::client::Changelogs].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::changelogs::ClientBuilder;
     /// # use client::Changelogs;
@@ -1512,19 +1513,18 @@ pub mod changelogs {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Changelogs;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Changelogs;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1535,7 +1535,7 @@ pub mod changelogs {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Changelogs>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1548,7 +1548,7 @@ pub mod changelogs {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1558,8 +1558,8 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::ListChangelogs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1590,7 +1590,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1600,14 +1600,16 @@ pub mod changelogs {
             (*self.0.stub)
                 .list_changelogs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListChangelogsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListChangelogsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1615,15 +1617,17 @@ pub mod changelogs {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListChangelogsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListChangelogsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1655,8 +1659,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListChangelogs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListChangelogs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1666,7 +1670,7 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::GetChangelog;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1694,7 +1698,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1704,7 +1708,7 @@ pub mod changelogs {
             (*self.0.stub)
                 .get_changelog(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetChangelogRequest::name].
@@ -1717,8 +1721,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetChangelog {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetChangelog {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1728,8 +1732,8 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1763,7 +1767,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1773,15 +1777,15 @@ pub mod changelogs {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1790,17 +1794,17 @@ pub mod changelogs {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1830,8 +1834,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1841,7 +1845,7 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1872,7 +1876,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1882,7 +1886,7 @@ pub mod changelogs {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1893,8 +1897,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1904,8 +1908,8 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1941,7 +1945,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1951,15 +1955,15 @@ pub mod changelogs {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1968,17 +1972,17 @@ pub mod changelogs {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2014,8 +2018,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2025,7 +2029,7 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2056,7 +2060,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2066,7 +2070,7 @@ pub mod changelogs {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2077,8 +2081,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2088,7 +2092,7 @@ pub mod changelogs {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::changelogs::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2121,7 +2125,7 @@ pub mod changelogs {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2131,7 +2135,7 @@ pub mod changelogs {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2142,8 +2146,8 @@ pub mod changelogs {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2157,7 +2161,7 @@ pub mod deployments {
     /// A builder for [Deployments][crate::client::Deployments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::deployments::ClientBuilder;
     /// # use client::Deployments;
@@ -2167,19 +2171,18 @@ pub mod deployments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Deployments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Deployments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2190,7 +2193,7 @@ pub mod deployments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Deployments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2203,7 +2206,7 @@ pub mod deployments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2213,8 +2216,8 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::ListDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2245,7 +2248,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2255,14 +2258,16 @@ pub mod deployments {
             (*self.0.stub)
                 .list_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2270,15 +2275,17 @@ pub mod deployments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2304,8 +2311,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2315,7 +2322,7 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::GetDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2343,7 +2350,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2353,7 +2360,7 @@ pub mod deployments {
             (*self.0.stub)
                 .get_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeploymentRequest::name].
@@ -2366,8 +2373,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2377,8 +2384,8 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2412,7 +2419,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2422,15 +2429,15 @@ pub mod deployments {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2439,17 +2446,17 @@ pub mod deployments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2479,8 +2486,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2490,7 +2497,7 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2521,7 +2528,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2531,7 +2538,7 @@ pub mod deployments {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2542,8 +2549,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2553,8 +2560,8 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2590,7 +2597,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2600,15 +2607,15 @@ pub mod deployments {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2617,17 +2624,17 @@ pub mod deployments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2663,8 +2670,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2674,7 +2681,7 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2705,7 +2712,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2715,7 +2722,7 @@ pub mod deployments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2726,8 +2733,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2737,7 +2744,7 @@ pub mod deployments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::deployments::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2770,7 +2777,7 @@ pub mod deployments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2780,7 +2787,7 @@ pub mod deployments {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2791,8 +2798,8 @@ pub mod deployments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2806,7 +2813,7 @@ pub mod entity_types {
     /// A builder for [EntityTypes][crate::client::EntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::entity_types::ClientBuilder;
     /// # use client::EntityTypes;
@@ -2816,19 +2823,18 @@ pub mod entity_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EntityTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EntityTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2839,7 +2845,7 @@ pub mod entity_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EntityTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2852,7 +2858,7 @@ pub mod entity_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2862,7 +2868,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::GetEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2890,7 +2896,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2900,7 +2906,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .get_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntityTypeRequest::name].
@@ -2919,8 +2925,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2930,7 +2936,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::CreateEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2961,7 +2967,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2971,7 +2977,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .create_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntityTypeRequest::parent].
@@ -3012,8 +3018,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3023,7 +3029,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::UpdateEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3054,7 +3060,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3064,7 +3070,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .update_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entity_type][crate::model::UpdateEntityTypeRequest::entity_type].
@@ -3115,8 +3121,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3126,7 +3132,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::DeleteEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3157,7 +3163,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3167,7 +3173,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .delete_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntityTypeRequest::name].
@@ -3186,8 +3192,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3197,8 +3203,8 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::ListEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3229,7 +3235,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3239,14 +3245,16 @@ pub mod entity_types {
             (*self.0.stub)
                 .list_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntityTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEntityTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3254,15 +3262,17 @@ pub mod entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntityTypesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntityTypesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3294,8 +3304,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3305,7 +3315,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::ExportEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3337,7 +3347,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3352,7 +3362,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .export_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_entity_types`.
@@ -3371,7 +3381,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3476,8 +3486,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3487,7 +3497,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::ImportEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3519,7 +3529,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3534,7 +3544,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .import_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_entity_types`.
@@ -3553,7 +3563,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3649,8 +3659,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3660,8 +3670,8 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3695,7 +3705,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3705,15 +3715,15 @@ pub mod entity_types {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3722,17 +3732,17 @@ pub mod entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3762,8 +3772,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3773,7 +3783,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3804,7 +3814,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3814,7 +3824,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3825,8 +3835,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3836,8 +3846,8 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3873,7 +3883,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3883,15 +3893,15 @@ pub mod entity_types {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3900,17 +3910,17 @@ pub mod entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3946,8 +3956,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3957,7 +3967,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3988,7 +3998,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3998,7 +4008,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4009,8 +4019,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4020,7 +4030,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::entity_types::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4053,7 +4063,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4063,7 +4073,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4074,8 +4084,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4089,7 +4099,7 @@ pub mod environments {
     /// A builder for [Environments][crate::client::Environments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::environments::ClientBuilder;
     /// # use client::Environments;
@@ -4099,19 +4109,18 @@ pub mod environments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Environments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Environments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4122,7 +4131,7 @@ pub mod environments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Environments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4135,7 +4144,7 @@ pub mod environments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4145,8 +4154,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::ListEnvironments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4180,7 +4189,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4190,14 +4199,16 @@ pub mod environments {
             (*self.0.stub)
                 .list_environments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEnvironmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEnvironmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4205,15 +4216,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEnvironmentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEnvironmentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4239,8 +4252,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEnvironments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEnvironments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4250,7 +4263,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::GetEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4278,7 +4291,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4288,7 +4301,7 @@ pub mod environments {
             (*self.0.stub)
                 .get_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEnvironmentRequest::name].
@@ -4301,8 +4314,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4312,7 +4325,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::CreateEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4344,7 +4357,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4359,7 +4372,7 @@ pub mod environments {
             (*self.0.stub)
                 .create_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_environment`.
@@ -4373,7 +4386,7 @@ pub mod environments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4432,8 +4445,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4443,7 +4456,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::UpdateEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4475,7 +4488,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4490,7 +4503,7 @@ pub mod environments {
             (*self.0.stub)
                 .update_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_environment`.
@@ -4504,7 +4517,7 @@ pub mod environments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4577,8 +4590,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4588,7 +4601,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::DeleteEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4619,7 +4632,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4629,7 +4642,7 @@ pub mod environments {
             (*self.0.stub)
                 .delete_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEnvironmentRequest::name].
@@ -4642,8 +4655,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4653,8 +4666,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::LookupEnvironmentHistory;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4690,7 +4703,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4700,15 +4713,15 @@ pub mod environments {
             (*self.0.stub)
                 .lookup_environment_history(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::LookupEnvironmentHistoryResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4717,17 +4730,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::LookupEnvironmentHistoryResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4753,8 +4766,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupEnvironmentHistory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupEnvironmentHistory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4764,7 +4777,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::RunContinuousTest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4796,7 +4809,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4811,7 +4824,7 @@ pub mod environments {
             (*self.0.stub)
                 .run_continuous_test(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `run_continuous_test`.
@@ -4830,7 +4843,7 @@ pub mod environments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4867,8 +4880,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RunContinuousTest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RunContinuousTest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4878,8 +4891,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::ListContinuousTestResults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4915,7 +4928,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4925,15 +4938,15 @@ pub mod environments {
             (*self.0.stub)
                 .list_continuous_test_results(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListContinuousTestResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4942,17 +4955,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListContinuousTestResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4978,8 +4991,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListContinuousTestResults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListContinuousTestResults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4989,7 +5002,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::DeployFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5018,7 +5031,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5033,7 +5046,7 @@ pub mod environments {
             (*self.0.stub)
                 .deploy_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy_flow`.
@@ -5052,7 +5065,7 @@ pub mod environments {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5097,8 +5110,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5108,8 +5121,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5143,7 +5156,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5153,15 +5166,15 @@ pub mod environments {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5170,17 +5183,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5210,8 +5223,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5221,7 +5234,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5252,7 +5265,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5262,7 +5275,7 @@ pub mod environments {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5273,8 +5286,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5284,8 +5297,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5321,7 +5334,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5331,15 +5344,15 @@ pub mod environments {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5348,17 +5361,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5394,8 +5407,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5405,7 +5418,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5436,7 +5449,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5446,7 +5459,7 @@ pub mod environments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5457,8 +5470,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5468,7 +5481,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::environments::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5501,7 +5514,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5511,7 +5524,7 @@ pub mod environments {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5522,8 +5535,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5537,7 +5550,7 @@ pub mod examples {
     /// A builder for [Examples][crate::client::Examples].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::examples::ClientBuilder;
     /// # use client::Examples;
@@ -5547,19 +5560,18 @@ pub mod examples {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Examples;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Examples;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5570,7 +5582,7 @@ pub mod examples {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Examples>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5581,7 +5593,7 @@ pub mod examples {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5591,7 +5603,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::CreateExample;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5617,7 +5629,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5627,7 +5639,7 @@ pub mod examples {
             (*self.0.stub)
                 .create_example(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateExampleRequest::parent].
@@ -5662,8 +5674,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateExample {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateExample {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5673,7 +5685,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::DeleteExample;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5699,7 +5711,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5709,7 +5721,7 @@ pub mod examples {
             (*self.0.stub)
                 .delete_example(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteExampleRequest::name].
@@ -5722,8 +5734,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteExample {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteExample {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5733,8 +5745,8 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::ListExamples;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5763,7 +5775,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5773,13 +5785,13 @@ pub mod examples {
             (*self.0.stub)
                 .list_examples(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListExamplesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListExamplesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5788,15 +5800,17 @@ pub mod examples {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListExamplesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListExamplesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5828,8 +5842,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListExamples {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListExamples {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5839,7 +5853,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::GetExample;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5865,7 +5879,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5875,7 +5889,7 @@ pub mod examples {
             (*self.0.stub)
                 .get_example(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetExampleRequest::name].
@@ -5888,8 +5902,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetExample {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetExample {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5899,7 +5913,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::UpdateExample;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5925,7 +5939,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5935,7 +5949,7 @@ pub mod examples {
             (*self.0.stub)
                 .update_example(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [example][crate::model::UpdateExampleRequest::example].
@@ -5980,8 +5994,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateExample {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateExample {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5991,8 +6005,8 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6024,7 +6038,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6034,15 +6048,15 @@ pub mod examples {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6051,17 +6065,17 @@ pub mod examples {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6091,8 +6105,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6102,7 +6116,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6131,7 +6145,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6141,7 +6155,7 @@ pub mod examples {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -6152,8 +6166,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6163,8 +6177,8 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6198,7 +6212,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6208,15 +6222,15 @@ pub mod examples {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6225,17 +6239,17 @@ pub mod examples {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6271,8 +6285,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6282,7 +6296,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6311,7 +6325,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6321,7 +6335,7 @@ pub mod examples {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -6332,8 +6346,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6343,7 +6357,7 @@ pub mod examples {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::examples::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6374,7 +6388,7 @@ pub mod examples {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6384,7 +6398,7 @@ pub mod examples {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -6395,8 +6409,8 @@ pub mod examples {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6410,7 +6424,7 @@ pub mod experiments {
     /// A builder for [Experiments][crate::client::Experiments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::experiments::ClientBuilder;
     /// # use client::Experiments;
@@ -6420,19 +6434,18 @@ pub mod experiments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Experiments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Experiments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -6443,7 +6456,7 @@ pub mod experiments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Experiments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -6456,7 +6469,7 @@ pub mod experiments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -6466,8 +6479,8 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::ListExperiments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6498,7 +6511,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6508,14 +6521,16 @@ pub mod experiments {
             (*self.0.stub)
                 .list_experiments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListExperimentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListExperimentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6523,15 +6538,17 @@ pub mod experiments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListExperimentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListExperimentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6557,8 +6574,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListExperiments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListExperiments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6568,7 +6585,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::GetExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6596,7 +6613,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6606,7 +6623,7 @@ pub mod experiments {
             (*self.0.stub)
                 .get_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetExperimentRequest::name].
@@ -6619,8 +6636,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6630,7 +6647,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::CreateExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6661,7 +6678,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6671,7 +6688,7 @@ pub mod experiments {
             (*self.0.stub)
                 .create_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateExperimentRequest::parent].
@@ -6706,8 +6723,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6717,7 +6734,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::UpdateExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6748,7 +6765,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6758,7 +6775,7 @@ pub mod experiments {
             (*self.0.stub)
                 .update_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [experiment][crate::model::UpdateExperimentRequest::experiment].
@@ -6807,8 +6824,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6818,7 +6835,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::DeleteExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6849,7 +6866,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6859,7 +6876,7 @@ pub mod experiments {
             (*self.0.stub)
                 .delete_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteExperimentRequest::name].
@@ -6872,8 +6889,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6883,7 +6900,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::StartExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6911,7 +6928,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6921,7 +6938,7 @@ pub mod experiments {
             (*self.0.stub)
                 .start_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::StartExperimentRequest::name].
@@ -6934,8 +6951,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StartExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StartExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6945,7 +6962,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::StopExperiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6973,7 +6990,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6983,7 +7000,7 @@ pub mod experiments {
             (*self.0.stub)
                 .stop_experiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::StopExperimentRequest::name].
@@ -6996,8 +7013,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopExperiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopExperiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7007,8 +7024,8 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7042,7 +7059,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7052,15 +7069,15 @@ pub mod experiments {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7069,17 +7086,17 @@ pub mod experiments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7109,8 +7126,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7120,7 +7137,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7151,7 +7168,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7161,7 +7178,7 @@ pub mod experiments {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -7172,8 +7189,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7183,8 +7200,8 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7220,7 +7237,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7230,15 +7247,15 @@ pub mod experiments {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7247,17 +7264,17 @@ pub mod experiments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7293,8 +7310,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7304,7 +7321,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7335,7 +7352,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7345,7 +7362,7 @@ pub mod experiments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7356,8 +7373,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7367,7 +7384,7 @@ pub mod experiments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::experiments::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7400,7 +7417,7 @@ pub mod experiments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7410,7 +7427,7 @@ pub mod experiments {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7421,8 +7438,8 @@ pub mod experiments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7436,7 +7453,7 @@ pub mod flows {
     /// A builder for [Flows][crate::client::Flows].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::flows::ClientBuilder;
     /// # use client::Flows;
@@ -7446,19 +7463,18 @@ pub mod flows {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Flows;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Flows;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7469,7 +7485,7 @@ pub mod flows {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Flows>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7480,7 +7496,7 @@ pub mod flows {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7490,7 +7506,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::CreateFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7516,7 +7532,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7526,7 +7542,7 @@ pub mod flows {
             (*self.0.stub)
                 .create_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateFlowRequest::parent].
@@ -7567,8 +7583,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7578,7 +7594,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::DeleteFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7604,7 +7620,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7614,7 +7630,7 @@ pub mod flows {
             (*self.0.stub)
                 .delete_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteFlowRequest::name].
@@ -7633,8 +7649,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7644,8 +7660,8 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::ListFlows;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7674,7 +7690,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7684,13 +7700,13 @@ pub mod flows {
             (*self.0.stub)
                 .list_flows(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFlowsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListFlowsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7699,15 +7715,15 @@ pub mod flows {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFlowsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListFlowsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7739,8 +7755,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFlows {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFlows {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7750,7 +7766,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::GetFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7776,7 +7792,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7786,7 +7802,7 @@ pub mod flows {
             (*self.0.stub)
                 .get_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFlowRequest::name].
@@ -7805,8 +7821,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7816,7 +7832,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::UpdateFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7842,7 +7858,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7852,7 +7868,7 @@ pub mod flows {
             (*self.0.stub)
                 .update_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [flow][crate::model::UpdateFlowRequest::flow].
@@ -7903,8 +7919,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7914,7 +7930,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::TrainFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7941,7 +7957,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7956,7 +7972,7 @@ pub mod flows {
             (*self.0.stub)
                 .train_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `train_flow`.
@@ -7967,7 +7983,7 @@ pub mod flows {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8004,8 +8020,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TrainFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TrainFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8015,7 +8031,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::ValidateFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8041,7 +8057,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8051,7 +8067,7 @@ pub mod flows {
             (*self.0.stub)
                 .validate_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ValidateFlowRequest::name].
@@ -8070,8 +8086,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8081,7 +8097,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::GetFlowValidationResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8112,7 +8128,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8122,7 +8138,7 @@ pub mod flows {
             (*self.0.stub)
                 .get_flow_validation_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFlowValidationResultRequest::name].
@@ -8141,8 +8157,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFlowValidationResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFlowValidationResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8152,7 +8168,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::ImportFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8179,7 +8195,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8194,7 +8210,7 @@ pub mod flows {
             (*self.0.stub)
                 .import_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_flow`.
@@ -8210,7 +8226,7 @@ pub mod flows {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8306,8 +8322,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8317,7 +8333,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::ExportFlow;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8344,7 +8360,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8359,7 +8375,7 @@ pub mod flows {
             (*self.0.stub)
                 .export_flow(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_flow`.
@@ -8375,7 +8391,7 @@ pub mod flows {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8424,8 +8440,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportFlow {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportFlow {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8435,8 +8451,8 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8468,7 +8484,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8478,15 +8494,15 @@ pub mod flows {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8495,17 +8511,17 @@ pub mod flows {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8535,8 +8551,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8546,7 +8562,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8575,7 +8591,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8585,7 +8601,7 @@ pub mod flows {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -8596,8 +8612,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8607,8 +8623,8 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8642,7 +8658,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8652,15 +8668,15 @@ pub mod flows {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8669,17 +8685,17 @@ pub mod flows {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8715,8 +8731,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8726,7 +8742,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8755,7 +8771,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8765,7 +8781,7 @@ pub mod flows {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8776,8 +8792,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8787,7 +8803,7 @@ pub mod flows {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::flows::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8818,7 +8834,7 @@ pub mod flows {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8828,7 +8844,7 @@ pub mod flows {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8839,8 +8855,8 @@ pub mod flows {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8854,7 +8870,7 @@ pub mod generators {
     /// A builder for [Generators][crate::client::Generators].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::generators::ClientBuilder;
     /// # use client::Generators;
@@ -8864,19 +8880,18 @@ pub mod generators {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Generators;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Generators;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8887,7 +8902,7 @@ pub mod generators {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Generators>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8900,7 +8915,7 @@ pub mod generators {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8910,8 +8925,8 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::ListGenerators;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8942,7 +8957,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8952,14 +8967,16 @@ pub mod generators {
             (*self.0.stub)
                 .list_generators(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGeneratorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListGeneratorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -8967,15 +8984,17 @@ pub mod generators {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGeneratorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGeneratorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9007,8 +9026,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGenerators {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGenerators {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9018,7 +9037,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::GetGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9046,7 +9065,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9056,7 +9075,7 @@ pub mod generators {
             (*self.0.stub)
                 .get_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGeneratorRequest::name].
@@ -9075,8 +9094,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9086,7 +9105,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::CreateGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9114,7 +9133,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9124,7 +9143,7 @@ pub mod generators {
             (*self.0.stub)
                 .create_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateGeneratorRequest::parent].
@@ -9165,8 +9184,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9176,7 +9195,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::UpdateGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9204,7 +9223,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9214,7 +9233,7 @@ pub mod generators {
             (*self.0.stub)
                 .update_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [generator][crate::model::UpdateGeneratorRequest::generator].
@@ -9265,8 +9284,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9276,7 +9295,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::DeleteGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9304,7 +9323,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9314,7 +9333,7 @@ pub mod generators {
             (*self.0.stub)
                 .delete_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteGeneratorRequest::name].
@@ -9333,8 +9352,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9344,8 +9363,8 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9379,7 +9398,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9389,15 +9408,15 @@ pub mod generators {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9406,17 +9425,17 @@ pub mod generators {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9446,8 +9465,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9457,7 +9476,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9488,7 +9507,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9498,7 +9517,7 @@ pub mod generators {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -9509,8 +9528,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9520,8 +9539,8 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9557,7 +9576,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9567,15 +9586,15 @@ pub mod generators {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9584,17 +9603,17 @@ pub mod generators {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9630,8 +9649,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9641,7 +9660,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9672,7 +9691,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9682,7 +9701,7 @@ pub mod generators {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9693,8 +9712,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9704,7 +9723,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::generators::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9737,7 +9756,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9747,7 +9766,7 @@ pub mod generators {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9758,8 +9777,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9773,7 +9792,7 @@ pub mod intents {
     /// A builder for [Intents][crate::client::Intents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::intents::ClientBuilder;
     /// # use client::Intents;
@@ -9783,19 +9802,18 @@ pub mod intents {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Intents;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Intents;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -9806,7 +9824,7 @@ pub mod intents {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Intents>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -9817,7 +9835,7 @@ pub mod intents {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -9827,8 +9845,8 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::ListIntents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9857,7 +9875,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9867,13 +9885,13 @@ pub mod intents {
             (*self.0.stub)
                 .list_intents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListIntentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListIntentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9882,15 +9900,17 @@ pub mod intents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListIntentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListIntentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9928,8 +9948,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIntents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIntents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9939,7 +9959,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::GetIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9965,7 +9985,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9975,7 +9995,7 @@ pub mod intents {
             (*self.0.stub)
                 .get_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIntentRequest::name].
@@ -9994,8 +10014,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10005,7 +10025,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::CreateIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10031,7 +10051,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10041,7 +10061,7 @@ pub mod intents {
             (*self.0.stub)
                 .create_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIntentRequest::parent].
@@ -10082,8 +10102,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10093,7 +10113,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::UpdateIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10119,7 +10139,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10129,7 +10149,7 @@ pub mod intents {
             (*self.0.stub)
                 .update_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [intent][crate::model::UpdateIntentRequest::intent].
@@ -10180,8 +10200,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10191,7 +10211,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::DeleteIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10217,7 +10237,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10227,7 +10247,7 @@ pub mod intents {
             (*self.0.stub)
                 .delete_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIntentRequest::name].
@@ -10240,8 +10260,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10251,7 +10271,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::ImportIntents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10278,7 +10298,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10293,7 +10313,7 @@ pub mod intents {
             (*self.0.stub)
                 .import_intents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_intents`.
@@ -10312,7 +10332,7 @@ pub mod intents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10395,8 +10415,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportIntents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportIntents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10406,7 +10426,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::ExportIntents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10433,7 +10453,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10448,7 +10468,7 @@ pub mod intents {
             (*self.0.stub)
                 .export_intents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_intents`.
@@ -10467,7 +10487,7 @@ pub mod intents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10560,8 +10580,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportIntents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportIntents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10571,8 +10591,8 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10604,7 +10624,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10614,15 +10634,15 @@ pub mod intents {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10631,17 +10651,17 @@ pub mod intents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10671,8 +10691,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10682,7 +10702,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10711,7 +10731,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10721,7 +10741,7 @@ pub mod intents {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -10732,8 +10752,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10743,8 +10763,8 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10778,7 +10798,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10788,15 +10808,15 @@ pub mod intents {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10805,17 +10825,17 @@ pub mod intents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10851,8 +10871,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10862,7 +10882,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10891,7 +10911,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10901,7 +10921,7 @@ pub mod intents {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -10912,8 +10932,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10923,7 +10943,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::intents::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10954,7 +10974,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10964,7 +10984,7 @@ pub mod intents {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -10975,8 +10995,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10990,7 +11010,7 @@ pub mod pages {
     /// A builder for [Pages][crate::client::Pages].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::pages::ClientBuilder;
     /// # use client::Pages;
@@ -11000,19 +11020,18 @@ pub mod pages {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Pages;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Pages;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11023,7 +11042,7 @@ pub mod pages {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Pages>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11034,7 +11053,7 @@ pub mod pages {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11044,8 +11063,8 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::ListPages;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11074,7 +11093,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11084,13 +11103,13 @@ pub mod pages {
             (*self.0.stub)
                 .list_pages(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPagesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListPagesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11099,15 +11118,15 @@ pub mod pages {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPagesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListPagesResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11139,8 +11158,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPages {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPages {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11150,7 +11169,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::GetPage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11176,7 +11195,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11186,7 +11205,7 @@ pub mod pages {
             (*self.0.stub)
                 .get_page(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPageRequest::name].
@@ -11205,8 +11224,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11216,7 +11235,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::CreatePage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11242,7 +11261,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11252,7 +11271,7 @@ pub mod pages {
             (*self.0.stub)
                 .create_page(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePageRequest::parent].
@@ -11293,8 +11312,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11304,7 +11323,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::UpdatePage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11330,7 +11349,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11340,7 +11359,7 @@ pub mod pages {
             (*self.0.stub)
                 .update_page(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [page][crate::model::UpdatePageRequest::page].
@@ -11391,8 +11410,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11402,7 +11421,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::DeletePage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11428,7 +11447,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11438,7 +11457,7 @@ pub mod pages {
             (*self.0.stub)
                 .delete_page(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeletePageRequest::name].
@@ -11457,8 +11476,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11468,8 +11487,8 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11501,7 +11520,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11511,15 +11530,15 @@ pub mod pages {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11528,17 +11547,17 @@ pub mod pages {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11568,8 +11587,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11579,7 +11598,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11608,7 +11627,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11618,7 +11637,7 @@ pub mod pages {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -11629,8 +11648,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11640,8 +11659,8 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11675,7 +11694,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11685,15 +11704,15 @@ pub mod pages {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11702,17 +11721,17 @@ pub mod pages {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11748,8 +11767,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11759,7 +11778,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11788,7 +11807,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11798,7 +11817,7 @@ pub mod pages {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -11809,8 +11828,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11820,7 +11839,7 @@ pub mod pages {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::pages::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11851,7 +11870,7 @@ pub mod pages {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11861,7 +11880,7 @@ pub mod pages {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -11872,8 +11891,8 @@ pub mod pages {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11887,7 +11906,7 @@ pub mod playbooks {
     /// A builder for [Playbooks][crate::client::Playbooks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::playbooks::ClientBuilder;
     /// # use client::Playbooks;
@@ -11897,19 +11916,18 @@ pub mod playbooks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Playbooks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Playbooks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11920,7 +11938,7 @@ pub mod playbooks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Playbooks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11933,7 +11951,7 @@ pub mod playbooks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11943,7 +11961,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::CreatePlaybook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11971,7 +11989,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11981,7 +11999,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .create_playbook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePlaybookRequest::parent].
@@ -12016,8 +12034,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePlaybook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePlaybook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12027,7 +12045,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::DeletePlaybook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12055,7 +12073,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12065,7 +12083,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .delete_playbook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeletePlaybookRequest::name].
@@ -12078,8 +12096,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePlaybook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePlaybook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12089,8 +12107,8 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::ListPlaybooks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12121,7 +12139,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12131,13 +12149,13 @@ pub mod playbooks {
             (*self.0.stub)
                 .list_playbooks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPlaybooksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListPlaybooksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12146,15 +12164,17 @@ pub mod playbooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPlaybooksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPlaybooksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12180,8 +12200,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPlaybooks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPlaybooks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12191,7 +12211,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::GetPlaybook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12219,7 +12239,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12229,7 +12249,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .get_playbook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPlaybookRequest::name].
@@ -12242,8 +12262,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPlaybook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPlaybook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12253,7 +12273,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::ExportPlaybook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -12282,7 +12302,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12297,7 +12317,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .export_playbook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_playbook`.
@@ -12314,7 +12334,7 @@ pub mod playbooks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12366,8 +12386,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportPlaybook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportPlaybook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12377,7 +12397,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::ImportPlaybook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -12406,7 +12426,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12421,7 +12441,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .import_playbook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_playbook`.
@@ -12438,7 +12458,7 @@ pub mod playbooks {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12528,8 +12548,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportPlaybook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportPlaybook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12539,7 +12559,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::UpdatePlaybook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12567,7 +12587,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12577,7 +12597,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .update_playbook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [playbook][crate::model::UpdatePlaybookRequest::playbook].
@@ -12622,8 +12642,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePlaybook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePlaybook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12633,7 +12653,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::CreatePlaybookVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12664,7 +12684,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12674,7 +12694,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .create_playbook_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreatePlaybookVersionRequest::parent].
@@ -12709,8 +12729,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePlaybookVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePlaybookVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12720,7 +12740,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::GetPlaybookVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12751,7 +12771,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12761,7 +12781,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .get_playbook_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPlaybookVersionRequest::name].
@@ -12774,8 +12794,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPlaybookVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPlaybookVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12785,7 +12805,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::RestorePlaybookVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12816,7 +12836,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12826,7 +12846,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .restore_playbook_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RestorePlaybookVersionRequest::name].
@@ -12839,8 +12859,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestorePlaybookVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestorePlaybookVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12850,8 +12870,8 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::ListPlaybookVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12885,7 +12905,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12895,14 +12915,16 @@ pub mod playbooks {
             (*self.0.stub)
                 .list_playbook_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPlaybookVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPlaybookVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -12910,17 +12932,17 @@ pub mod playbooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPlaybookVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12946,8 +12968,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPlaybookVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPlaybookVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12957,7 +12979,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::DeletePlaybookVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12988,7 +13010,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12998,7 +13020,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .delete_playbook_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeletePlaybookVersionRequest::name].
@@ -13011,8 +13033,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePlaybookVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePlaybookVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13022,8 +13044,8 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13057,7 +13079,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13067,15 +13089,15 @@ pub mod playbooks {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13084,17 +13106,17 @@ pub mod playbooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13124,8 +13146,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13135,7 +13157,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13166,7 +13188,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13176,7 +13198,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -13187,8 +13209,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13198,8 +13220,8 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13235,7 +13257,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13245,15 +13267,15 @@ pub mod playbooks {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13262,17 +13284,17 @@ pub mod playbooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13308,8 +13330,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13319,7 +13341,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13350,7 +13372,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13360,7 +13382,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -13371,8 +13393,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13382,7 +13404,7 @@ pub mod playbooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::playbooks::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13415,7 +13437,7 @@ pub mod playbooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13425,7 +13447,7 @@ pub mod playbooks {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -13436,8 +13458,8 @@ pub mod playbooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13451,7 +13473,7 @@ pub mod security_settings_service {
     /// A builder for [SecuritySettingsService][crate::client::SecuritySettingsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::security_settings_service::ClientBuilder;
     /// # use client::SecuritySettingsService;
@@ -13461,19 +13483,18 @@ pub mod security_settings_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SecuritySettingsService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SecuritySettingsService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -13484,7 +13505,7 @@ pub mod security_settings_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SecuritySettingsService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -13497,7 +13518,7 @@ pub mod security_settings_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -13507,7 +13528,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::CreateSecuritySettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13538,7 +13559,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13548,7 +13569,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .create_security_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSecuritySettingsRequest::parent].
@@ -13583,8 +13604,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSecuritySettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSecuritySettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13594,7 +13615,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::GetSecuritySettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13625,7 +13646,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13635,7 +13656,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .get_security_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSecuritySettingsRequest::name].
@@ -13648,8 +13669,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSecuritySettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSecuritySettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13659,7 +13680,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::UpdateSecuritySettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13690,7 +13711,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13700,7 +13721,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .update_security_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [security_settings][crate::model::UpdateSecuritySettingsRequest::security_settings].
@@ -13749,8 +13770,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSecuritySettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSecuritySettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13760,8 +13781,8 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::ListSecuritySettings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13795,7 +13816,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13805,14 +13826,16 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .list_security_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSecuritySettingsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListSecuritySettingsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -13820,17 +13843,17 @@ pub mod security_settings_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSecuritySettingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13856,8 +13879,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSecuritySettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSecuritySettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13867,7 +13890,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::DeleteSecuritySettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13898,7 +13921,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13908,7 +13931,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .delete_security_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSecuritySettingsRequest::name].
@@ -13921,8 +13944,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSecuritySettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSecuritySettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13932,8 +13955,8 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13967,7 +13990,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13977,15 +14000,15 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13994,17 +14017,17 @@ pub mod security_settings_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14034,8 +14057,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14045,7 +14068,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14076,7 +14099,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14086,7 +14109,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -14097,8 +14120,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14108,8 +14131,8 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14145,7 +14168,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14155,15 +14178,15 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14172,17 +14195,17 @@ pub mod security_settings_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14218,8 +14241,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14229,7 +14252,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14260,7 +14283,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14270,7 +14293,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -14281,8 +14304,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14292,7 +14315,7 @@ pub mod security_settings_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::security_settings_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14325,7 +14348,7 @@ pub mod security_settings_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14335,7 +14358,7 @@ pub mod security_settings_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -14346,8 +14369,8 @@ pub mod security_settings_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14361,7 +14384,7 @@ pub mod sessions {
     /// A builder for [Sessions][crate::client::Sessions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::sessions::ClientBuilder;
     /// # use client::Sessions;
@@ -14371,19 +14394,18 @@ pub mod sessions {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Sessions;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Sessions;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -14394,7 +14416,7 @@ pub mod sessions {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Sessions>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -14405,7 +14427,7 @@ pub mod sessions {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -14415,7 +14437,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::DetectIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14441,7 +14463,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14451,7 +14473,7 @@ pub mod sessions {
             (*self.0.stub)
                 .detect_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session][crate::model::DetectIntentRequest::session].
@@ -14531,8 +14553,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetectIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetectIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14542,7 +14564,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::MatchIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14568,7 +14590,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14578,7 +14600,7 @@ pub mod sessions {
             (*self.0.stub)
                 .match_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session][crate::model::MatchIntentRequest::session].
@@ -14637,8 +14659,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MatchIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MatchIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14648,7 +14670,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::FulfillIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14674,7 +14696,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14684,7 +14706,7 @@ pub mod sessions {
             (*self.0.stub)
                 .fulfill_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [match_intent_request][crate::model::FulfillIntentRequest::match_intent_request].
@@ -14743,8 +14765,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FulfillIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FulfillIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14754,7 +14776,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::SubmitAnswerFeedback;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14783,7 +14805,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14793,7 +14815,7 @@ pub mod sessions {
             (*self.0.stub)
                 .submit_answer_feedback(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session][crate::model::SubmitAnswerFeedbackRequest::session].
@@ -14854,8 +14876,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SubmitAnswerFeedback {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SubmitAnswerFeedback {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14865,8 +14887,8 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14898,7 +14920,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14908,15 +14930,15 @@ pub mod sessions {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14925,17 +14947,17 @@ pub mod sessions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14965,8 +14987,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14976,7 +14998,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15005,7 +15027,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15015,7 +15037,7 @@ pub mod sessions {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -15026,8 +15048,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15037,8 +15059,8 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15072,7 +15094,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15082,15 +15104,15 @@ pub mod sessions {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15099,17 +15121,17 @@ pub mod sessions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15145,8 +15167,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15156,7 +15178,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15185,7 +15207,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15195,7 +15217,7 @@ pub mod sessions {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -15206,8 +15228,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15217,7 +15239,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::sessions::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15248,7 +15270,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15258,7 +15280,7 @@ pub mod sessions {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -15269,8 +15291,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15284,7 +15306,7 @@ pub mod session_entity_types {
     /// A builder for [SessionEntityTypes][crate::client::SessionEntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::session_entity_types::ClientBuilder;
     /// # use client::SessionEntityTypes;
@@ -15294,19 +15316,18 @@ pub mod session_entity_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SessionEntityTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SessionEntityTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -15317,7 +15338,7 @@ pub mod session_entity_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SessionEntityTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -15330,7 +15351,7 @@ pub mod session_entity_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -15340,8 +15361,8 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::ListSessionEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15375,7 +15396,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15385,15 +15406,15 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .list_session_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListSessionEntityTypesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15402,17 +15423,17 @@ pub mod session_entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSessionEntityTypesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15438,8 +15459,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessionEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessionEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15449,7 +15470,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::GetSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15480,7 +15501,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15490,7 +15511,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .get_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSessionEntityTypeRequest::name].
@@ -15503,8 +15524,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15514,7 +15535,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::CreateSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15547,7 +15568,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15557,7 +15578,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .create_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSessionEntityTypeRequest::parent].
@@ -15592,8 +15613,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15603,7 +15624,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::UpdateSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15636,7 +15657,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15646,7 +15667,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .update_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session_entity_type][crate::model::UpdateSessionEntityTypeRequest::session_entity_type].
@@ -15691,8 +15712,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15702,7 +15723,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::DeleteSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15735,7 +15756,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15745,7 +15766,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .delete_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSessionEntityTypeRequest::name].
@@ -15758,8 +15779,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15769,8 +15790,8 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15804,7 +15825,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15814,15 +15835,15 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15831,17 +15852,17 @@ pub mod session_entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15871,8 +15892,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15882,7 +15903,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15913,7 +15934,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15923,7 +15944,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -15934,8 +15955,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15945,8 +15966,8 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15982,7 +16003,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15992,15 +16013,15 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16009,17 +16030,17 @@ pub mod session_entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16055,8 +16076,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16066,7 +16087,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16097,7 +16118,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16107,7 +16128,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -16118,8 +16139,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16129,7 +16150,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::session_entity_types::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16162,7 +16183,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16172,7 +16193,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -16183,8 +16204,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16198,7 +16219,7 @@ pub mod test_cases {
     /// A builder for [TestCases][crate::client::TestCases].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::test_cases::ClientBuilder;
     /// # use client::TestCases;
@@ -16208,19 +16229,18 @@ pub mod test_cases {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TestCases;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TestCases;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -16231,7 +16251,7 @@ pub mod test_cases {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TestCases>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -16244,7 +16264,7 @@ pub mod test_cases {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -16254,8 +16274,8 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::ListTestCases;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16286,7 +16306,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16296,13 +16316,13 @@ pub mod test_cases {
             (*self.0.stub)
                 .list_test_cases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTestCasesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTestCasesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16311,15 +16331,17 @@ pub mod test_cases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTestCasesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTestCasesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16354,8 +16376,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTestCases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTestCases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16365,7 +16387,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::BatchDeleteTestCases;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16396,7 +16418,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16406,7 +16428,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .batch_delete_test_cases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchDeleteTestCasesRequest::parent].
@@ -16432,8 +16454,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeleteTestCases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeleteTestCases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16443,7 +16465,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::GetTestCase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16471,7 +16493,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16481,7 +16503,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .get_test_case(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTestCaseRequest::name].
@@ -16494,8 +16516,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTestCase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTestCase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16505,7 +16527,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::CreateTestCase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16533,7 +16555,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16543,7 +16565,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .create_test_case(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTestCaseRequest::parent].
@@ -16578,8 +16600,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTestCase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTestCase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16589,7 +16611,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::UpdateTestCase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16617,7 +16639,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16627,7 +16649,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .update_test_case(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [test_case][crate::model::UpdateTestCaseRequest::test_case].
@@ -16676,8 +16698,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTestCase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTestCase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16687,7 +16709,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::RunTestCase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16716,7 +16738,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16731,7 +16753,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .run_test_case(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `run_test_case`.
@@ -16750,7 +16772,7 @@ pub mod test_cases {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16793,8 +16815,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RunTestCase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RunTestCase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16804,7 +16826,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::BatchRunTestCases;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16836,7 +16858,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16851,7 +16873,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .batch_run_test_cases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_run_test_cases`.
@@ -16870,7 +16892,7 @@ pub mod test_cases {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16926,8 +16948,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchRunTestCases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchRunTestCases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16937,7 +16959,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::CalculateCoverage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16968,7 +16990,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16978,7 +17000,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .calculate_coverage(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [agent][crate::model::CalculateCoverageRequest::agent].
@@ -17002,8 +17024,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CalculateCoverage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CalculateCoverage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17013,7 +17035,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::ImportTestCases;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17042,7 +17064,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17057,7 +17079,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .import_test_cases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_test_cases`.
@@ -17076,7 +17098,7 @@ pub mod test_cases {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17145,8 +17167,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportTestCases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportTestCases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17156,7 +17178,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::ExportTestCases;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17185,7 +17207,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17200,7 +17222,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .export_test_cases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_test_cases`.
@@ -17219,7 +17241,7 @@ pub mod test_cases {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17295,8 +17317,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportTestCases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportTestCases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17306,8 +17328,8 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::ListTestCaseResults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17341,7 +17363,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17351,14 +17373,16 @@ pub mod test_cases {
             (*self.0.stub)
                 .list_test_case_results(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTestCaseResultsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTestCaseResultsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -17366,17 +17390,17 @@ pub mod test_cases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTestCaseResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17408,8 +17432,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTestCaseResults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTestCaseResults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17419,7 +17443,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::GetTestCaseResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17450,7 +17474,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17460,7 +17484,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .get_test_case_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTestCaseResultRequest::name].
@@ -17473,8 +17497,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTestCaseResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTestCaseResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17484,8 +17508,8 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17519,7 +17543,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17529,15 +17553,15 @@ pub mod test_cases {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17546,17 +17570,17 @@ pub mod test_cases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17586,8 +17610,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17597,7 +17621,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17628,7 +17652,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17638,7 +17662,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -17649,8 +17673,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17660,8 +17684,8 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17697,7 +17721,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17707,15 +17731,15 @@ pub mod test_cases {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17724,17 +17748,17 @@ pub mod test_cases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17770,8 +17794,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17781,7 +17805,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17812,7 +17836,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17822,7 +17846,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -17833,8 +17857,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17844,7 +17868,7 @@ pub mod test_cases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::test_cases::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17877,7 +17901,7 @@ pub mod test_cases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17887,7 +17911,7 @@ pub mod test_cases {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -17898,8 +17922,8 @@ pub mod test_cases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17913,7 +17937,7 @@ pub mod tools {
     /// A builder for [Tools][crate::client::Tools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::tools::ClientBuilder;
     /// # use client::Tools;
@@ -17923,19 +17947,18 @@ pub mod tools {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Tools;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Tools;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -17946,7 +17969,7 @@ pub mod tools {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Tools>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -17957,7 +17980,7 @@ pub mod tools {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -17967,7 +17990,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::CreateTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17993,7 +18016,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18003,7 +18026,7 @@ pub mod tools {
             (*self.0.stub)
                 .create_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateToolRequest::parent].
@@ -18038,8 +18061,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18049,8 +18072,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::ListTools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18079,7 +18102,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18089,13 +18112,13 @@ pub mod tools {
             (*self.0.stub)
                 .list_tools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListToolsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListToolsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18104,15 +18127,15 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListToolsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListToolsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18138,8 +18161,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18149,7 +18172,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::GetTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18175,7 +18198,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18185,7 +18208,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetToolRequest::name].
@@ -18198,8 +18221,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18209,7 +18232,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::UpdateTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18235,7 +18258,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18245,7 +18268,7 @@ pub mod tools {
             (*self.0.stub)
                 .update_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tool][crate::model::UpdateToolRequest::tool].
@@ -18290,8 +18313,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18301,7 +18324,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::DeleteTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18327,7 +18350,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18337,7 +18360,7 @@ pub mod tools {
             (*self.0.stub)
                 .delete_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteToolRequest::name].
@@ -18356,8 +18379,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18367,8 +18390,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::ListToolVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18400,7 +18423,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18410,14 +18433,16 @@ pub mod tools {
             (*self.0.stub)
                 .list_tool_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListToolVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListToolVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -18425,15 +18450,17 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListToolVersionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListToolVersionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18459,8 +18486,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListToolVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListToolVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18470,7 +18497,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::CreateToolVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18499,7 +18526,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18509,7 +18536,7 @@ pub mod tools {
             (*self.0.stub)
                 .create_tool_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateToolVersionRequest::parent].
@@ -18544,8 +18571,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateToolVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateToolVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18555,7 +18582,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::GetToolVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18581,7 +18608,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18591,7 +18618,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_tool_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetToolVersionRequest::name].
@@ -18604,8 +18631,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetToolVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetToolVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18615,7 +18642,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::DeleteToolVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18644,7 +18671,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18654,7 +18681,7 @@ pub mod tools {
             (*self.0.stub)
                 .delete_tool_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteToolVersionRequest::name].
@@ -18673,8 +18700,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteToolVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteToolVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18684,7 +18711,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::RestoreToolVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18713,7 +18740,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18723,7 +18750,7 @@ pub mod tools {
             (*self.0.stub)
                 .restore_tool_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RestoreToolVersionRequest::name].
@@ -18736,8 +18763,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreToolVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreToolVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18747,8 +18774,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18780,7 +18807,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18790,15 +18817,15 @@ pub mod tools {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18807,17 +18834,17 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18847,8 +18874,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18858,7 +18885,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18887,7 +18914,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18897,7 +18924,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -18908,8 +18935,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18919,8 +18946,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18954,7 +18981,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18964,15 +18991,15 @@ pub mod tools {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18981,17 +19008,17 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19027,8 +19054,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19038,7 +19065,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19067,7 +19094,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19077,7 +19104,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -19088,8 +19115,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19099,7 +19126,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::tools::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19130,7 +19157,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19140,7 +19167,7 @@ pub mod tools {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -19151,8 +19178,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19166,7 +19193,7 @@ pub mod transition_route_groups {
     /// A builder for [TransitionRouteGroups][crate::client::TransitionRouteGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::transition_route_groups::ClientBuilder;
     /// # use client::TransitionRouteGroups;
@@ -19176,19 +19203,18 @@ pub mod transition_route_groups {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::TransitionRouteGroups;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = TransitionRouteGroups;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -19199,7 +19225,7 @@ pub mod transition_route_groups {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::TransitionRouteGroups>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -19212,7 +19238,7 @@ pub mod transition_route_groups {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -19222,8 +19248,8 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::ListTransitionRouteGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19259,7 +19285,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19269,15 +19295,15 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .list_transition_route_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListTransitionRouteGroupsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19286,17 +19312,17 @@ pub mod transition_route_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTransitionRouteGroupsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19328,8 +19354,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTransitionRouteGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTransitionRouteGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19339,7 +19365,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::GetTransitionRouteGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19372,7 +19398,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19382,7 +19408,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .get_transition_route_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTransitionRouteGroupRequest::name].
@@ -19401,8 +19427,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTransitionRouteGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTransitionRouteGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19412,7 +19438,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::CreateTransitionRouteGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19445,7 +19471,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19455,7 +19481,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .create_transition_route_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTransitionRouteGroupRequest::parent].
@@ -19496,8 +19522,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTransitionRouteGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTransitionRouteGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19507,7 +19533,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::UpdateTransitionRouteGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19540,7 +19566,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19550,7 +19576,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .update_transition_route_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [transition_route_group][crate::model::UpdateTransitionRouteGroupRequest::transition_route_group].
@@ -19601,8 +19627,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTransitionRouteGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTransitionRouteGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19612,7 +19638,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::DeleteTransitionRouteGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19645,7 +19671,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19655,7 +19681,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .delete_transition_route_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTransitionRouteGroupRequest::name].
@@ -19674,8 +19700,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTransitionRouteGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTransitionRouteGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19685,8 +19711,8 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19720,7 +19746,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19730,15 +19756,15 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19747,17 +19773,17 @@ pub mod transition_route_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19787,8 +19813,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19798,7 +19824,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19829,7 +19855,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19839,7 +19865,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -19850,8 +19876,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19861,8 +19887,8 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19898,7 +19924,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19908,15 +19934,15 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19925,17 +19951,17 @@ pub mod transition_route_groups {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19971,8 +19997,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19982,7 +20008,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20013,7 +20039,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20023,7 +20049,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -20034,8 +20060,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20045,7 +20071,7 @@ pub mod transition_route_groups {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::transition_route_groups::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20078,7 +20104,7 @@ pub mod transition_route_groups {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20088,7 +20114,7 @@ pub mod transition_route_groups {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -20099,8 +20125,8 @@ pub mod transition_route_groups {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20114,7 +20140,7 @@ pub mod versions {
     /// A builder for [Versions][crate::client::Versions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::versions::ClientBuilder;
     /// # use client::Versions;
@@ -20124,19 +20150,18 @@ pub mod versions {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Versions;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Versions;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -20147,7 +20172,7 @@ pub mod versions {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Versions>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -20158,7 +20183,7 @@ pub mod versions {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -20168,8 +20193,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::ListVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20198,7 +20223,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20208,13 +20233,13 @@ pub mod versions {
             (*self.0.stub)
                 .list_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVersionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVersionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20223,15 +20248,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVersionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVersionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20257,8 +20284,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20268,7 +20295,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::GetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20294,7 +20321,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20304,7 +20331,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVersionRequest::name].
@@ -20317,8 +20344,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20328,7 +20355,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::CreateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -20355,7 +20382,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20370,7 +20397,7 @@ pub mod versions {
             (*self.0.stub)
                 .create_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_version`.
@@ -20389,7 +20416,7 @@ pub mod versions {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -20448,8 +20475,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20459,7 +20486,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::UpdateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20485,7 +20512,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20495,7 +20522,7 @@ pub mod versions {
             (*self.0.stub)
                 .update_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [version][crate::model::UpdateVersionRequest::version].
@@ -20544,8 +20571,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20555,7 +20582,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::DeleteVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20581,7 +20608,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20591,7 +20618,7 @@ pub mod versions {
             (*self.0.stub)
                 .delete_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteVersionRequest::name].
@@ -20604,8 +20631,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20615,7 +20642,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::LoadVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -20642,7 +20669,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20657,7 +20684,7 @@ pub mod versions {
             (*self.0.stub)
                 .load_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `load_version`.
@@ -20668,7 +20695,7 @@ pub mod versions {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -20711,8 +20738,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LoadVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LoadVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20722,7 +20749,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::CompareVersions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20748,7 +20775,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20758,7 +20785,7 @@ pub mod versions {
             (*self.0.stub)
                 .compare_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [base_version][crate::model::CompareVersionsRequest::base_version].
@@ -20785,8 +20812,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CompareVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CompareVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20796,8 +20823,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20829,7 +20856,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20839,15 +20866,15 @@ pub mod versions {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20856,17 +20883,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20896,8 +20923,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20907,7 +20934,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20936,7 +20963,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20946,7 +20973,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -20957,8 +20984,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20968,8 +20995,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21003,7 +21030,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21013,15 +21040,15 @@ pub mod versions {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21030,17 +21057,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21076,8 +21103,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21087,7 +21114,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21116,7 +21143,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21126,7 +21153,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -21137,8 +21164,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21148,7 +21175,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::versions::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21179,7 +21206,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21189,7 +21216,7 @@ pub mod versions {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -21200,8 +21227,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21215,7 +21242,7 @@ pub mod webhooks {
     /// A builder for [Webhooks][crate::client::Webhooks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::*;
     /// # use builder::webhooks::ClientBuilder;
     /// # use client::Webhooks;
@@ -21225,19 +21252,18 @@ pub mod webhooks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Webhooks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Webhooks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -21248,7 +21274,7 @@ pub mod webhooks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Webhooks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -21259,7 +21285,7 @@ pub mod webhooks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -21269,8 +21295,8 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::ListWebhooks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21299,7 +21325,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21309,13 +21335,13 @@ pub mod webhooks {
             (*self.0.stub)
                 .list_webhooks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListWebhooksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListWebhooksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21324,15 +21350,17 @@ pub mod webhooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListWebhooksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListWebhooksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21358,8 +21386,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListWebhooks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListWebhooks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21369,7 +21397,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::GetWebhook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21395,7 +21423,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21405,7 +21433,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .get_webhook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetWebhookRequest::name].
@@ -21418,8 +21446,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetWebhook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetWebhook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21429,7 +21457,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::CreateWebhook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21455,7 +21483,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21465,7 +21493,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .create_webhook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateWebhookRequest::parent].
@@ -21500,8 +21528,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateWebhook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateWebhook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21511,7 +21539,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::UpdateWebhook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21537,7 +21565,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21547,7 +21575,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .update_webhook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [webhook][crate::model::UpdateWebhookRequest::webhook].
@@ -21592,8 +21620,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateWebhook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateWebhook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21603,7 +21631,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::DeleteWebhook;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21629,7 +21657,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21639,7 +21667,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .delete_webhook(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteWebhookRequest::name].
@@ -21658,8 +21686,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteWebhook {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteWebhook {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21669,8 +21697,8 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21702,7 +21730,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21712,15 +21740,15 @@ pub mod webhooks {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21729,17 +21757,17 @@ pub mod webhooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21769,8 +21797,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21780,7 +21808,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21809,7 +21837,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21819,7 +21847,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -21830,8 +21858,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21841,8 +21869,8 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21876,7 +21904,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21886,15 +21914,15 @@ pub mod webhooks {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21903,17 +21931,17 @@ pub mod webhooks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21949,8 +21977,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21960,7 +21988,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21989,7 +22017,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21999,7 +22027,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -22010,8 +22038,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22021,7 +22049,7 @@ pub mod webhooks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_cx_v3::builder::webhooks::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_cx_v3::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22052,7 +22080,7 @@ pub mod webhooks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22062,7 +22090,7 @@ pub mod webhooks {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -22073,8 +22101,8 @@ pub mod webhooks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/client.rs b/src/generated/cloud/dialogflow/cx/v3/src/client.rs
index d20e45bfb6..7f52eadf1c 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/client.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Agents;
 /// let client = Agents::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -71,13 +71,13 @@ impl Agents {
     /// Returns a builder for [Agents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Agents;
     /// let client = Agents::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::agents::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::agents::client::Factory)
+        crate::new_client_builder(super::builder::agents::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,14 +95,14 @@ impl Agents {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Agents>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Agents>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -111,13 +111,13 @@ impl Agents {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Agents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Agents> {
         super::transport::Agents::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Agents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Agents> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Agents::new)
@@ -272,7 +272,7 @@ impl Agents {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Changelogs;
 /// let client = Changelogs::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -323,13 +323,13 @@ impl Changelogs {
     /// Returns a builder for [Changelogs].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Changelogs;
     /// let client = Changelogs::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::changelogs::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::changelogs::client::Factory)
+        crate::new_client_builder(super::builder::changelogs::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -347,14 +347,14 @@ impl Changelogs {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Changelogs>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Changelogs>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -363,13 +363,13 @@ impl Changelogs {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Changelogs> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Changelogs> {
         super::transport::Changelogs::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Changelogs> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Changelogs> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Changelogs::new)
@@ -421,7 +421,7 @@ impl Changelogs {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Deployments;
 /// let client = Deployments::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -472,13 +472,13 @@ impl Deployments {
     /// Returns a builder for [Deployments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Deployments;
     /// let client = Deployments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::deployments::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::deployments::client::Factory)
+        crate::new_client_builder(super::builder::deployments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -496,14 +496,14 @@ impl Deployments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Deployments>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Deployments>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -512,13 +512,13 @@ impl Deployments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Deployments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Deployments> {
         super::transport::Deployments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Deployments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Deployments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Deployments::new)
@@ -576,7 +576,7 @@ impl Deployments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::EntityTypes;
 /// let client = EntityTypes::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -627,13 +627,13 @@ impl EntityTypes {
     /// Returns a builder for [EntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::EntityTypes;
     /// let client = EntityTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::entity_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::entity_types::client::Factory)
+        crate::new_client_builder(super::builder::entity_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -651,14 +651,14 @@ impl EntityTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EntityTypes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EntityTypes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -667,13 +667,13 @@ impl EntityTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EntityTypes> {
         super::transport::EntityTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EntityTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EntityTypes::new)
@@ -782,7 +782,7 @@ impl EntityTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Environments;
 /// let client = Environments::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -834,13 +834,13 @@ impl Environments {
     /// Returns a builder for [Environments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Environments;
     /// let client = Environments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::environments::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::environments::client::Factory)
+        crate::new_client_builder(super::builder::environments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -858,14 +858,14 @@ impl Environments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Environments>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Environments>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -874,13 +874,13 @@ impl Environments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Environments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Environments> {
         super::transport::Environments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Environments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Environments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Environments::new)
@@ -1074,7 +1074,7 @@ impl Environments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Examples;
 /// let client = Examples::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1125,13 +1125,13 @@ impl Examples {
     /// Returns a builder for [Examples].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Examples;
     /// let client = Examples::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::examples::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::examples::client::Factory)
+        crate::new_client_builder(super::builder::examples::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1149,14 +1149,14 @@ impl Examples {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Examples>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Examples>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1165,13 +1165,13 @@ impl Examples {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Examples> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Examples> {
         super::transport::Examples::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Examples> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Examples> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Examples::new)
@@ -1238,7 +1238,7 @@ impl Examples {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Experiments;
 /// let client = Experiments::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1289,13 +1289,13 @@ impl Experiments {
     /// Returns a builder for [Experiments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Experiments;
     /// let client = Experiments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::experiments::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::experiments::client::Factory)
+        crate::new_client_builder(super::builder::experiments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1313,14 +1313,14 @@ impl Experiments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Experiments>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Experiments>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1329,13 +1329,13 @@ impl Experiments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Experiments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Experiments> {
         super::transport::Experiments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Experiments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Experiments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Experiments::new)
@@ -1435,7 +1435,7 @@ impl Experiments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Flows;
 /// let client = Flows::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1486,13 +1486,13 @@ impl Flows {
     /// Returns a builder for [Flows].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Flows;
     /// let client = Flows::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::flows::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::flows::client::Factory)
+        crate::new_client_builder(super::builder::flows::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1510,14 +1510,14 @@ impl Flows {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Flows>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Flows>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1526,13 +1526,13 @@ impl Flows {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Flows> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Flows> {
         super::transport::Flows::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Flows> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Flows> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Flows::new)
@@ -1708,7 +1708,7 @@ impl Flows {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Generators;
 /// let client = Generators::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1759,13 +1759,13 @@ impl Generators {
     /// Returns a builder for [Generators].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Generators;
     /// let client = Generators::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::generators::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::generators::client::Factory)
+        crate::new_client_builder(super::builder::generators::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1783,14 +1783,14 @@ impl Generators {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Generators>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Generators>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1799,13 +1799,13 @@ impl Generators {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Generators> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Generators> {
         super::transport::Generators::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Generators> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Generators> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Generators::new)
@@ -1872,7 +1872,7 @@ impl Generators {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Intents;
 /// let client = Intents::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1923,13 +1923,13 @@ impl Intents {
     /// Returns a builder for [Intents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Intents;
     /// let client = Intents::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::intents::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::intents::client::Factory)
+        crate::new_client_builder(super::builder::intents::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1947,14 +1947,14 @@ impl Intents {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Intents>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Intents>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1963,13 +1963,13 @@ impl Intents {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Intents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Intents> {
         super::transport::Intents::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Intents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Intents> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Intents::new)
@@ -2102,7 +2102,7 @@ impl Intents {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Pages;
 /// let client = Pages::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2153,13 +2153,13 @@ impl Pages {
     /// Returns a builder for [Pages].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Pages;
     /// let client = Pages::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::pages::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::pages::client::Factory)
+        crate::new_client_builder(super::builder::pages::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2177,14 +2177,14 @@ impl Pages {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Pages>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Pages>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2193,13 +2193,13 @@ impl Pages {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Pages> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Pages> {
         super::transport::Pages::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Pages> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Pages> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Pages::new)
@@ -2278,7 +2278,7 @@ impl Pages {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Playbooks;
 /// let client = Playbooks::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2329,13 +2329,13 @@ impl Playbooks {
     /// Returns a builder for [Playbooks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Playbooks;
     /// let client = Playbooks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::playbooks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::playbooks::client::Factory)
+        crate::new_client_builder(super::builder::playbooks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2353,14 +2353,14 @@ impl Playbooks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Playbooks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Playbooks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2369,13 +2369,13 @@ impl Playbooks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Playbooks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Playbooks> {
         super::transport::Playbooks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Playbooks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Playbooks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Playbooks::new)
@@ -2501,7 +2501,7 @@ impl Playbooks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::SecuritySettingsService;
 /// let client = SecuritySettingsService::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2550,15 +2550,13 @@ impl SecuritySettingsService {
     /// Returns a builder for [SecuritySettingsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::SecuritySettingsService;
     /// let client = SecuritySettingsService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::security_settings_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::security_settings_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::security_settings_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2576,16 +2574,15 @@ impl SecuritySettingsService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::SecuritySettingsService>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SecuritySettingsService>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2594,13 +2591,13 @@ impl SecuritySettingsService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SecuritySettingsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SecuritySettingsService> {
         super::transport::SecuritySettingsService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SecuritySettingsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SecuritySettingsService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SecuritySettingsService::new)
@@ -2687,7 +2684,7 @@ impl SecuritySettingsService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Sessions;
 /// let client = Sessions::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2741,13 +2738,13 @@ impl Sessions {
     /// Returns a builder for [Sessions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Sessions;
     /// let client = Sessions::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::sessions::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::sessions::client::Factory)
+        crate::new_client_builder(super::builder::sessions::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2765,14 +2762,14 @@ impl Sessions {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Sessions>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Sessions>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2781,13 +2778,13 @@ impl Sessions {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Sessions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Sessions> {
         super::transport::Sessions::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Sessions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Sessions> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Sessions::new)
@@ -2867,7 +2864,7 @@ impl Sessions {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::SessionEntityTypes;
 /// let client = SessionEntityTypes::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2919,15 +2916,13 @@ impl SessionEntityTypes {
     /// Returns a builder for [SessionEntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::SessionEntityTypes;
     /// let client = SessionEntityTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::session_entity_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::session_entity_types::client::Factory,
-        )
+        crate::new_client_builder(super::builder::session_entity_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2945,14 +2940,14 @@ impl SessionEntityTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SessionEntityTypes>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SessionEntityTypes>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2962,13 +2957,13 @@ impl SessionEntityTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionEntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionEntityTypes> {
         super::transport::SessionEntityTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionEntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionEntityTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SessionEntityTypes::new)
@@ -3045,7 +3040,7 @@ impl SessionEntityTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::TestCases;
 /// let client = TestCases::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3098,13 +3093,13 @@ impl TestCases {
     /// Returns a builder for [TestCases].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::TestCases;
     /// let client = TestCases::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::test_cases::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::test_cases::client::Factory)
+        crate::new_client_builder(super::builder::test_cases::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3122,14 +3117,14 @@ impl TestCases {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TestCases>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TestCases>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3138,13 +3133,13 @@ impl TestCases {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TestCases> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TestCases> {
         super::transport::TestCases::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TestCases> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TestCases> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TestCases::new)
@@ -3338,7 +3333,7 @@ impl TestCases {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Tools;
 /// let client = Tools::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3389,13 +3384,13 @@ impl Tools {
     /// Returns a builder for [Tools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Tools;
     /// let client = Tools::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::tools::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::tools::client::Factory)
+        crate::new_client_builder(super::builder::tools::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3413,14 +3408,14 @@ impl Tools {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Tools>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Tools>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3429,13 +3424,13 @@ impl Tools {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Tools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Tools> {
         super::transport::Tools::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Tools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Tools> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Tools::new)
@@ -3551,7 +3546,7 @@ impl Tools {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::TransitionRouteGroups;
 /// let client = TransitionRouteGroups::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3603,15 +3598,13 @@ impl TransitionRouteGroups {
     /// Returns a builder for [TransitionRouteGroups].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::TransitionRouteGroups;
     /// let client = TransitionRouteGroups::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::transition_route_groups::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::transition_route_groups::client::Factory,
-        )
+        crate::new_client_builder(super::builder::transition_route_groups::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3629,14 +3622,14 @@ impl TransitionRouteGroups {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::TransitionRouteGroups>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::TransitionRouteGroups>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3646,13 +3639,13 @@ impl TransitionRouteGroups {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TransitionRouteGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TransitionRouteGroups> {
         super::transport::TransitionRouteGroups::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::TransitionRouteGroups> {
+    ) -> crate::ClientBuilderResult<impl super::stub::TransitionRouteGroups> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::TransitionRouteGroups::new)
@@ -3754,7 +3747,7 @@ impl TransitionRouteGroups {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Versions;
 /// let client = Versions::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3805,13 +3798,13 @@ impl Versions {
     /// Returns a builder for [Versions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Versions;
     /// let client = Versions::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::versions::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::versions::client::Factory)
+        crate::new_client_builder(super::builder::versions::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3829,14 +3822,14 @@ impl Versions {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Versions>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Versions>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3845,13 +3838,13 @@ impl Versions {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Versions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Versions> {
         super::transport::Versions::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Versions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Versions> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Versions::new)
@@ -3979,7 +3972,7 @@ impl Versions {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_cx_v3::client::Webhooks;
 /// let client = Webhooks::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -4030,13 +4023,13 @@ impl Webhooks {
     /// Returns a builder for [Webhooks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_cx_v3::client::Webhooks;
     /// let client = Webhooks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::webhooks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::webhooks::client::Factory)
+        crate::new_client_builder(super::builder::webhooks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4054,14 +4047,14 @@ impl Webhooks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Webhooks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Webhooks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4070,13 +4063,13 @@ impl Webhooks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Webhooks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Webhooks> {
         super::transport::Webhooks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Webhooks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Webhooks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Webhooks::new)
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/lib.rs b/src/generated/cloud/dialogflow/cx/v3/src/lib.rs
index 66f682ae37..f142c83169 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/lib.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/lib.rs
@@ -75,8 +75,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -155,3 +155,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/model.rs b/src/generated/cloud/dialogflow/cx/v3/src/model.rs
index 5d4a623873..1537ef2c9a 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/model.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -2079,7 +2079,7 @@ impl wkt::message::Message for ListAgentsResponse {
 
 #[cfg(feature = "agents")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAgentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAgentsResponse {
     type PageItem = crate::model::Agent;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4680,7 +4680,7 @@ impl wkt::message::Message for ListChangelogsResponse {
 
 #[cfg(feature = "changelogs")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListChangelogsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListChangelogsResponse {
     type PageItem = crate::model::Changelog;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7054,7 +7054,7 @@ impl wkt::message::Message for ListDeploymentsResponse {
 
 #[cfg(feature = "deployments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
     type PageItem = crate::model::Deployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9150,7 +9150,7 @@ impl wkt::message::Message for ListEntityTypesResponse {
 
 #[cfg(feature = "entity-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntityTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntityTypesResponse {
     type PageItem = crate::model::EntityType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10074,7 +10074,7 @@ impl wkt::message::Message for ListEnvironmentsResponse {
 
 #[cfg(feature = "environments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEnvironmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEnvironmentsResponse {
     type PageItem = crate::model::Environment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10498,7 +10498,7 @@ impl wkt::message::Message for LookupEnvironmentHistoryResponse {
 
 #[cfg(feature = "environments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for LookupEnvironmentHistoryResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for LookupEnvironmentHistoryResponse {
     type PageItem = crate::model::Environment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11069,7 +11069,7 @@ impl wkt::message::Message for ListContinuousTestResultsResponse {
 
 #[cfg(feature = "environments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListContinuousTestResultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListContinuousTestResultsResponse {
     type PageItem = crate::model::ContinuousTestResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11556,7 +11556,7 @@ impl wkt::message::Message for ListExamplesResponse {
 
 #[cfg(feature = "examples")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListExamplesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListExamplesResponse {
     type PageItem = crate::model::Example;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -14249,7 +14249,7 @@ impl wkt::message::Message for ListExperimentsResponse {
 
 #[cfg(feature = "experiments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListExperimentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListExperimentsResponse {
     type PageItem = crate::model::Experiment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -15929,7 +15929,7 @@ impl wkt::message::Message for ListFlowsResponse {
 
 #[cfg(feature = "flows")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFlowsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFlowsResponse {
     type PageItem = crate::model::Flow;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -19180,7 +19180,7 @@ impl wkt::message::Message for ListGeneratorsResponse {
 
 #[cfg(feature = "generators")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGeneratorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGeneratorsResponse {
     type PageItem = crate::model::Generator;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -20271,7 +20271,7 @@ impl wkt::message::Message for ListIntentsResponse {
 
 #[cfg(feature = "intents")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIntentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIntentsResponse {
     type PageItem = crate::model::Intent;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23231,7 +23231,7 @@ impl wkt::message::Message for ListPagesResponse {
 
 #[cfg(feature = "pages")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPagesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPagesResponse {
     type PageItem = crate::model::Page;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -24836,7 +24836,7 @@ impl wkt::message::Message for ListPlaybooksResponse {
 
 #[cfg(feature = "playbooks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPlaybooksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPlaybooksResponse {
     type PageItem = crate::model::Playbook;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -26293,7 +26293,7 @@ impl wkt::message::Message for ListPlaybookVersionsResponse {
 
 #[cfg(feature = "playbooks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPlaybookVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPlaybookVersionsResponse {
     type PageItem = crate::model::PlaybookVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -30686,7 +30686,7 @@ impl wkt::message::Message for ListSecuritySettingsResponse {
 
 #[cfg(feature = "security-settings-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSecuritySettingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSecuritySettingsResponse {
     type PageItem = crate::model::SecuritySettings;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -38791,7 +38791,7 @@ impl wkt::message::Message for ListSessionEntityTypesResponse {
 
 #[cfg(feature = "session-entity-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSessionEntityTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSessionEntityTypesResponse {
     type PageItem = crate::model::SessionEntityType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -41858,7 +41858,7 @@ impl wkt::message::Message for ListTestCasesResponse {
 
 #[cfg(feature = "test-cases")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTestCasesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTestCasesResponse {
     type PageItem = crate::model::TestCase;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43601,7 +43601,7 @@ impl wkt::message::Message for ListTestCaseResultsResponse {
 
 #[cfg(feature = "test-cases")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTestCaseResultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTestCaseResultsResponse {
     type PageItem = crate::model::TestCaseResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43874,7 +43874,7 @@ impl wkt::message::Message for ListToolsResponse {
 
 #[cfg(feature = "tools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListToolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListToolsResponse {
     type PageItem = crate::model::Tool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -46383,7 +46383,7 @@ impl wkt::message::Message for ListToolVersionsResponse {
 
 #[cfg(feature = "tools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListToolVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListToolVersionsResponse {
     type PageItem = crate::model::ToolVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -48436,7 +48436,7 @@ impl wkt::message::Message for ListTransitionRouteGroupsResponse {
 
 #[cfg(feature = "transition-route-groups")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTransitionRouteGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTransitionRouteGroupsResponse {
     type PageItem = crate::model::TransitionRouteGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -49886,7 +49886,7 @@ impl wkt::message::Message for ListVersionsResponse {
 
 #[cfg(feature = "versions")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVersionsResponse {
     type PageItem = crate::model::Version;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -51959,7 +51959,7 @@ impl wkt::message::Message for ListWebhooksResponse {
 
 #[cfg(feature = "webhooks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListWebhooksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListWebhooksResponse {
     type PageItem = crate::model::Webhook;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/stub.rs b/src/generated/cloud/dialogflow/cx/v3/src/stub.rs
index c4db63a854..b8b382db39 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/stub.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/stub.rs
@@ -44,9 +44,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn list_agents(
         &self,
         _req: crate::model::ListAgentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAgentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAgentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,10 +55,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_agent(
         &self,
         _req: crate::model::GetAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Agent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Agent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -66,10 +65,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn create_agent(
         &self,
         _req: crate::model::CreateAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Agent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Agent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -77,10 +75,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn update_agent(
         &self,
         _req: crate::model::UpdateAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Agent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Agent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -88,8 +85,8 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn delete_agent(
         &self,
         _req: crate::model::DeleteAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +94,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn export_agent(
         &self,
         _req: crate::model::ExportAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +105,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn restore_agent(
         &self,
         _req: crate::model::RestoreAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +116,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn validate_agent(
         &self,
         _req: crate::model::ValidateAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AgentValidationResult>>,
+        Output = crate::Result<crate::Response<crate::model::AgentValidationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +127,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_agent_validation_result(
         &self,
         _req: crate::model::GetAgentValidationResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AgentValidationResult>>,
+        Output = crate::Result<crate::Response<crate::model::AgentValidationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +138,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_generative_settings(
         &self,
         _req: crate::model::GetGenerativeSettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerativeSettings>>,
+        Output = crate::Result<crate::Response<crate::model::GenerativeSettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +149,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn update_generative_settings(
         &self,
         _req: crate::model::UpdateGenerativeSettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerativeSettings>>,
+        Output = crate::Result<crate::Response<crate::model::GenerativeSettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,10 +160,10 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -176,9 +173,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,10 +184,10 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -200,9 +197,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,8 +208,8 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -222,9 +219,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -233,9 +230,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -257,9 +254,9 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn list_changelogs(
         &self,
         _req: crate::model::ListChangelogsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListChangelogsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListChangelogsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -268,10 +265,9 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn get_changelog(
         &self,
         _req: crate::model::GetChangelogRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Changelog>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Changelog>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -279,10 +275,10 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -292,9 +288,9 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -303,10 +299,10 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -316,9 +312,9 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -327,8 +323,8 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -351,9 +347,9 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn list_deployments(
         &self,
         _req: crate::model::ListDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -362,10 +358,9 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn get_deployment(
         &self,
         _req: crate::model::GetDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -373,10 +368,10 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -386,9 +381,9 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -397,10 +392,10 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -410,9 +405,9 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -421,8 +416,8 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -445,10 +440,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn get_entity_type(
         &self,
         _req: crate::model::GetEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -456,10 +450,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn create_entity_type(
         &self,
         _req: crate::model::CreateEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -467,10 +460,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn update_entity_type(
         &self,
         _req: crate::model::UpdateEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -478,8 +470,8 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn delete_entity_type(
         &self,
         _req: crate::model::DeleteEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -487,9 +479,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn list_entity_types(
         &self,
         _req: crate::model::ListEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntityTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -498,9 +490,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn export_entity_types(
         &self,
         _req: crate::model::ExportEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -509,9 +501,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn import_entity_types(
         &self,
         _req: crate::model::ImportEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -520,10 +512,10 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -533,9 +525,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -544,10 +536,10 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -557,9 +549,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -568,8 +560,8 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -579,9 +571,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -590,9 +582,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -614,9 +606,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_environments(
         &self,
         _req: crate::model::ListEnvironmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -625,10 +617,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_environment(
         &self,
         _req: crate::model::GetEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Environment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Environment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -636,9 +627,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn create_environment(
         &self,
         _req: crate::model::CreateEnvironmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -647,9 +638,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn update_environment(
         &self,
         _req: crate::model::UpdateEnvironmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -658,8 +649,8 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn delete_environment(
         &self,
         _req: crate::model::DeleteEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -667,11 +658,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn lookup_environment_history(
         &self,
         _req: crate::model::LookupEnvironmentHistoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::LookupEnvironmentHistoryResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::LookupEnvironmentHistoryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -680,9 +669,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn run_continuous_test(
         &self,
         _req: crate::model::RunContinuousTestRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -691,11 +680,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_continuous_test_results(
         &self,
         _req: crate::model::ListContinuousTestResultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListContinuousTestResultsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListContinuousTestResultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -704,9 +691,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn deploy_flow(
         &self,
         _req: crate::model::DeployFlowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -715,10 +702,10 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -728,9 +715,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -739,10 +726,10 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -752,9 +739,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -763,8 +750,8 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -774,9 +761,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -785,9 +772,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -809,10 +796,9 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn create_example(
         &self,
         _req: crate::model::CreateExampleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Example>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Example>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -820,8 +806,8 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn delete_example(
         &self,
         _req: crate::model::DeleteExampleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -829,9 +815,9 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn list_examples(
         &self,
         _req: crate::model::ListExamplesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListExamplesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListExamplesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -840,10 +826,9 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn get_example(
         &self,
         _req: crate::model::GetExampleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Example>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Example>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -851,10 +836,9 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn update_example(
         &self,
         _req: crate::model::UpdateExampleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Example>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Example>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -862,10 +846,10 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -875,9 +859,9 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -886,10 +870,10 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -899,9 +883,9 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -910,8 +894,8 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -934,9 +918,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn list_experiments(
         &self,
         _req: crate::model::ListExperimentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListExperimentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListExperimentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -945,10 +929,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn get_experiment(
         &self,
         _req: crate::model::GetExperimentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Experiment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Experiment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -956,10 +939,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn create_experiment(
         &self,
         _req: crate::model::CreateExperimentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Experiment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Experiment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -967,10 +949,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn update_experiment(
         &self,
         _req: crate::model::UpdateExperimentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Experiment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Experiment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -978,8 +959,8 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn delete_experiment(
         &self,
         _req: crate::model::DeleteExperimentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -987,10 +968,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn start_experiment(
         &self,
         _req: crate::model::StartExperimentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Experiment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Experiment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -998,10 +978,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn stop_experiment(
         &self,
         _req: crate::model::StopExperimentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Experiment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Experiment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1009,10 +988,10 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1022,9 +1001,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1033,10 +1012,10 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1046,9 +1025,9 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1057,8 +1036,8 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1081,10 +1060,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn create_flow(
         &self,
         _req: crate::model::CreateFlowRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Flow>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Flow>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1092,8 +1070,8 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn delete_flow(
         &self,
         _req: crate::model::DeleteFlowRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1101,9 +1079,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn list_flows(
         &self,
         _req: crate::model::ListFlowsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFlowsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFlowsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1112,10 +1090,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn get_flow(
         &self,
         _req: crate::model::GetFlowRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Flow>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Flow>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1123,10 +1100,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn update_flow(
         &self,
         _req: crate::model::UpdateFlowRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Flow>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Flow>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1134,9 +1110,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn train_flow(
         &self,
         _req: crate::model::TrainFlowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1145,9 +1121,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn validate_flow(
         &self,
         _req: crate::model::ValidateFlowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FlowValidationResult>>,
+        Output = crate::Result<crate::Response<crate::model::FlowValidationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1156,9 +1132,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn get_flow_validation_result(
         &self,
         _req: crate::model::GetFlowValidationResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FlowValidationResult>>,
+        Output = crate::Result<crate::Response<crate::model::FlowValidationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1167,9 +1143,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn import_flow(
         &self,
         _req: crate::model::ImportFlowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1178,9 +1154,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn export_flow(
         &self,
         _req: crate::model::ExportFlowRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1189,10 +1165,10 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1202,9 +1178,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1213,10 +1189,10 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1226,9 +1202,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1237,8 +1213,8 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1248,9 +1224,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1259,9 +1235,9 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1283,9 +1259,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn list_generators(
         &self,
         _req: crate::model::ListGeneratorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGeneratorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGeneratorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1294,10 +1270,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn get_generator(
         &self,
         _req: crate::model::GetGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Generator>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Generator>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1305,10 +1280,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn create_generator(
         &self,
         _req: crate::model::CreateGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Generator>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Generator>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1316,10 +1290,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn update_generator(
         &self,
         _req: crate::model::UpdateGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Generator>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Generator>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1327,8 +1300,8 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn delete_generator(
         &self,
         _req: crate::model::DeleteGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1336,10 +1309,10 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1349,9 +1322,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1360,10 +1333,10 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1373,9 +1346,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1384,8 +1357,8 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1408,9 +1381,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn list_intents(
         &self,
         _req: crate::model::ListIntentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIntentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIntentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1419,10 +1392,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn get_intent(
         &self,
         _req: crate::model::GetIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Intent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Intent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1430,10 +1402,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn create_intent(
         &self,
         _req: crate::model::CreateIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Intent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Intent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1441,10 +1412,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn update_intent(
         &self,
         _req: crate::model::UpdateIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Intent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Intent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1452,8 +1422,8 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn delete_intent(
         &self,
         _req: crate::model::DeleteIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1461,9 +1431,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn import_intents(
         &self,
         _req: crate::model::ImportIntentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1472,9 +1442,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn export_intents(
         &self,
         _req: crate::model::ExportIntentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1483,10 +1453,10 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1496,9 +1466,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1507,10 +1477,10 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1520,9 +1490,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1531,8 +1501,8 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1542,9 +1512,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1553,9 +1523,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1577,9 +1547,9 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn list_pages(
         &self,
         _req: crate::model::ListPagesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPagesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPagesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1588,10 +1558,9 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn get_page(
         &self,
         _req: crate::model::GetPageRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Page>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Page>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1599,10 +1568,9 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn create_page(
         &self,
         _req: crate::model::CreatePageRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Page>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Page>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1610,10 +1578,9 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn update_page(
         &self,
         _req: crate::model::UpdatePageRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Page>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Page>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1621,8 +1588,8 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn delete_page(
         &self,
         _req: crate::model::DeletePageRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1630,10 +1597,10 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1643,9 +1610,9 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1654,10 +1621,10 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1667,9 +1634,9 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1678,8 +1645,8 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1702,10 +1669,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn create_playbook(
         &self,
         _req: crate::model::CreatePlaybookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Playbook>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Playbook>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1713,8 +1679,8 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn delete_playbook(
         &self,
         _req: crate::model::DeletePlaybookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1722,9 +1688,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn list_playbooks(
         &self,
         _req: crate::model::ListPlaybooksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPlaybooksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPlaybooksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1733,10 +1699,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn get_playbook(
         &self,
         _req: crate::model::GetPlaybookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Playbook>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Playbook>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1744,9 +1709,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn export_playbook(
         &self,
         _req: crate::model::ExportPlaybookRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1755,9 +1720,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn import_playbook(
         &self,
         _req: crate::model::ImportPlaybookRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1766,10 +1731,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn update_playbook(
         &self,
         _req: crate::model::UpdatePlaybookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Playbook>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Playbook>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1777,9 +1741,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn create_playbook_version(
         &self,
         _req: crate::model::CreatePlaybookVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PlaybookVersion>>,
+        Output = crate::Result<crate::Response<crate::model::PlaybookVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1788,9 +1752,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn get_playbook_version(
         &self,
         _req: crate::model::GetPlaybookVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PlaybookVersion>>,
+        Output = crate::Result<crate::Response<crate::model::PlaybookVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1799,11 +1763,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn restore_playbook_version(
         &self,
         _req: crate::model::RestorePlaybookVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RestorePlaybookVersionResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RestorePlaybookVersionResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1812,9 +1774,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn list_playbook_versions(
         &self,
         _req: crate::model::ListPlaybookVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPlaybookVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPlaybookVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1823,8 +1785,8 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn delete_playbook_version(
         &self,
         _req: crate::model::DeletePlaybookVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1832,10 +1794,10 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1845,9 +1807,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1856,10 +1818,10 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1869,9 +1831,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1880,8 +1842,8 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1891,9 +1853,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1902,9 +1864,9 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1926,9 +1888,9 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn create_security_settings(
         &self,
         _req: crate::model::CreateSecuritySettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecuritySettings>>,
+        Output = crate::Result<crate::Response<crate::model::SecuritySettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1937,9 +1899,9 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn get_security_settings(
         &self,
         _req: crate::model::GetSecuritySettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecuritySettings>>,
+        Output = crate::Result<crate::Response<crate::model::SecuritySettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1948,9 +1910,9 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn update_security_settings(
         &self,
         _req: crate::model::UpdateSecuritySettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SecuritySettings>>,
+        Output = crate::Result<crate::Response<crate::model::SecuritySettings>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1959,9 +1921,9 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn list_security_settings(
         &self,
         _req: crate::model::ListSecuritySettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSecuritySettingsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSecuritySettingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1970,8 +1932,8 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn delete_security_settings(
         &self,
         _req: crate::model::DeleteSecuritySettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1979,10 +1941,10 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1992,9 +1954,9 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2003,10 +1965,10 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2016,9 +1978,9 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2027,8 +1989,8 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2051,9 +2013,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn detect_intent(
         &self,
         _req: crate::model::DetectIntentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DetectIntentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DetectIntentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2062,9 +2024,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn match_intent(
         &self,
         _req: crate::model::MatchIntentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MatchIntentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::MatchIntentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2073,9 +2035,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn fulfill_intent(
         &self,
         _req: crate::model::FulfillIntentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FulfillIntentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FulfillIntentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2084,9 +2046,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn submit_answer_feedback(
         &self,
         _req: crate::model::SubmitAnswerFeedbackRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnswerFeedback>>,
+        Output = crate::Result<crate::Response<crate::model::AnswerFeedback>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2095,10 +2057,10 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2108,9 +2070,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2119,10 +2081,10 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2132,9 +2094,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2143,8 +2105,8 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2167,11 +2129,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn list_session_entity_types(
         &self,
         _req: crate::model::ListSessionEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListSessionEntityTypesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListSessionEntityTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2180,9 +2140,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn get_session_entity_type(
         &self,
         _req: crate::model::GetSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionEntityType>>,
+        Output = crate::Result<crate::Response<crate::model::SessionEntityType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2191,9 +2151,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn create_session_entity_type(
         &self,
         _req: crate::model::CreateSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionEntityType>>,
+        Output = crate::Result<crate::Response<crate::model::SessionEntityType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2202,9 +2162,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn update_session_entity_type(
         &self,
         _req: crate::model::UpdateSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionEntityType>>,
+        Output = crate::Result<crate::Response<crate::model::SessionEntityType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2213,8 +2173,8 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn delete_session_entity_type(
         &self,
         _req: crate::model::DeleteSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2222,10 +2182,10 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2235,9 +2195,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2246,10 +2206,10 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2259,9 +2219,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2270,8 +2230,8 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2294,9 +2254,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn list_test_cases(
         &self,
         _req: crate::model::ListTestCasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTestCasesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTestCasesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2305,8 +2265,8 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn batch_delete_test_cases(
         &self,
         _req: crate::model::BatchDeleteTestCasesRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2314,10 +2274,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn get_test_case(
         &self,
         _req: crate::model::GetTestCaseRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestCase>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TestCase>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2325,10 +2284,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn create_test_case(
         &self,
         _req: crate::model::CreateTestCaseRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestCase>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TestCase>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2336,10 +2294,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn update_test_case(
         &self,
         _req: crate::model::UpdateTestCaseRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestCase>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TestCase>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2347,9 +2304,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn run_test_case(
         &self,
         _req: crate::model::RunTestCaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2358,9 +2315,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn batch_run_test_cases(
         &self,
         _req: crate::model::BatchRunTestCasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2369,9 +2326,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn calculate_coverage(
         &self,
         _req: crate::model::CalculateCoverageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CalculateCoverageResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CalculateCoverageResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2380,9 +2337,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn import_test_cases(
         &self,
         _req: crate::model::ImportTestCasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2391,9 +2348,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn export_test_cases(
         &self,
         _req: crate::model::ExportTestCasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2402,9 +2359,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn list_test_case_results(
         &self,
         _req: crate::model::ListTestCaseResultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTestCaseResultsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTestCaseResultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2413,9 +2370,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn get_test_case_result(
         &self,
         _req: crate::model::GetTestCaseResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TestCaseResult>>,
+        Output = crate::Result<crate::Response<crate::model::TestCaseResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2424,10 +2381,10 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2437,9 +2394,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2448,10 +2405,10 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2461,9 +2418,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2472,8 +2429,8 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2483,9 +2440,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2494,9 +2451,9 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2518,10 +2475,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn create_tool(
         &self,
         _req: crate::model::CreateToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2529,9 +2485,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_tools(
         &self,
         _req: crate::model::ListToolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListToolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListToolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2540,10 +2496,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_tool(
         &self,
         _req: crate::model::GetToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2551,10 +2506,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn update_tool(
         &self,
         _req: crate::model::UpdateToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2562,8 +2516,8 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn delete_tool(
         &self,
         _req: crate::model::DeleteToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2571,9 +2525,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_tool_versions(
         &self,
         _req: crate::model::ListToolVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListToolVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListToolVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2582,10 +2536,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn create_tool_version(
         &self,
         _req: crate::model::CreateToolVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ToolVersion>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ToolVersion>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2593,10 +2546,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_tool_version(
         &self,
         _req: crate::model::GetToolVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ToolVersion>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ToolVersion>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2604,8 +2556,8 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn delete_tool_version(
         &self,
         _req: crate::model::DeleteToolVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2613,9 +2565,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn restore_tool_version(
         &self,
         _req: crate::model::RestoreToolVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RestoreToolVersionResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RestoreToolVersionResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2624,10 +2576,10 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2637,9 +2589,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2648,10 +2600,10 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2661,9 +2613,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2672,8 +2624,8 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2696,11 +2648,9 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn list_transition_route_groups(
         &self,
         _req: crate::model::ListTransitionRouteGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListTransitionRouteGroupsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListTransitionRouteGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2709,9 +2659,9 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn get_transition_route_group(
         &self,
         _req: crate::model::GetTransitionRouteGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>>,
+        Output = crate::Result<crate::Response<crate::model::TransitionRouteGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2720,9 +2670,9 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn create_transition_route_group(
         &self,
         _req: crate::model::CreateTransitionRouteGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>>,
+        Output = crate::Result<crate::Response<crate::model::TransitionRouteGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2731,9 +2681,9 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn update_transition_route_group(
         &self,
         _req: crate::model::UpdateTransitionRouteGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>>,
+        Output = crate::Result<crate::Response<crate::model::TransitionRouteGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2742,8 +2692,8 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn delete_transition_route_group(
         &self,
         _req: crate::model::DeleteTransitionRouteGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2751,10 +2701,10 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2764,9 +2714,9 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2775,10 +2725,10 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2788,9 +2738,9 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2799,8 +2749,8 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2823,9 +2773,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_versions(
         &self,
         _req: crate::model::ListVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2834,10 +2784,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_version(
         &self,
         _req: crate::model::GetVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2845,9 +2794,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn create_version(
         &self,
         _req: crate::model::CreateVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2856,10 +2805,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn update_version(
         &self,
         _req: crate::model::UpdateVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2867,8 +2815,8 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn delete_version(
         &self,
         _req: crate::model::DeleteVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2876,9 +2824,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn load_version(
         &self,
         _req: crate::model::LoadVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2887,9 +2835,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn compare_versions(
         &self,
         _req: crate::model::CompareVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CompareVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CompareVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2898,10 +2846,10 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2911,9 +2859,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2922,10 +2870,10 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2935,9 +2883,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2946,8 +2894,8 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2957,9 +2905,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2968,9 +2916,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2992,9 +2940,9 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn list_webhooks(
         &self,
         _req: crate::model::ListWebhooksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListWebhooksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListWebhooksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3003,10 +2951,9 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn get_webhook(
         &self,
         _req: crate::model::GetWebhookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Webhook>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Webhook>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3014,10 +2961,9 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn create_webhook(
         &self,
         _req: crate::model::CreateWebhookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Webhook>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Webhook>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3025,10 +2971,9 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn update_webhook(
         &self,
         _req: crate::model::UpdateWebhookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Webhook>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Webhook>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3036,8 +2981,8 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn delete_webhook(
         &self,
         _req: crate::model::DeleteWebhookRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3045,10 +2990,10 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3058,9 +3003,9 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3069,10 +3014,10 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3082,9 +3027,9 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3093,8 +3038,8 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/stub/dynamic.rs b/src/generated/cloud/dialogflow/cx/v3/src/stub/dynamic.rs
index f6d919e703..6f711c9be7 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/stub/dynamic.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/stub/dynamic.rs
@@ -21,110 +21,108 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     async fn list_agents(
         &self,
         req: crate::model::ListAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAgentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAgentsResponse>>;
 
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>>;
 
     async fn create_agent(
         &self,
         req: crate::model::CreateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>>;
 
     async fn update_agent(
         &self,
         req: crate::model::UpdateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>>;
 
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn validate_agent(
         &self,
         req: crate::model::ValidateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AgentValidationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AgentValidationResult>>;
 
     async fn get_agent_validation_result(
         &self,
         req: crate::model::GetAgentValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AgentValidationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AgentValidationResult>>;
 
     async fn get_generative_settings(
         &self,
         req: crate::model::GetGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerativeSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerativeSettings>>;
 
     async fn update_generative_settings(
         &self,
         req: crate::model::UpdateGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerativeSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerativeSettings>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Agents] also implement [Agents].
@@ -135,8 +133,8 @@ impl<T: super::Agents> Agents for T {
     async fn list_agents(
         &self,
         req: crate::model::ListAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAgentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAgentsResponse>> {
         T::list_agents(self, req, options).await
     }
 
@@ -144,8 +142,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>> {
         T::get_agent(self, req, options).await
     }
 
@@ -153,8 +151,8 @@ impl<T: super::Agents> Agents for T {
     async fn create_agent(
         &self,
         req: crate::model::CreateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>> {
         T::create_agent(self, req, options).await
     }
 
@@ -162,8 +160,8 @@ impl<T: super::Agents> Agents for T {
     async fn update_agent(
         &self,
         req: crate::model::UpdateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>> {
         T::update_agent(self, req, options).await
     }
 
@@ -171,8 +169,8 @@ impl<T: super::Agents> Agents for T {
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_agent(self, req, options).await
     }
 
@@ -180,8 +178,8 @@ impl<T: super::Agents> Agents for T {
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_agent(self, req, options).await
     }
 
@@ -189,8 +187,8 @@ impl<T: super::Agents> Agents for T {
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_agent(self, req, options).await
     }
 
@@ -198,8 +196,8 @@ impl<T: super::Agents> Agents for T {
     async fn validate_agent(
         &self,
         req: crate::model::ValidateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AgentValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AgentValidationResult>> {
         T::validate_agent(self, req, options).await
     }
 
@@ -207,8 +205,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_agent_validation_result(
         &self,
         req: crate::model::GetAgentValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AgentValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AgentValidationResult>> {
         T::get_agent_validation_result(self, req, options).await
     }
 
@@ -216,8 +214,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_generative_settings(
         &self,
         req: crate::model::GetGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerativeSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerativeSettings>> {
         T::get_generative_settings(self, req, options).await
     }
 
@@ -225,8 +223,8 @@ impl<T: super::Agents> Agents for T {
     async fn update_generative_settings(
         &self,
         req: crate::model::UpdateGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerativeSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerativeSettings>> {
         T::update_generative_settings(self, req, options).await
     }
 
@@ -234,9 +232,8 @@ impl<T: super::Agents> Agents for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -244,8 +241,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -253,10 +250,9 @@ impl<T: super::Agents> Agents for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -264,8 +260,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -273,22 +269,22 @@ impl<T: super::Agents> Agents for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -300,46 +296,44 @@ pub trait Changelogs: std::fmt::Debug + Send + Sync {
     async fn list_changelogs(
         &self,
         req: crate::model::ListChangelogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListChangelogsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListChangelogsResponse>>;
 
     async fn get_changelog(
         &self,
         req: crate::model::GetChangelogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Changelog>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Changelog>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Changelogs] also implement [Changelogs].
@@ -350,8 +344,8 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn list_changelogs(
         &self,
         req: crate::model::ListChangelogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListChangelogsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListChangelogsResponse>> {
         T::list_changelogs(self, req, options).await
     }
 
@@ -359,8 +353,8 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn get_changelog(
         &self,
         req: crate::model::GetChangelogRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Changelog>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Changelog>> {
         T::get_changelog(self, req, options).await
     }
 
@@ -368,9 +362,8 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -378,8 +371,8 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -387,10 +380,9 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -398,8 +390,8 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -407,8 +399,8 @@ impl<T: super::Changelogs> Changelogs for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -420,46 +412,44 @@ pub trait Deployments: std::fmt::Debug + Send + Sync {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>;
 
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Deployments] also implement [Deployments].
@@ -470,8 +460,8 @@ impl<T: super::Deployments> Deployments for T {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         T::list_deployments(self, req, options).await
     }
 
@@ -479,8 +469,8 @@ impl<T: super::Deployments> Deployments for T {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::get_deployment(self, req, options).await
     }
 
@@ -488,9 +478,8 @@ impl<T: super::Deployments> Deployments for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -498,8 +487,8 @@ impl<T: super::Deployments> Deployments for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -507,10 +496,9 @@ impl<T: super::Deployments> Deployments for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -518,8 +506,8 @@ impl<T: super::Deployments> Deployments for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -527,8 +515,8 @@ impl<T: super::Deployments> Deployments for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -540,86 +528,84 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntityTypesResponse>>;
 
     async fn export_entity_types(
         &self,
         req: crate::model::ExportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_entity_types(
         &self,
         req: crate::model::ImportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EntityTypes] also implement [EntityTypes].
@@ -630,8 +616,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::get_entity_type(self, req, options).await
     }
 
@@ -639,8 +625,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::create_entity_type(self, req, options).await
     }
 
@@ -648,8 +634,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::update_entity_type(self, req, options).await
     }
 
@@ -657,8 +643,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_entity_type(self, req, options).await
     }
 
@@ -666,8 +652,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         T::list_entity_types(self, req, options).await
     }
 
@@ -675,8 +661,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn export_entity_types(
         &self,
         req: crate::model::ExportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_entity_types(self, req, options).await
     }
 
@@ -684,8 +670,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn import_entity_types(
         &self,
         req: crate::model::ImportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_entity_types(self, req, options).await
     }
 
@@ -693,9 +679,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -703,8 +688,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -712,10 +697,9 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -723,8 +707,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -732,22 +716,22 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -759,98 +743,96 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>>;
 
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>>;
 
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn lookup_environment_history(
         &self,
         req: crate::model::LookupEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupEnvironmentHistoryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupEnvironmentHistoryResponse>>;
 
     async fn run_continuous_test(
         &self,
         req: crate::model::RunContinuousTestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_continuous_test_results(
         &self,
         req: crate::model::ListContinuousTestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContinuousTestResultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContinuousTestResultsResponse>>;
 
     async fn deploy_flow(
         &self,
         req: crate::model::DeployFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Environments] also implement [Environments].
@@ -861,8 +843,8 @@ impl<T: super::Environments> Environments for T {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         T::list_environments(self, req, options).await
     }
 
@@ -870,8 +852,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>> {
         T::get_environment(self, req, options).await
     }
 
@@ -879,8 +861,8 @@ impl<T: super::Environments> Environments for T {
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_environment(self, req, options).await
     }
 
@@ -888,8 +870,8 @@ impl<T: super::Environments> Environments for T {
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_environment(self, req, options).await
     }
 
@@ -897,8 +879,8 @@ impl<T: super::Environments> Environments for T {
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_environment(self, req, options).await
     }
 
@@ -906,9 +888,8 @@ impl<T: super::Environments> Environments for T {
     async fn lookup_environment_history(
         &self,
         req: crate::model::LookupEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::LookupEnvironmentHistoryResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::LookupEnvironmentHistoryResponse>> {
         T::lookup_environment_history(self, req, options).await
     }
 
@@ -916,8 +897,8 @@ impl<T: super::Environments> Environments for T {
     async fn run_continuous_test(
         &self,
         req: crate::model::RunContinuousTestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::run_continuous_test(self, req, options).await
     }
 
@@ -925,9 +906,8 @@ impl<T: super::Environments> Environments for T {
     async fn list_continuous_test_results(
         &self,
         req: crate::model::ListContinuousTestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContinuousTestResultsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContinuousTestResultsResponse>> {
         T::list_continuous_test_results(self, req, options).await
     }
 
@@ -935,8 +915,8 @@ impl<T: super::Environments> Environments for T {
     async fn deploy_flow(
         &self,
         req: crate::model::DeployFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy_flow(self, req, options).await
     }
 
@@ -944,9 +924,8 @@ impl<T: super::Environments> Environments for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -954,8 +933,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -963,10 +942,9 @@ impl<T: super::Environments> Environments for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -974,8 +952,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -983,22 +961,22 @@ impl<T: super::Environments> Environments for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1010,64 +988,62 @@ pub trait Examples: std::fmt::Debug + Send + Sync {
     async fn create_example(
         &self,
         req: crate::model::CreateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Example>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Example>>;
 
     async fn delete_example(
         &self,
         req: crate::model::DeleteExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_examples(
         &self,
         req: crate::model::ListExamplesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExamplesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExamplesResponse>>;
 
     async fn get_example(
         &self,
         req: crate::model::GetExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Example>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Example>>;
 
     async fn update_example(
         &self,
         req: crate::model::UpdateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Example>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Example>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Examples] also implement [Examples].
@@ -1078,8 +1054,8 @@ impl<T: super::Examples> Examples for T {
     async fn create_example(
         &self,
         req: crate::model::CreateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Example>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Example>> {
         T::create_example(self, req, options).await
     }
 
@@ -1087,8 +1063,8 @@ impl<T: super::Examples> Examples for T {
     async fn delete_example(
         &self,
         req: crate::model::DeleteExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_example(self, req, options).await
     }
 
@@ -1096,8 +1072,8 @@ impl<T: super::Examples> Examples for T {
     async fn list_examples(
         &self,
         req: crate::model::ListExamplesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExamplesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExamplesResponse>> {
         T::list_examples(self, req, options).await
     }
 
@@ -1105,8 +1081,8 @@ impl<T: super::Examples> Examples for T {
     async fn get_example(
         &self,
         req: crate::model::GetExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Example>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Example>> {
         T::get_example(self, req, options).await
     }
 
@@ -1114,8 +1090,8 @@ impl<T: super::Examples> Examples for T {
     async fn update_example(
         &self,
         req: crate::model::UpdateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Example>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Example>> {
         T::update_example(self, req, options).await
     }
 
@@ -1123,9 +1099,8 @@ impl<T: super::Examples> Examples for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1133,8 +1108,8 @@ impl<T: super::Examples> Examples for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1142,10 +1117,9 @@ impl<T: super::Examples> Examples for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1153,8 +1127,8 @@ impl<T: super::Examples> Examples for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1162,8 +1136,8 @@ impl<T: super::Examples> Examples for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1175,76 +1149,74 @@ pub trait Experiments: std::fmt::Debug + Send + Sync {
     async fn list_experiments(
         &self,
         req: crate::model::ListExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExperimentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExperimentsResponse>>;
 
     async fn get_experiment(
         &self,
         req: crate::model::GetExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>>;
 
     async fn create_experiment(
         &self,
         req: crate::model::CreateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>>;
 
     async fn update_experiment(
         &self,
         req: crate::model::UpdateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>>;
 
     async fn delete_experiment(
         &self,
         req: crate::model::DeleteExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn start_experiment(
         &self,
         req: crate::model::StartExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>>;
 
     async fn stop_experiment(
         &self,
         req: crate::model::StopExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Experiments] also implement [Experiments].
@@ -1255,8 +1227,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn list_experiments(
         &self,
         req: crate::model::ListExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListExperimentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListExperimentsResponse>> {
         T::list_experiments(self, req, options).await
     }
 
@@ -1264,8 +1236,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn get_experiment(
         &self,
         req: crate::model::GetExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>> {
         T::get_experiment(self, req, options).await
     }
 
@@ -1273,8 +1245,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn create_experiment(
         &self,
         req: crate::model::CreateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>> {
         T::create_experiment(self, req, options).await
     }
 
@@ -1282,8 +1254,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn update_experiment(
         &self,
         req: crate::model::UpdateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>> {
         T::update_experiment(self, req, options).await
     }
 
@@ -1291,8 +1263,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn delete_experiment(
         &self,
         req: crate::model::DeleteExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_experiment(self, req, options).await
     }
 
@@ -1300,8 +1272,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn start_experiment(
         &self,
         req: crate::model::StartExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>> {
         T::start_experiment(self, req, options).await
     }
 
@@ -1309,8 +1281,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn stop_experiment(
         &self,
         req: crate::model::StopExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Experiment>> {
         T::stop_experiment(self, req, options).await
     }
 
@@ -1318,9 +1290,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1328,8 +1299,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1337,10 +1308,9 @@ impl<T: super::Experiments> Experiments for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1348,8 +1318,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1357,8 +1327,8 @@ impl<T: super::Experiments> Experiments for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1370,104 +1340,102 @@ pub trait Flows: std::fmt::Debug + Send + Sync {
     async fn create_flow(
         &self,
         req: crate::model::CreateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Flow>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Flow>>;
 
     async fn delete_flow(
         &self,
         req: crate::model::DeleteFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_flows(
         &self,
         req: crate::model::ListFlowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFlowsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFlowsResponse>>;
 
     async fn get_flow(
         &self,
         req: crate::model::GetFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Flow>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Flow>>;
 
     async fn update_flow(
         &self,
         req: crate::model::UpdateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Flow>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Flow>>;
 
     async fn train_flow(
         &self,
         req: crate::model::TrainFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn validate_flow(
         &self,
         req: crate::model::ValidateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FlowValidationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FlowValidationResult>>;
 
     async fn get_flow_validation_result(
         &self,
         req: crate::model::GetFlowValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FlowValidationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FlowValidationResult>>;
 
     async fn import_flow(
         &self,
         req: crate::model::ImportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_flow(
         &self,
         req: crate::model::ExportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Flows] also implement [Flows].
@@ -1478,8 +1446,8 @@ impl<T: super::Flows> Flows for T {
     async fn create_flow(
         &self,
         req: crate::model::CreateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Flow>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Flow>> {
         T::create_flow(self, req, options).await
     }
 
@@ -1487,8 +1455,8 @@ impl<T: super::Flows> Flows for T {
     async fn delete_flow(
         &self,
         req: crate::model::DeleteFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_flow(self, req, options).await
     }
 
@@ -1496,8 +1464,8 @@ impl<T: super::Flows> Flows for T {
     async fn list_flows(
         &self,
         req: crate::model::ListFlowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFlowsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFlowsResponse>> {
         T::list_flows(self, req, options).await
     }
 
@@ -1505,8 +1473,8 @@ impl<T: super::Flows> Flows for T {
     async fn get_flow(
         &self,
         req: crate::model::GetFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Flow>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Flow>> {
         T::get_flow(self, req, options).await
     }
 
@@ -1514,8 +1482,8 @@ impl<T: super::Flows> Flows for T {
     async fn update_flow(
         &self,
         req: crate::model::UpdateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Flow>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Flow>> {
         T::update_flow(self, req, options).await
     }
 
@@ -1523,8 +1491,8 @@ impl<T: super::Flows> Flows for T {
     async fn train_flow(
         &self,
         req: crate::model::TrainFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::train_flow(self, req, options).await
     }
 
@@ -1532,8 +1500,8 @@ impl<T: super::Flows> Flows for T {
     async fn validate_flow(
         &self,
         req: crate::model::ValidateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FlowValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FlowValidationResult>> {
         T::validate_flow(self, req, options).await
     }
 
@@ -1541,8 +1509,8 @@ impl<T: super::Flows> Flows for T {
     async fn get_flow_validation_result(
         &self,
         req: crate::model::GetFlowValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FlowValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FlowValidationResult>> {
         T::get_flow_validation_result(self, req, options).await
     }
 
@@ -1550,8 +1518,8 @@ impl<T: super::Flows> Flows for T {
     async fn import_flow(
         &self,
         req: crate::model::ImportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_flow(self, req, options).await
     }
 
@@ -1559,8 +1527,8 @@ impl<T: super::Flows> Flows for T {
     async fn export_flow(
         &self,
         req: crate::model::ExportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_flow(self, req, options).await
     }
 
@@ -1568,9 +1536,8 @@ impl<T: super::Flows> Flows for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1578,8 +1545,8 @@ impl<T: super::Flows> Flows for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1587,10 +1554,9 @@ impl<T: super::Flows> Flows for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1598,8 +1564,8 @@ impl<T: super::Flows> Flows for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1607,22 +1573,22 @@ impl<T: super::Flows> Flows for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1634,64 +1600,62 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGeneratorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGeneratorsResponse>>;
 
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>>;
 
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>>;
 
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>>;
 
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Generators] also implement [Generators].
@@ -1702,8 +1666,8 @@ impl<T: super::Generators> Generators for T {
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGeneratorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGeneratorsResponse>> {
         T::list_generators(self, req, options).await
     }
 
@@ -1711,8 +1675,8 @@ impl<T: super::Generators> Generators for T {
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>> {
         T::get_generator(self, req, options).await
     }
 
@@ -1720,8 +1684,8 @@ impl<T: super::Generators> Generators for T {
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>> {
         T::create_generator(self, req, options).await
     }
 
@@ -1729,8 +1693,8 @@ impl<T: super::Generators> Generators for T {
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>> {
         T::update_generator(self, req, options).await
     }
 
@@ -1738,8 +1702,8 @@ impl<T: super::Generators> Generators for T {
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_generator(self, req, options).await
     }
 
@@ -1747,9 +1711,8 @@ impl<T: super::Generators> Generators for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1757,8 +1720,8 @@ impl<T: super::Generators> Generators for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1766,10 +1729,9 @@ impl<T: super::Generators> Generators for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1777,8 +1739,8 @@ impl<T: super::Generators> Generators for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1786,8 +1748,8 @@ impl<T: super::Generators> Generators for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1799,86 +1761,84 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIntentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIntentsResponse>>;
 
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>>;
 
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>>;
 
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>>;
 
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn import_intents(
         &self,
         req: crate::model::ImportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_intents(
         &self,
         req: crate::model::ExportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Intents] also implement [Intents].
@@ -1889,8 +1849,8 @@ impl<T: super::Intents> Intents for T {
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIntentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIntentsResponse>> {
         T::list_intents(self, req, options).await
     }
 
@@ -1898,8 +1858,8 @@ impl<T: super::Intents> Intents for T {
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>> {
         T::get_intent(self, req, options).await
     }
 
@@ -1907,8 +1867,8 @@ impl<T: super::Intents> Intents for T {
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>> {
         T::create_intent(self, req, options).await
     }
 
@@ -1916,8 +1876,8 @@ impl<T: super::Intents> Intents for T {
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>> {
         T::update_intent(self, req, options).await
     }
 
@@ -1925,8 +1885,8 @@ impl<T: super::Intents> Intents for T {
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_intent(self, req, options).await
     }
 
@@ -1934,8 +1894,8 @@ impl<T: super::Intents> Intents for T {
     async fn import_intents(
         &self,
         req: crate::model::ImportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_intents(self, req, options).await
     }
 
@@ -1943,8 +1903,8 @@ impl<T: super::Intents> Intents for T {
     async fn export_intents(
         &self,
         req: crate::model::ExportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_intents(self, req, options).await
     }
 
@@ -1952,9 +1912,8 @@ impl<T: super::Intents> Intents for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1962,8 +1921,8 @@ impl<T: super::Intents> Intents for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1971,10 +1930,9 @@ impl<T: super::Intents> Intents for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1982,8 +1940,8 @@ impl<T: super::Intents> Intents for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1991,22 +1949,22 @@ impl<T: super::Intents> Intents for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2018,64 +1976,62 @@ pub trait Pages: std::fmt::Debug + Send + Sync {
     async fn list_pages(
         &self,
         req: crate::model::ListPagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPagesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPagesResponse>>;
 
     async fn get_page(
         &self,
         req: crate::model::GetPageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Page>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Page>>;
 
     async fn create_page(
         &self,
         req: crate::model::CreatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Page>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Page>>;
 
     async fn update_page(
         &self,
         req: crate::model::UpdatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Page>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Page>>;
 
     async fn delete_page(
         &self,
         req: crate::model::DeletePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Pages] also implement [Pages].
@@ -2086,8 +2042,8 @@ impl<T: super::Pages> Pages for T {
     async fn list_pages(
         &self,
         req: crate::model::ListPagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPagesResponse>> {
         T::list_pages(self, req, options).await
     }
 
@@ -2095,8 +2051,8 @@ impl<T: super::Pages> Pages for T {
     async fn get_page(
         &self,
         req: crate::model::GetPageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Page>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Page>> {
         T::get_page(self, req, options).await
     }
 
@@ -2104,8 +2060,8 @@ impl<T: super::Pages> Pages for T {
     async fn create_page(
         &self,
         req: crate::model::CreatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Page>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Page>> {
         T::create_page(self, req, options).await
     }
 
@@ -2113,8 +2069,8 @@ impl<T: super::Pages> Pages for T {
     async fn update_page(
         &self,
         req: crate::model::UpdatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Page>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Page>> {
         T::update_page(self, req, options).await
     }
 
@@ -2122,8 +2078,8 @@ impl<T: super::Pages> Pages for T {
     async fn delete_page(
         &self,
         req: crate::model::DeletePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_page(self, req, options).await
     }
 
@@ -2131,9 +2087,8 @@ impl<T: super::Pages> Pages for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2141,8 +2096,8 @@ impl<T: super::Pages> Pages for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2150,10 +2105,9 @@ impl<T: super::Pages> Pages for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2161,8 +2115,8 @@ impl<T: super::Pages> Pages for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2170,8 +2124,8 @@ impl<T: super::Pages> Pages for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2183,116 +2137,114 @@ pub trait Playbooks: std::fmt::Debug + Send + Sync {
     async fn create_playbook(
         &self,
         req: crate::model::CreatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Playbook>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Playbook>>;
 
     async fn delete_playbook(
         &self,
         req: crate::model::DeletePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_playbooks(
         &self,
         req: crate::model::ListPlaybooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPlaybooksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPlaybooksResponse>>;
 
     async fn get_playbook(
         &self,
         req: crate::model::GetPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Playbook>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Playbook>>;
 
     async fn export_playbook(
         &self,
         req: crate::model::ExportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_playbook(
         &self,
         req: crate::model::ImportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_playbook(
         &self,
         req: crate::model::UpdatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Playbook>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Playbook>>;
 
     async fn create_playbook_version(
         &self,
         req: crate::model::CreatePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PlaybookVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PlaybookVersion>>;
 
     async fn get_playbook_version(
         &self,
         req: crate::model::GetPlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PlaybookVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PlaybookVersion>>;
 
     async fn restore_playbook_version(
         &self,
         req: crate::model::RestorePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestorePlaybookVersionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestorePlaybookVersionResponse>>;
 
     async fn list_playbook_versions(
         &self,
         req: crate::model::ListPlaybookVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPlaybookVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPlaybookVersionsResponse>>;
 
     async fn delete_playbook_version(
         &self,
         req: crate::model::DeletePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Playbooks] also implement [Playbooks].
@@ -2303,8 +2255,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn create_playbook(
         &self,
         req: crate::model::CreatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Playbook>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Playbook>> {
         T::create_playbook(self, req, options).await
     }
 
@@ -2312,8 +2264,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn delete_playbook(
         &self,
         req: crate::model::DeletePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_playbook(self, req, options).await
     }
 
@@ -2321,8 +2273,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn list_playbooks(
         &self,
         req: crate::model::ListPlaybooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPlaybooksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPlaybooksResponse>> {
         T::list_playbooks(self, req, options).await
     }
 
@@ -2330,8 +2282,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn get_playbook(
         &self,
         req: crate::model::GetPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Playbook>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Playbook>> {
         T::get_playbook(self, req, options).await
     }
 
@@ -2339,8 +2291,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn export_playbook(
         &self,
         req: crate::model::ExportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_playbook(self, req, options).await
     }
 
@@ -2348,8 +2300,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn import_playbook(
         &self,
         req: crate::model::ImportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_playbook(self, req, options).await
     }
 
@@ -2357,8 +2309,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn update_playbook(
         &self,
         req: crate::model::UpdatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Playbook>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Playbook>> {
         T::update_playbook(self, req, options).await
     }
 
@@ -2366,8 +2318,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn create_playbook_version(
         &self,
         req: crate::model::CreatePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PlaybookVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PlaybookVersion>> {
         T::create_playbook_version(self, req, options).await
     }
 
@@ -2375,8 +2327,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn get_playbook_version(
         &self,
         req: crate::model::GetPlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PlaybookVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PlaybookVersion>> {
         T::get_playbook_version(self, req, options).await
     }
 
@@ -2384,8 +2336,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn restore_playbook_version(
         &self,
         req: crate::model::RestorePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestorePlaybookVersionResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestorePlaybookVersionResponse>> {
         T::restore_playbook_version(self, req, options).await
     }
 
@@ -2393,8 +2345,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn list_playbook_versions(
         &self,
         req: crate::model::ListPlaybookVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPlaybookVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPlaybookVersionsResponse>> {
         T::list_playbook_versions(self, req, options).await
     }
 
@@ -2402,8 +2354,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn delete_playbook_version(
         &self,
         req: crate::model::DeletePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_playbook_version(self, req, options).await
     }
 
@@ -2411,9 +2363,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2421,8 +2372,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2430,10 +2381,9 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2441,8 +2391,8 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2450,22 +2400,22 @@ impl<T: super::Playbooks> Playbooks for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2477,64 +2427,62 @@ pub trait SecuritySettingsService: std::fmt::Debug + Send + Sync {
     async fn create_security_settings(
         &self,
         req: crate::model::CreateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecuritySettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecuritySettings>>;
 
     async fn get_security_settings(
         &self,
         req: crate::model::GetSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecuritySettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecuritySettings>>;
 
     async fn update_security_settings(
         &self,
         req: crate::model::UpdateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecuritySettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecuritySettings>>;
 
     async fn list_security_settings(
         &self,
         req: crate::model::ListSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSecuritySettingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSecuritySettingsResponse>>;
 
     async fn delete_security_settings(
         &self,
         req: crate::model::DeleteSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SecuritySettingsService] also implement [SecuritySettingsService].
@@ -2545,8 +2493,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn create_security_settings(
         &self,
         req: crate::model::CreateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecuritySettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecuritySettings>> {
         T::create_security_settings(self, req, options).await
     }
 
@@ -2554,8 +2502,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn get_security_settings(
         &self,
         req: crate::model::GetSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecuritySettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecuritySettings>> {
         T::get_security_settings(self, req, options).await
     }
 
@@ -2563,8 +2511,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn update_security_settings(
         &self,
         req: crate::model::UpdateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SecuritySettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SecuritySettings>> {
         T::update_security_settings(self, req, options).await
     }
 
@@ -2572,8 +2520,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn list_security_settings(
         &self,
         req: crate::model::ListSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSecuritySettingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSecuritySettingsResponse>> {
         T::list_security_settings(self, req, options).await
     }
 
@@ -2581,8 +2529,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn delete_security_settings(
         &self,
         req: crate::model::DeleteSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_security_settings(self, req, options).await
     }
 
@@ -2590,9 +2538,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2600,8 +2547,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2609,10 +2556,9 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2620,8 +2566,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2629,8 +2575,8 @@ impl<T: super::SecuritySettingsService> SecuritySettingsService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2642,58 +2588,56 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DetectIntentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DetectIntentResponse>>;
 
     async fn match_intent(
         &self,
         req: crate::model::MatchIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MatchIntentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MatchIntentResponse>>;
 
     async fn fulfill_intent(
         &self,
         req: crate::model::FulfillIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FulfillIntentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FulfillIntentResponse>>;
 
     async fn submit_answer_feedback(
         &self,
         req: crate::model::SubmitAnswerFeedbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnswerFeedback>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnswerFeedback>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Sessions] also implement [Sessions].
@@ -2704,8 +2648,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DetectIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DetectIntentResponse>> {
         T::detect_intent(self, req, options).await
     }
 
@@ -2713,8 +2657,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn match_intent(
         &self,
         req: crate::model::MatchIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MatchIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MatchIntentResponse>> {
         T::match_intent(self, req, options).await
     }
 
@@ -2722,8 +2666,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn fulfill_intent(
         &self,
         req: crate::model::FulfillIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FulfillIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FulfillIntentResponse>> {
         T::fulfill_intent(self, req, options).await
     }
 
@@ -2731,8 +2675,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn submit_answer_feedback(
         &self,
         req: crate::model::SubmitAnswerFeedbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnswerFeedback>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnswerFeedback>> {
         T::submit_answer_feedback(self, req, options).await
     }
 
@@ -2740,9 +2684,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2750,8 +2693,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2759,10 +2702,9 @@ impl<T: super::Sessions> Sessions for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2770,8 +2712,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2779,8 +2721,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2792,64 +2734,62 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionEntityTypesResponse>>;
 
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>>;
 
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>>;
 
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>>;
 
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SessionEntityTypes] also implement [SessionEntityTypes].
@@ -2860,8 +2800,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionEntityTypesResponse>> {
         T::list_session_entity_types(self, req, options).await
     }
 
@@ -2869,8 +2809,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>> {
         T::get_session_entity_type(self, req, options).await
     }
 
@@ -2878,8 +2818,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>> {
         T::create_session_entity_type(self, req, options).await
     }
 
@@ -2887,8 +2827,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>> {
         T::update_session_entity_type(self, req, options).await
     }
 
@@ -2896,8 +2836,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_session_entity_type(self, req, options).await
     }
 
@@ -2905,9 +2845,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2915,8 +2854,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2924,10 +2863,9 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2935,8 +2873,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2944,8 +2882,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2957,116 +2895,114 @@ pub trait TestCases: std::fmt::Debug + Send + Sync {
     async fn list_test_cases(
         &self,
         req: crate::model::ListTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTestCasesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTestCasesResponse>>;
 
     async fn batch_delete_test_cases(
         &self,
         req: crate::model::BatchDeleteTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_test_case(
         &self,
         req: crate::model::GetTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCase>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCase>>;
 
     async fn create_test_case(
         &self,
         req: crate::model::CreateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCase>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCase>>;
 
     async fn update_test_case(
         &self,
         req: crate::model::UpdateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCase>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCase>>;
 
     async fn run_test_case(
         &self,
         req: crate::model::RunTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_run_test_cases(
         &self,
         req: crate::model::BatchRunTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn calculate_coverage(
         &self,
         req: crate::model::CalculateCoverageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateCoverageResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateCoverageResponse>>;
 
     async fn import_test_cases(
         &self,
         req: crate::model::ImportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_test_cases(
         &self,
         req: crate::model::ExportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_test_case_results(
         &self,
         req: crate::model::ListTestCaseResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTestCaseResultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTestCaseResultsResponse>>;
 
     async fn get_test_case_result(
         &self,
         req: crate::model::GetTestCaseResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCaseResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCaseResult>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::TestCases] also implement [TestCases].
@@ -3077,8 +3013,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn list_test_cases(
         &self,
         req: crate::model::ListTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTestCasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTestCasesResponse>> {
         T::list_test_cases(self, req, options).await
     }
 
@@ -3086,8 +3022,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn batch_delete_test_cases(
         &self,
         req: crate::model::BatchDeleteTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::batch_delete_test_cases(self, req, options).await
     }
 
@@ -3095,8 +3031,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn get_test_case(
         &self,
         req: crate::model::GetTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCase>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCase>> {
         T::get_test_case(self, req, options).await
     }
 
@@ -3104,8 +3040,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn create_test_case(
         &self,
         req: crate::model::CreateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCase>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCase>> {
         T::create_test_case(self, req, options).await
     }
 
@@ -3113,8 +3049,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn update_test_case(
         &self,
         req: crate::model::UpdateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCase>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCase>> {
         T::update_test_case(self, req, options).await
     }
 
@@ -3122,8 +3058,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn run_test_case(
         &self,
         req: crate::model::RunTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::run_test_case(self, req, options).await
     }
 
@@ -3131,8 +3067,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn batch_run_test_cases(
         &self,
         req: crate::model::BatchRunTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_run_test_cases(self, req, options).await
     }
 
@@ -3140,8 +3076,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn calculate_coverage(
         &self,
         req: crate::model::CalculateCoverageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CalculateCoverageResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CalculateCoverageResponse>> {
         T::calculate_coverage(self, req, options).await
     }
 
@@ -3149,8 +3085,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn import_test_cases(
         &self,
         req: crate::model::ImportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_test_cases(self, req, options).await
     }
 
@@ -3158,8 +3094,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn export_test_cases(
         &self,
         req: crate::model::ExportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_test_cases(self, req, options).await
     }
 
@@ -3167,8 +3103,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn list_test_case_results(
         &self,
         req: crate::model::ListTestCaseResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTestCaseResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTestCaseResultsResponse>> {
         T::list_test_case_results(self, req, options).await
     }
 
@@ -3176,8 +3112,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn get_test_case_result(
         &self,
         req: crate::model::GetTestCaseResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TestCaseResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TestCaseResult>> {
         T::get_test_case_result(self, req, options).await
     }
 
@@ -3185,9 +3121,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3195,8 +3130,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3204,10 +3139,9 @@ impl<T: super::TestCases> TestCases for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3215,8 +3149,8 @@ impl<T: super::TestCases> TestCases for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3224,22 +3158,22 @@ impl<T: super::TestCases> TestCases for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3251,94 +3185,92 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>>;
 
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListToolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListToolsResponse>>;
 
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>>;
 
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>>;
 
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_tool_versions(
         &self,
         req: crate::model::ListToolVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListToolVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListToolVersionsResponse>>;
 
     async fn create_tool_version(
         &self,
         req: crate::model::CreateToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ToolVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ToolVersion>>;
 
     async fn get_tool_version(
         &self,
         req: crate::model::GetToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ToolVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ToolVersion>>;
 
     async fn delete_tool_version(
         &self,
         req: crate::model::DeleteToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn restore_tool_version(
         &self,
         req: crate::model::RestoreToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestoreToolVersionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestoreToolVersionResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Tools] also implement [Tools].
@@ -3349,8 +3281,8 @@ impl<T: super::Tools> Tools for T {
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>> {
         T::create_tool(self, req, options).await
     }
 
@@ -3358,8 +3290,8 @@ impl<T: super::Tools> Tools for T {
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListToolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListToolsResponse>> {
         T::list_tools(self, req, options).await
     }
 
@@ -3367,8 +3299,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>> {
         T::get_tool(self, req, options).await
     }
 
@@ -3376,8 +3308,8 @@ impl<T: super::Tools> Tools for T {
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>> {
         T::update_tool(self, req, options).await
     }
 
@@ -3385,8 +3317,8 @@ impl<T: super::Tools> Tools for T {
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tool(self, req, options).await
     }
 
@@ -3394,8 +3326,8 @@ impl<T: super::Tools> Tools for T {
     async fn list_tool_versions(
         &self,
         req: crate::model::ListToolVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListToolVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListToolVersionsResponse>> {
         T::list_tool_versions(self, req, options).await
     }
 
@@ -3403,8 +3335,8 @@ impl<T: super::Tools> Tools for T {
     async fn create_tool_version(
         &self,
         req: crate::model::CreateToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ToolVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ToolVersion>> {
         T::create_tool_version(self, req, options).await
     }
 
@@ -3412,8 +3344,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_tool_version(
         &self,
         req: crate::model::GetToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ToolVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ToolVersion>> {
         T::get_tool_version(self, req, options).await
     }
 
@@ -3421,8 +3353,8 @@ impl<T: super::Tools> Tools for T {
     async fn delete_tool_version(
         &self,
         req: crate::model::DeleteToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tool_version(self, req, options).await
     }
 
@@ -3430,8 +3362,8 @@ impl<T: super::Tools> Tools for T {
     async fn restore_tool_version(
         &self,
         req: crate::model::RestoreToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestoreToolVersionResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestoreToolVersionResponse>> {
         T::restore_tool_version(self, req, options).await
     }
 
@@ -3439,9 +3371,8 @@ impl<T: super::Tools> Tools for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3449,8 +3380,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3458,10 +3389,9 @@ impl<T: super::Tools> Tools for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3469,8 +3399,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3478,8 +3408,8 @@ impl<T: super::Tools> Tools for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3491,64 +3421,62 @@ pub trait TransitionRouteGroups: std::fmt::Debug + Send + Sync {
     async fn list_transition_route_groups(
         &self,
         req: crate::model::ListTransitionRouteGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransitionRouteGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransitionRouteGroupsResponse>>;
 
     async fn get_transition_route_group(
         &self,
         req: crate::model::GetTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransitionRouteGroup>>;
 
     async fn create_transition_route_group(
         &self,
         req: crate::model::CreateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransitionRouteGroup>>;
 
     async fn update_transition_route_group(
         &self,
         req: crate::model::UpdateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransitionRouteGroup>>;
 
     async fn delete_transition_route_group(
         &self,
         req: crate::model::DeleteTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::TransitionRouteGroups] also implement [TransitionRouteGroups].
@@ -3559,9 +3487,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn list_transition_route_groups(
         &self,
         req: crate::model::ListTransitionRouteGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTransitionRouteGroupsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTransitionRouteGroupsResponse>> {
         T::list_transition_route_groups(self, req, options).await
     }
 
@@ -3569,8 +3496,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn get_transition_route_group(
         &self,
         req: crate::model::GetTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransitionRouteGroup>> {
         T::get_transition_route_group(self, req, options).await
     }
 
@@ -3578,8 +3505,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn create_transition_route_group(
         &self,
         req: crate::model::CreateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransitionRouteGroup>> {
         T::create_transition_route_group(self, req, options).await
     }
 
@@ -3587,8 +3514,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn update_transition_route_group(
         &self,
         req: crate::model::UpdateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TransitionRouteGroup>> {
         T::update_transition_route_group(self, req, options).await
     }
 
@@ -3596,8 +3523,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn delete_transition_route_group(
         &self,
         req: crate::model::DeleteTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_transition_route_group(self, req, options).await
     }
 
@@ -3605,9 +3532,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3615,8 +3541,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3624,10 +3550,9 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3635,8 +3560,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3644,8 +3569,8 @@ impl<T: super::TransitionRouteGroups> TransitionRouteGroups for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3657,86 +3582,84 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>>;
 
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn load_version(
         &self,
         req: crate::model::LoadVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn compare_versions(
         &self,
         req: crate::model::CompareVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompareVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompareVersionsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Versions] also implement [Versions].
@@ -3747,8 +3670,8 @@ impl<T: super::Versions> Versions for T {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>> {
         T::list_versions(self, req, options).await
     }
 
@@ -3756,8 +3679,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::get_version(self, req, options).await
     }
 
@@ -3765,8 +3688,8 @@ impl<T: super::Versions> Versions for T {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_version(self, req, options).await
     }
 
@@ -3774,8 +3697,8 @@ impl<T: super::Versions> Versions for T {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::update_version(self, req, options).await
     }
 
@@ -3783,8 +3706,8 @@ impl<T: super::Versions> Versions for T {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_version(self, req, options).await
     }
 
@@ -3792,8 +3715,8 @@ impl<T: super::Versions> Versions for T {
     async fn load_version(
         &self,
         req: crate::model::LoadVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::load_version(self, req, options).await
     }
 
@@ -3801,8 +3724,8 @@ impl<T: super::Versions> Versions for T {
     async fn compare_versions(
         &self,
         req: crate::model::CompareVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompareVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompareVersionsResponse>> {
         T::compare_versions(self, req, options).await
     }
 
@@ -3810,9 +3733,8 @@ impl<T: super::Versions> Versions for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3820,8 +3742,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3829,10 +3751,9 @@ impl<T: super::Versions> Versions for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3840,8 +3761,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3849,22 +3770,22 @@ impl<T: super::Versions> Versions for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -3876,64 +3797,62 @@ pub trait Webhooks: std::fmt::Debug + Send + Sync {
     async fn list_webhooks(
         &self,
         req: crate::model::ListWebhooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWebhooksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWebhooksResponse>>;
 
     async fn get_webhook(
         &self,
         req: crate::model::GetWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Webhook>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Webhook>>;
 
     async fn create_webhook(
         &self,
         req: crate::model::CreateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Webhook>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Webhook>>;
 
     async fn update_webhook(
         &self,
         req: crate::model::UpdateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Webhook>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Webhook>>;
 
     async fn delete_webhook(
         &self,
         req: crate::model::DeleteWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Webhooks] also implement [Webhooks].
@@ -3944,8 +3863,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn list_webhooks(
         &self,
         req: crate::model::ListWebhooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListWebhooksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListWebhooksResponse>> {
         T::list_webhooks(self, req, options).await
     }
 
@@ -3953,8 +3872,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn get_webhook(
         &self,
         req: crate::model::GetWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Webhook>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Webhook>> {
         T::get_webhook(self, req, options).await
     }
 
@@ -3962,8 +3881,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn create_webhook(
         &self,
         req: crate::model::CreateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Webhook>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Webhook>> {
         T::create_webhook(self, req, options).await
     }
 
@@ -3971,8 +3890,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn update_webhook(
         &self,
         req: crate::model::UpdateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Webhook>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Webhook>> {
         T::update_webhook(self, req, options).await
     }
 
@@ -3980,8 +3899,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn delete_webhook(
         &self,
         req: crate::model::DeleteWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_webhook(self, req, options).await
     }
 
@@ -3989,9 +3908,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3999,8 +3917,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -4008,10 +3926,9 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -4019,8 +3936,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -4028,8 +3945,8 @@ impl<T: super::Webhooks> Webhooks for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/tracing.rs b/src/generated/cloud/dialogflow/cx/v3/src/tracing.rs
index 57b4951b42..7a5d2088a0 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/tracing.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/tracing.rs
@@ -66,8 +66,8 @@ where
     async fn list_agents(
         &self,
         req: crate::model::ListAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAgentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAgentsResponse>> {
         self.inner.list_agents(req, options).await
     }
 
@@ -75,8 +75,8 @@ where
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         self.inner.get_agent(req, options).await
     }
 
@@ -84,8 +84,8 @@ where
     async fn create_agent(
         &self,
         req: crate::model::CreateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         self.inner.create_agent(req, options).await
     }
 
@@ -93,8 +93,8 @@ where
     async fn update_agent(
         &self,
         req: crate::model::UpdateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         self.inner.update_agent(req, options).await
     }
 
@@ -102,8 +102,8 @@ where
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_agent(req, options).await
     }
 
@@ -111,8 +111,8 @@ where
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_agent(req, options).await
     }
 
@@ -120,8 +120,8 @@ where
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_agent(req, options).await
     }
 
@@ -129,8 +129,8 @@ where
     async fn validate_agent(
         &self,
         req: crate::model::ValidateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AgentValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AgentValidationResult>> {
         self.inner.validate_agent(req, options).await
     }
 
@@ -138,8 +138,8 @@ where
     async fn get_agent_validation_result(
         &self,
         req: crate::model::GetAgentValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AgentValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AgentValidationResult>> {
         self.inner.get_agent_validation_result(req, options).await
     }
 
@@ -147,8 +147,8 @@ where
     async fn get_generative_settings(
         &self,
         req: crate::model::GetGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerativeSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerativeSettings>> {
         self.inner.get_generative_settings(req, options).await
     }
 
@@ -156,8 +156,8 @@ where
     async fn update_generative_settings(
         &self,
         req: crate::model::UpdateGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerativeSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerativeSettings>> {
         self.inner.update_generative_settings(req, options).await
     }
 
@@ -165,8 +165,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -174,8 +174,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -183,9 +183,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -193,8 +192,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -202,22 +201,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -251,8 +250,8 @@ where
     async fn list_changelogs(
         &self,
         req: crate::model::ListChangelogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListChangelogsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListChangelogsResponse>> {
         self.inner.list_changelogs(req, options).await
     }
 
@@ -260,8 +259,8 @@ where
     async fn get_changelog(
         &self,
         req: crate::model::GetChangelogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Changelog>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Changelog>> {
         self.inner.get_changelog(req, options).await
     }
 
@@ -269,8 +268,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -278,8 +277,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -287,9 +286,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -297,8 +295,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -306,8 +304,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -341,8 +339,8 @@ where
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         self.inner.list_deployments(req, options).await
     }
 
@@ -350,8 +348,8 @@ where
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.get_deployment(req, options).await
     }
 
@@ -359,8 +357,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -368,8 +366,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -377,9 +375,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -387,8 +384,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -396,8 +393,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -431,8 +428,8 @@ where
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.get_entity_type(req, options).await
     }
 
@@ -440,8 +437,8 @@ where
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.create_entity_type(req, options).await
     }
 
@@ -449,8 +446,8 @@ where
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.update_entity_type(req, options).await
     }
 
@@ -458,8 +455,8 @@ where
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_entity_type(req, options).await
     }
 
@@ -467,8 +464,8 @@ where
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         self.inner.list_entity_types(req, options).await
     }
 
@@ -476,8 +473,8 @@ where
     async fn export_entity_types(
         &self,
         req: crate::model::ExportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_entity_types(req, options).await
     }
 
@@ -485,8 +482,8 @@ where
     async fn import_entity_types(
         &self,
         req: crate::model::ImportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_entity_types(req, options).await
     }
 
@@ -494,8 +491,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -503,8 +500,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -512,9 +509,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -522,8 +518,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -531,22 +527,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -580,8 +576,8 @@ where
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         self.inner.list_environments(req, options).await
     }
 
@@ -589,8 +585,8 @@ where
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         self.inner.get_environment(req, options).await
     }
 
@@ -598,8 +594,8 @@ where
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_environment(req, options).await
     }
 
@@ -607,8 +603,8 @@ where
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_environment(req, options).await
     }
 
@@ -616,8 +612,8 @@ where
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_environment(req, options).await
     }
 
@@ -625,8 +621,8 @@ where
     async fn lookup_environment_history(
         &self,
         req: crate::model::LookupEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupEnvironmentHistoryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupEnvironmentHistoryResponse>> {
         self.inner.lookup_environment_history(req, options).await
     }
 
@@ -634,8 +630,8 @@ where
     async fn run_continuous_test(
         &self,
         req: crate::model::RunContinuousTestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.run_continuous_test(req, options).await
     }
 
@@ -643,8 +639,8 @@ where
     async fn list_continuous_test_results(
         &self,
         req: crate::model::ListContinuousTestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContinuousTestResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContinuousTestResultsResponse>> {
         self.inner.list_continuous_test_results(req, options).await
     }
 
@@ -652,8 +648,8 @@ where
     async fn deploy_flow(
         &self,
         req: crate::model::DeployFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy_flow(req, options).await
     }
 
@@ -661,8 +657,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -670,8 +666,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -679,9 +675,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -689,8 +684,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -698,22 +693,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -747,8 +742,8 @@ where
     async fn create_example(
         &self,
         req: crate::model::CreateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Example>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Example>> {
         self.inner.create_example(req, options).await
     }
 
@@ -756,8 +751,8 @@ where
     async fn delete_example(
         &self,
         req: crate::model::DeleteExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_example(req, options).await
     }
 
@@ -765,8 +760,8 @@ where
     async fn list_examples(
         &self,
         req: crate::model::ListExamplesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExamplesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExamplesResponse>> {
         self.inner.list_examples(req, options).await
     }
 
@@ -774,8 +769,8 @@ where
     async fn get_example(
         &self,
         req: crate::model::GetExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Example>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Example>> {
         self.inner.get_example(req, options).await
     }
 
@@ -783,8 +778,8 @@ where
     async fn update_example(
         &self,
         req: crate::model::UpdateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Example>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Example>> {
         self.inner.update_example(req, options).await
     }
 
@@ -792,8 +787,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -801,8 +796,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -810,9 +805,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -820,8 +814,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -829,8 +823,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -864,8 +858,8 @@ where
     async fn list_experiments(
         &self,
         req: crate::model::ListExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExperimentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExperimentsResponse>> {
         self.inner.list_experiments(req, options).await
     }
 
@@ -873,8 +867,8 @@ where
     async fn get_experiment(
         &self,
         req: crate::model::GetExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         self.inner.get_experiment(req, options).await
     }
 
@@ -882,8 +876,8 @@ where
     async fn create_experiment(
         &self,
         req: crate::model::CreateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         self.inner.create_experiment(req, options).await
     }
 
@@ -891,8 +885,8 @@ where
     async fn update_experiment(
         &self,
         req: crate::model::UpdateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         self.inner.update_experiment(req, options).await
     }
 
@@ -900,8 +894,8 @@ where
     async fn delete_experiment(
         &self,
         req: crate::model::DeleteExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_experiment(req, options).await
     }
 
@@ -909,8 +903,8 @@ where
     async fn start_experiment(
         &self,
         req: crate::model::StartExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         self.inner.start_experiment(req, options).await
     }
 
@@ -918,8 +912,8 @@ where
     async fn stop_experiment(
         &self,
         req: crate::model::StopExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         self.inner.stop_experiment(req, options).await
     }
 
@@ -927,8 +921,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -936,8 +930,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -945,9 +939,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -955,8 +948,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -964,8 +957,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -999,8 +992,8 @@ where
     async fn create_flow(
         &self,
         req: crate::model::CreateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Flow>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Flow>> {
         self.inner.create_flow(req, options).await
     }
 
@@ -1008,8 +1001,8 @@ where
     async fn delete_flow(
         &self,
         req: crate::model::DeleteFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_flow(req, options).await
     }
 
@@ -1017,8 +1010,8 @@ where
     async fn list_flows(
         &self,
         req: crate::model::ListFlowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFlowsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFlowsResponse>> {
         self.inner.list_flows(req, options).await
     }
 
@@ -1026,8 +1019,8 @@ where
     async fn get_flow(
         &self,
         req: crate::model::GetFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Flow>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Flow>> {
         self.inner.get_flow(req, options).await
     }
 
@@ -1035,8 +1028,8 @@ where
     async fn update_flow(
         &self,
         req: crate::model::UpdateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Flow>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Flow>> {
         self.inner.update_flow(req, options).await
     }
 
@@ -1044,8 +1037,8 @@ where
     async fn train_flow(
         &self,
         req: crate::model::TrainFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.train_flow(req, options).await
     }
 
@@ -1053,8 +1046,8 @@ where
     async fn validate_flow(
         &self,
         req: crate::model::ValidateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FlowValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FlowValidationResult>> {
         self.inner.validate_flow(req, options).await
     }
 
@@ -1062,8 +1055,8 @@ where
     async fn get_flow_validation_result(
         &self,
         req: crate::model::GetFlowValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FlowValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FlowValidationResult>> {
         self.inner.get_flow_validation_result(req, options).await
     }
 
@@ -1071,8 +1064,8 @@ where
     async fn import_flow(
         &self,
         req: crate::model::ImportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_flow(req, options).await
     }
 
@@ -1080,8 +1073,8 @@ where
     async fn export_flow(
         &self,
         req: crate::model::ExportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_flow(req, options).await
     }
 
@@ -1089,8 +1082,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1098,8 +1091,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1107,9 +1100,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1117,8 +1109,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1126,22 +1118,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1175,8 +1167,8 @@ where
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGeneratorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGeneratorsResponse>> {
         self.inner.list_generators(req, options).await
     }
 
@@ -1184,8 +1176,8 @@ where
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         self.inner.get_generator(req, options).await
     }
 
@@ -1193,8 +1185,8 @@ where
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         self.inner.create_generator(req, options).await
     }
 
@@ -1202,8 +1194,8 @@ where
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         self.inner.update_generator(req, options).await
     }
 
@@ -1211,8 +1203,8 @@ where
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_generator(req, options).await
     }
 
@@ -1220,8 +1212,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1229,8 +1221,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1238,9 +1230,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1248,8 +1239,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1257,8 +1248,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1292,8 +1283,8 @@ where
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIntentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIntentsResponse>> {
         self.inner.list_intents(req, options).await
     }
 
@@ -1301,8 +1292,8 @@ where
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         self.inner.get_intent(req, options).await
     }
 
@@ -1310,8 +1301,8 @@ where
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         self.inner.create_intent(req, options).await
     }
 
@@ -1319,8 +1310,8 @@ where
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         self.inner.update_intent(req, options).await
     }
 
@@ -1328,8 +1319,8 @@ where
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_intent(req, options).await
     }
 
@@ -1337,8 +1328,8 @@ where
     async fn import_intents(
         &self,
         req: crate::model::ImportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_intents(req, options).await
     }
 
@@ -1346,8 +1337,8 @@ where
     async fn export_intents(
         &self,
         req: crate::model::ExportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_intents(req, options).await
     }
 
@@ -1355,8 +1346,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1364,8 +1355,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1373,9 +1364,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1383,8 +1373,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1392,22 +1382,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1441,8 +1431,8 @@ where
     async fn list_pages(
         &self,
         req: crate::model::ListPagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPagesResponse>> {
         self.inner.list_pages(req, options).await
     }
 
@@ -1450,8 +1440,8 @@ where
     async fn get_page(
         &self,
         req: crate::model::GetPageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Page>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Page>> {
         self.inner.get_page(req, options).await
     }
 
@@ -1459,8 +1449,8 @@ where
     async fn create_page(
         &self,
         req: crate::model::CreatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Page>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Page>> {
         self.inner.create_page(req, options).await
     }
 
@@ -1468,8 +1458,8 @@ where
     async fn update_page(
         &self,
         req: crate::model::UpdatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Page>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Page>> {
         self.inner.update_page(req, options).await
     }
 
@@ -1477,8 +1467,8 @@ where
     async fn delete_page(
         &self,
         req: crate::model::DeletePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_page(req, options).await
     }
 
@@ -1486,8 +1476,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1495,8 +1485,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1504,9 +1494,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1514,8 +1503,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1523,8 +1512,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1558,8 +1547,8 @@ where
     async fn create_playbook(
         &self,
         req: crate::model::CreatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Playbook>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Playbook>> {
         self.inner.create_playbook(req, options).await
     }
 
@@ -1567,8 +1556,8 @@ where
     async fn delete_playbook(
         &self,
         req: crate::model::DeletePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_playbook(req, options).await
     }
 
@@ -1576,8 +1565,8 @@ where
     async fn list_playbooks(
         &self,
         req: crate::model::ListPlaybooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPlaybooksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPlaybooksResponse>> {
         self.inner.list_playbooks(req, options).await
     }
 
@@ -1585,8 +1574,8 @@ where
     async fn get_playbook(
         &self,
         req: crate::model::GetPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Playbook>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Playbook>> {
         self.inner.get_playbook(req, options).await
     }
 
@@ -1594,8 +1583,8 @@ where
     async fn export_playbook(
         &self,
         req: crate::model::ExportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_playbook(req, options).await
     }
 
@@ -1603,8 +1592,8 @@ where
     async fn import_playbook(
         &self,
         req: crate::model::ImportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_playbook(req, options).await
     }
 
@@ -1612,8 +1601,8 @@ where
     async fn update_playbook(
         &self,
         req: crate::model::UpdatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Playbook>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Playbook>> {
         self.inner.update_playbook(req, options).await
     }
 
@@ -1621,8 +1610,8 @@ where
     async fn create_playbook_version(
         &self,
         req: crate::model::CreatePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PlaybookVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PlaybookVersion>> {
         self.inner.create_playbook_version(req, options).await
     }
 
@@ -1630,8 +1619,8 @@ where
     async fn get_playbook_version(
         &self,
         req: crate::model::GetPlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PlaybookVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PlaybookVersion>> {
         self.inner.get_playbook_version(req, options).await
     }
 
@@ -1639,8 +1628,8 @@ where
     async fn restore_playbook_version(
         &self,
         req: crate::model::RestorePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestorePlaybookVersionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestorePlaybookVersionResponse>> {
         self.inner.restore_playbook_version(req, options).await
     }
 
@@ -1648,8 +1637,8 @@ where
     async fn list_playbook_versions(
         &self,
         req: crate::model::ListPlaybookVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPlaybookVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPlaybookVersionsResponse>> {
         self.inner.list_playbook_versions(req, options).await
     }
 
@@ -1657,8 +1646,8 @@ where
     async fn delete_playbook_version(
         &self,
         req: crate::model::DeletePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_playbook_version(req, options).await
     }
 
@@ -1666,8 +1655,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1675,8 +1664,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1684,9 +1673,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1694,8 +1682,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1703,22 +1691,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1752,8 +1740,8 @@ where
     async fn create_security_settings(
         &self,
         req: crate::model::CreateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecuritySettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecuritySettings>> {
         self.inner.create_security_settings(req, options).await
     }
 
@@ -1761,8 +1749,8 @@ where
     async fn get_security_settings(
         &self,
         req: crate::model::GetSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecuritySettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecuritySettings>> {
         self.inner.get_security_settings(req, options).await
     }
 
@@ -1770,8 +1758,8 @@ where
     async fn update_security_settings(
         &self,
         req: crate::model::UpdateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecuritySettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecuritySettings>> {
         self.inner.update_security_settings(req, options).await
     }
 
@@ -1779,8 +1767,8 @@ where
     async fn list_security_settings(
         &self,
         req: crate::model::ListSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSecuritySettingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSecuritySettingsResponse>> {
         self.inner.list_security_settings(req, options).await
     }
 
@@ -1788,8 +1776,8 @@ where
     async fn delete_security_settings(
         &self,
         req: crate::model::DeleteSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_security_settings(req, options).await
     }
 
@@ -1797,8 +1785,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1806,8 +1794,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1815,9 +1803,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1825,8 +1812,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1834,8 +1821,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1869,8 +1856,8 @@ where
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DetectIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DetectIntentResponse>> {
         self.inner.detect_intent(req, options).await
     }
 
@@ -1878,8 +1865,8 @@ where
     async fn match_intent(
         &self,
         req: crate::model::MatchIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MatchIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MatchIntentResponse>> {
         self.inner.match_intent(req, options).await
     }
 
@@ -1887,8 +1874,8 @@ where
     async fn fulfill_intent(
         &self,
         req: crate::model::FulfillIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FulfillIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FulfillIntentResponse>> {
         self.inner.fulfill_intent(req, options).await
     }
 
@@ -1896,8 +1883,8 @@ where
     async fn submit_answer_feedback(
         &self,
         req: crate::model::SubmitAnswerFeedbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnswerFeedback>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnswerFeedback>> {
         self.inner.submit_answer_feedback(req, options).await
     }
 
@@ -1905,8 +1892,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1914,8 +1901,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1923,9 +1910,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1933,8 +1919,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1942,8 +1928,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1977,8 +1963,8 @@ where
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionEntityTypesResponse>> {
         self.inner.list_session_entity_types(req, options).await
     }
 
@@ -1986,8 +1972,8 @@ where
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         self.inner.get_session_entity_type(req, options).await
     }
 
@@ -1995,8 +1981,8 @@ where
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         self.inner.create_session_entity_type(req, options).await
     }
 
@@ -2004,8 +1990,8 @@ where
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         self.inner.update_session_entity_type(req, options).await
     }
 
@@ -2013,8 +1999,8 @@ where
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_session_entity_type(req, options).await
     }
 
@@ -2022,8 +2008,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2031,8 +2017,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2040,9 +2026,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2050,8 +2035,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2059,8 +2044,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2094,8 +2079,8 @@ where
     async fn list_test_cases(
         &self,
         req: crate::model::ListTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTestCasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTestCasesResponse>> {
         self.inner.list_test_cases(req, options).await
     }
 
@@ -2103,8 +2088,8 @@ where
     async fn batch_delete_test_cases(
         &self,
         req: crate::model::BatchDeleteTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.batch_delete_test_cases(req, options).await
     }
 
@@ -2112,8 +2097,8 @@ where
     async fn get_test_case(
         &self,
         req: crate::model::GetTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCase>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCase>> {
         self.inner.get_test_case(req, options).await
     }
 
@@ -2121,8 +2106,8 @@ where
     async fn create_test_case(
         &self,
         req: crate::model::CreateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCase>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCase>> {
         self.inner.create_test_case(req, options).await
     }
 
@@ -2130,8 +2115,8 @@ where
     async fn update_test_case(
         &self,
         req: crate::model::UpdateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCase>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCase>> {
         self.inner.update_test_case(req, options).await
     }
 
@@ -2139,8 +2124,8 @@ where
     async fn run_test_case(
         &self,
         req: crate::model::RunTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.run_test_case(req, options).await
     }
 
@@ -2148,8 +2133,8 @@ where
     async fn batch_run_test_cases(
         &self,
         req: crate::model::BatchRunTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_run_test_cases(req, options).await
     }
 
@@ -2157,8 +2142,8 @@ where
     async fn calculate_coverage(
         &self,
         req: crate::model::CalculateCoverageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateCoverageResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateCoverageResponse>> {
         self.inner.calculate_coverage(req, options).await
     }
 
@@ -2166,8 +2151,8 @@ where
     async fn import_test_cases(
         &self,
         req: crate::model::ImportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_test_cases(req, options).await
     }
 
@@ -2175,8 +2160,8 @@ where
     async fn export_test_cases(
         &self,
         req: crate::model::ExportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_test_cases(req, options).await
     }
 
@@ -2184,8 +2169,8 @@ where
     async fn list_test_case_results(
         &self,
         req: crate::model::ListTestCaseResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTestCaseResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTestCaseResultsResponse>> {
         self.inner.list_test_case_results(req, options).await
     }
 
@@ -2193,8 +2178,8 @@ where
     async fn get_test_case_result(
         &self,
         req: crate::model::GetTestCaseResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCaseResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCaseResult>> {
         self.inner.get_test_case_result(req, options).await
     }
 
@@ -2202,8 +2187,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2211,8 +2196,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2220,9 +2205,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2230,8 +2214,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2239,22 +2223,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2288,8 +2272,8 @@ where
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         self.inner.create_tool(req, options).await
     }
 
@@ -2297,8 +2281,8 @@ where
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListToolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListToolsResponse>> {
         self.inner.list_tools(req, options).await
     }
 
@@ -2306,8 +2290,8 @@ where
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         self.inner.get_tool(req, options).await
     }
 
@@ -2315,8 +2299,8 @@ where
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         self.inner.update_tool(req, options).await
     }
 
@@ -2324,8 +2308,8 @@ where
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tool(req, options).await
     }
 
@@ -2333,8 +2317,8 @@ where
     async fn list_tool_versions(
         &self,
         req: crate::model::ListToolVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListToolVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListToolVersionsResponse>> {
         self.inner.list_tool_versions(req, options).await
     }
 
@@ -2342,8 +2326,8 @@ where
     async fn create_tool_version(
         &self,
         req: crate::model::CreateToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ToolVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ToolVersion>> {
         self.inner.create_tool_version(req, options).await
     }
 
@@ -2351,8 +2335,8 @@ where
     async fn get_tool_version(
         &self,
         req: crate::model::GetToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ToolVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ToolVersion>> {
         self.inner.get_tool_version(req, options).await
     }
 
@@ -2360,8 +2344,8 @@ where
     async fn delete_tool_version(
         &self,
         req: crate::model::DeleteToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tool_version(req, options).await
     }
 
@@ -2369,8 +2353,8 @@ where
     async fn restore_tool_version(
         &self,
         req: crate::model::RestoreToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestoreToolVersionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestoreToolVersionResponse>> {
         self.inner.restore_tool_version(req, options).await
     }
 
@@ -2378,8 +2362,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2387,8 +2371,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2396,9 +2380,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2406,8 +2389,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2415,8 +2398,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2450,8 +2433,8 @@ where
     async fn list_transition_route_groups(
         &self,
         req: crate::model::ListTransitionRouteGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransitionRouteGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransitionRouteGroupsResponse>> {
         self.inner.list_transition_route_groups(req, options).await
     }
 
@@ -2459,8 +2442,8 @@ where
     async fn get_transition_route_group(
         &self,
         req: crate::model::GetTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransitionRouteGroup>> {
         self.inner.get_transition_route_group(req, options).await
     }
 
@@ -2468,8 +2451,8 @@ where
     async fn create_transition_route_group(
         &self,
         req: crate::model::CreateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransitionRouteGroup>> {
         self.inner.create_transition_route_group(req, options).await
     }
 
@@ -2477,8 +2460,8 @@ where
     async fn update_transition_route_group(
         &self,
         req: crate::model::UpdateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransitionRouteGroup>> {
         self.inner.update_transition_route_group(req, options).await
     }
 
@@ -2486,8 +2469,8 @@ where
     async fn delete_transition_route_group(
         &self,
         req: crate::model::DeleteTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_transition_route_group(req, options).await
     }
 
@@ -2495,8 +2478,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2504,8 +2487,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2513,9 +2496,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2523,8 +2505,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2532,8 +2514,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2567,8 +2549,8 @@ where
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         self.inner.list_versions(req, options).await
     }
 
@@ -2576,8 +2558,8 @@ where
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.get_version(req, options).await
     }
 
@@ -2585,8 +2567,8 @@ where
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_version(req, options).await
     }
 
@@ -2594,8 +2576,8 @@ where
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.update_version(req, options).await
     }
 
@@ -2603,8 +2585,8 @@ where
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_version(req, options).await
     }
 
@@ -2612,8 +2594,8 @@ where
     async fn load_version(
         &self,
         req: crate::model::LoadVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.load_version(req, options).await
     }
 
@@ -2621,8 +2603,8 @@ where
     async fn compare_versions(
         &self,
         req: crate::model::CompareVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompareVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompareVersionsResponse>> {
         self.inner.compare_versions(req, options).await
     }
 
@@ -2630,8 +2612,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2639,8 +2621,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2648,9 +2630,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2658,8 +2639,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2667,22 +2648,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2716,8 +2697,8 @@ where
     async fn list_webhooks(
         &self,
         req: crate::model::ListWebhooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWebhooksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWebhooksResponse>> {
         self.inner.list_webhooks(req, options).await
     }
 
@@ -2725,8 +2706,8 @@ where
     async fn get_webhook(
         &self,
         req: crate::model::GetWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Webhook>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Webhook>> {
         self.inner.get_webhook(req, options).await
     }
 
@@ -2734,8 +2715,8 @@ where
     async fn create_webhook(
         &self,
         req: crate::model::CreateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Webhook>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Webhook>> {
         self.inner.create_webhook(req, options).await
     }
 
@@ -2743,8 +2724,8 @@ where
     async fn update_webhook(
         &self,
         req: crate::model::UpdateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Webhook>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Webhook>> {
         self.inner.update_webhook(req, options).await
     }
 
@@ -2752,8 +2733,8 @@ where
     async fn delete_webhook(
         &self,
         req: crate::model::DeleteWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_webhook(req, options).await
     }
 
@@ -2761,8 +2742,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2770,8 +2751,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2779,9 +2760,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2789,8 +2769,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2798,8 +2778,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/transport.rs b/src/generated/cloud/dialogflow/cx/v3/src/transport.rs
index ca0d6b942e..6cabb8d609 100644
--- a/src/generated/cloud/dialogflow/cx/v3/src/transport.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/transport.rs
@@ -14,6 +14,8 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
+#[allow(unused_imports)]
+use crate::Error;
 #[cfg(any(
     feature = "agents",
     feature = "changelogs",
@@ -37,8 +39,6 @@
     feature = "webhooks",
 ))]
 use crate::Result;
-#[allow(unused_imports)]
-use gax::error::Error;
 
 /// Implements [Agents](super::stub::Agents) using a [gaxi::http::ReqwestClient].
 #[cfg(feature = "agents")]
@@ -58,7 +58,7 @@ impl std::fmt::Debug for Agents {
 
 #[cfg(feature = "agents")]
 impl Agents {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -69,13 +69,13 @@ impl super::stub::Agents for Agents {
     async fn list_agents(
         &self,
         req: crate::model::ListAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAgentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAgentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -114,9 +114,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -131,13 +131,13 @@ impl super::stub::Agents for Agents {
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -178,9 +178,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -195,13 +195,13 @@ impl super::stub::Agents for Agents {
     async fn create_agent(
         &self,
         req: crate::model::CreateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -238,9 +238,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -255,13 +255,13 @@ impl super::stub::Agents for Agents {
     async fn update_agent(
         &self,
         req: crate::model::UpdateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -320,9 +320,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -337,13 +337,13 @@ impl super::stub::Agents for Agents {
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -384,9 +384,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -395,24 +395,25 @@ impl super::stub::Agents for Agents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -453,9 +454,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -470,13 +471,13 @@ impl super::stub::Agents for Agents {
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -517,9 +518,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -534,13 +535,13 @@ impl super::stub::Agents for Agents {
     async fn validate_agent(
         &self,
         req: crate::model::ValidateAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AgentValidationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AgentValidationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -581,9 +582,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -598,13 +599,13 @@ impl super::stub::Agents for Agents {
     async fn get_agent_validation_result(
         &self,
         req: crate::model::GetAgentValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AgentValidationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AgentValidationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -648,9 +649,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -665,13 +666,13 @@ impl super::stub::Agents for Agents {
     async fn get_generative_settings(
         &self,
         req: crate::model::GetGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerativeSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerativeSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -715,9 +716,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -732,13 +733,13 @@ impl super::stub::Agents for Agents {
     async fn update_generative_settings(
         &self,
         req: crate::model::UpdateGenerativeSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerativeSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerativeSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -799,9 +800,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -816,13 +817,13 @@ impl super::stub::Agents for Agents {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -852,9 +853,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -869,13 +870,13 @@ impl super::stub::Agents for Agents {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -912,9 +913,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -929,14 +930,13 @@ impl super::stub::Agents for Agents {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1006,9 +1006,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1023,13 +1023,13 @@ impl super::stub::Agents for Agents {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1103,9 +1103,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1120,13 +1120,13 @@ impl super::stub::Agents for Agents {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1200,9 +1200,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1211,25 +1211,26 @@ impl super::stub::Agents for Agents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1252,7 +1253,7 @@ impl std::fmt::Debug for Changelogs {
 
 #[cfg(feature = "changelogs")]
 impl Changelogs {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1263,13 +1264,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn list_changelogs(
         &self,
         req: crate::model::ListChangelogsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListChangelogsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListChangelogsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1313,9 +1314,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1330,13 +1331,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn get_changelog(
         &self,
         req: crate::model::GetChangelogRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Changelog>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Changelog>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1381,9 +1382,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1398,13 +1399,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1434,9 +1435,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1451,13 +1452,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1494,9 +1495,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1511,14 +1512,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1588,9 +1588,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1605,13 +1605,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1685,9 +1685,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1702,13 +1702,13 @@ impl super::stub::Changelogs for Changelogs {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1782,9 +1782,9 @@ impl super::stub::Changelogs for Changelogs {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1793,12 +1793,13 @@ impl super::stub::Changelogs for Changelogs {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1820,7 +1821,7 @@ impl std::fmt::Debug for Deployments {
 
 #[cfg(feature = "deployments")]
 impl Deployments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1831,13 +1832,13 @@ impl super::stub::Deployments for Deployments {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1884,9 +1885,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1901,13 +1902,13 @@ impl super::stub::Deployments for Deployments {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1956,9 +1957,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1973,13 +1974,13 @@ impl super::stub::Deployments for Deployments {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2009,9 +2010,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2026,13 +2027,13 @@ impl super::stub::Deployments for Deployments {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2069,9 +2070,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2086,14 +2087,13 @@ impl super::stub::Deployments for Deployments {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2163,9 +2163,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2180,13 +2180,13 @@ impl super::stub::Deployments for Deployments {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2260,9 +2260,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2277,13 +2277,13 @@ impl super::stub::Deployments for Deployments {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2357,9 +2357,9 @@ impl super::stub::Deployments for Deployments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2368,12 +2368,13 @@ impl super::stub::Deployments for Deployments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -2395,7 +2396,7 @@ impl std::fmt::Debug for EntityTypes {
 
 #[cfg(feature = "entity-types")]
 impl EntityTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2406,13 +2407,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2458,9 +2459,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2475,13 +2476,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2523,9 +2524,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2540,13 +2541,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2610,9 +2611,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2627,13 +2628,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2679,9 +2680,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2690,24 +2691,25 @@ impl super::stub::EntityTypes for EntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2751,9 +2753,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2768,13 +2770,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn export_entity_types(
         &self,
         req: crate::model::ExportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2815,9 +2817,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2832,13 +2834,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn import_entity_types(
         &self,
         req: crate::model::ImportEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2879,9 +2881,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2896,13 +2898,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2932,9 +2934,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2949,13 +2951,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2992,9 +2994,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3009,14 +3011,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3086,9 +3087,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3103,13 +3104,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3183,9 +3184,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3200,13 +3201,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3280,9 +3281,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3291,25 +3292,26 @@ impl super::stub::EntityTypes for EntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3332,7 +3334,7 @@ impl std::fmt::Debug for Environments {
 
 #[cfg(feature = "environments")]
 impl Environments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3343,13 +3345,13 @@ impl super::stub::Environments for Environments {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3392,9 +3394,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3409,13 +3411,13 @@ impl super::stub::Environments for Environments {
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3460,9 +3462,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3477,13 +3479,13 @@ impl super::stub::Environments for Environments {
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3524,9 +3526,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3541,13 +3543,13 @@ impl super::stub::Environments for Environments {
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3610,9 +3612,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3627,13 +3629,13 @@ impl super::stub::Environments for Environments {
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3678,9 +3680,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3689,24 +3691,25 @@ impl super::stub::Environments for Environments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn lookup_environment_history(
         &self,
         req: crate::model::LookupEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::LookupEnvironmentHistoryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::LookupEnvironmentHistoryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3753,9 +3756,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3770,13 +3773,13 @@ impl super::stub::Environments for Environments {
     async fn run_continuous_test(
         &self,
         req: crate::model::RunContinuousTestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3821,9 +3824,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3838,13 +3841,13 @@ impl super::stub::Environments for Environments {
     async fn list_continuous_test_results(
         &self,
         req: crate::model::ListContinuousTestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContinuousTestResultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContinuousTestResultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3891,9 +3894,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3908,13 +3911,13 @@ impl super::stub::Environments for Environments {
     async fn deploy_flow(
         &self,
         req: crate::model::DeployFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3959,9 +3962,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3976,13 +3979,13 @@ impl super::stub::Environments for Environments {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4012,9 +4015,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4029,13 +4032,13 @@ impl super::stub::Environments for Environments {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4072,9 +4075,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4089,14 +4092,13 @@ impl super::stub::Environments for Environments {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4166,9 +4168,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4183,13 +4185,13 @@ impl super::stub::Environments for Environments {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4263,9 +4265,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4280,13 +4282,13 @@ impl super::stub::Environments for Environments {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4360,9 +4362,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4371,25 +4373,26 @@ impl super::stub::Environments for Environments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -4412,7 +4415,7 @@ impl std::fmt::Debug for Examples {
 
 #[cfg(feature = "examples")]
 impl Examples {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -4423,13 +4426,13 @@ impl super::stub::Examples for Examples {
     async fn create_example(
         &self,
         req: crate::model::CreateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Example>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Example>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4474,9 +4477,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4491,13 +4494,13 @@ impl super::stub::Examples for Examples {
     async fn delete_example(
         &self,
         req: crate::model::DeleteExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4546,9 +4549,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4557,24 +4560,25 @@ impl super::stub::Examples for Examples {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_examples(
         &self,
         req: crate::model::ListExamplesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExamplesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExamplesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4622,9 +4626,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4639,13 +4643,13 @@ impl super::stub::Examples for Examples {
     async fn get_example(
         &self,
         req: crate::model::GetExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Example>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Example>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4694,9 +4698,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4711,13 +4715,13 @@ impl super::stub::Examples for Examples {
     async fn update_example(
         &self,
         req: crate::model::UpdateExampleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Example>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Example>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4784,9 +4788,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4801,13 +4805,13 @@ impl super::stub::Examples for Examples {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4837,9 +4841,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4854,13 +4858,13 @@ impl super::stub::Examples for Examples {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4897,9 +4901,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4914,14 +4918,13 @@ impl super::stub::Examples for Examples {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4991,9 +4994,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5008,13 +5011,13 @@ impl super::stub::Examples for Examples {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5088,9 +5091,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5105,13 +5108,13 @@ impl super::stub::Examples for Examples {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5185,9 +5188,9 @@ impl super::stub::Examples for Examples {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5196,12 +5199,13 @@ impl super::stub::Examples for Examples {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -5223,7 +5227,7 @@ impl std::fmt::Debug for Experiments {
 
 #[cfg(feature = "experiments")]
 impl Experiments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5234,13 +5238,13 @@ impl super::stub::Experiments for Experiments {
     async fn list_experiments(
         &self,
         req: crate::model::ListExperimentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListExperimentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListExperimentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5287,9 +5291,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5304,13 +5308,13 @@ impl super::stub::Experiments for Experiments {
     async fn get_experiment(
         &self,
         req: crate::model::GetExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5359,9 +5363,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5376,13 +5380,13 @@ impl super::stub::Experiments for Experiments {
     async fn create_experiment(
         &self,
         req: crate::model::CreateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5427,9 +5431,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5444,13 +5448,13 @@ impl super::stub::Experiments for Experiments {
     async fn update_experiment(
         &self,
         req: crate::model::UpdateExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5517,9 +5521,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5534,13 +5538,13 @@ impl super::stub::Experiments for Experiments {
     async fn delete_experiment(
         &self,
         req: crate::model::DeleteExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5589,9 +5593,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5600,24 +5604,25 @@ impl super::stub::Experiments for Experiments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn start_experiment(
         &self,
         req: crate::model::StartExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5666,9 +5671,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5683,13 +5688,13 @@ impl super::stub::Experiments for Experiments {
     async fn stop_experiment(
         &self,
         req: crate::model::StopExperimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Experiment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Experiment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5738,9 +5743,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5755,13 +5760,13 @@ impl super::stub::Experiments for Experiments {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5791,9 +5796,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5808,13 +5813,13 @@ impl super::stub::Experiments for Experiments {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5851,9 +5856,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5868,14 +5873,13 @@ impl super::stub::Experiments for Experiments {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5945,9 +5949,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5962,13 +5966,13 @@ impl super::stub::Experiments for Experiments {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6042,9 +6046,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6059,13 +6063,13 @@ impl super::stub::Experiments for Experiments {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6139,9 +6143,9 @@ impl super::stub::Experiments for Experiments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6150,12 +6154,13 @@ impl super::stub::Experiments for Experiments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -6175,7 +6180,7 @@ impl std::fmt::Debug for Flows {
 
 #[cfg(feature = "flows")]
 impl Flows {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -6186,13 +6191,13 @@ impl super::stub::Flows for Flows {
     async fn create_flow(
         &self,
         req: crate::model::CreateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Flow>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Flow>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6234,9 +6239,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6251,13 +6256,13 @@ impl super::stub::Flows for Flows {
     async fn delete_flow(
         &self,
         req: crate::model::DeleteFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6303,9 +6308,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6314,24 +6319,25 @@ impl super::stub::Flows for Flows {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_flows(
         &self,
         req: crate::model::ListFlowsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFlowsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFlowsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6375,9 +6381,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6392,13 +6398,13 @@ impl super::stub::Flows for Flows {
     async fn get_flow(
         &self,
         req: crate::model::GetFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Flow>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Flow>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6444,9 +6450,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6461,13 +6467,13 @@ impl super::stub::Flows for Flows {
     async fn update_flow(
         &self,
         req: crate::model::UpdateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Flow>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Flow>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6531,9 +6537,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6548,13 +6554,13 @@ impl super::stub::Flows for Flows {
     async fn train_flow(
         &self,
         req: crate::model::TrainFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6599,9 +6605,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6616,13 +6622,13 @@ impl super::stub::Flows for Flows {
     async fn validate_flow(
         &self,
         req: crate::model::ValidateFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FlowValidationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FlowValidationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6667,9 +6673,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6684,13 +6690,13 @@ impl super::stub::Flows for Flows {
     async fn get_flow_validation_result(
         &self,
         req: crate::model::GetFlowValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FlowValidationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FlowValidationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6738,9 +6744,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6755,13 +6761,13 @@ impl super::stub::Flows for Flows {
     async fn import_flow(
         &self,
         req: crate::model::ImportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6802,9 +6808,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6819,13 +6825,13 @@ impl super::stub::Flows for Flows {
     async fn export_flow(
         &self,
         req: crate::model::ExportFlowRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6870,9 +6876,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6887,13 +6893,13 @@ impl super::stub::Flows for Flows {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6923,9 +6929,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6940,13 +6946,13 @@ impl super::stub::Flows for Flows {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6983,9 +6989,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7000,14 +7006,13 @@ impl super::stub::Flows for Flows {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7077,9 +7082,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7094,13 +7099,13 @@ impl super::stub::Flows for Flows {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7174,9 +7179,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7191,13 +7196,13 @@ impl super::stub::Flows for Flows {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7271,9 +7276,9 @@ impl super::stub::Flows for Flows {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7282,25 +7287,26 @@ impl super::stub::Flows for Flows {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7323,7 +7329,7 @@ impl std::fmt::Debug for Generators {
 
 #[cfg(feature = "generators")]
 impl Generators {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -7334,13 +7340,13 @@ impl super::stub::Generators for Generators {
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGeneratorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGeneratorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7384,9 +7390,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7401,13 +7407,13 @@ impl super::stub::Generators for Generators {
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7453,9 +7459,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7470,13 +7476,13 @@ impl super::stub::Generators for Generators {
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7518,9 +7524,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7535,13 +7541,13 @@ impl super::stub::Generators for Generators {
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7605,9 +7611,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7622,13 +7628,13 @@ impl super::stub::Generators for Generators {
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7674,9 +7680,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7685,24 +7691,25 @@ impl super::stub::Generators for Generators {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7732,9 +7739,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7749,13 +7756,13 @@ impl super::stub::Generators for Generators {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7792,9 +7799,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7809,14 +7816,13 @@ impl super::stub::Generators for Generators {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7886,9 +7892,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7903,13 +7909,13 @@ impl super::stub::Generators for Generators {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7983,9 +7989,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8000,13 +8006,13 @@ impl super::stub::Generators for Generators {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8080,9 +8086,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8091,12 +8097,13 @@ impl super::stub::Generators for Generators {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -8118,7 +8125,7 @@ impl std::fmt::Debug for Intents {
 
 #[cfg(feature = "intents")]
 impl Intents {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8129,13 +8136,13 @@ impl super::stub::Intents for Intents {
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIntentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIntentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8180,9 +8187,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8197,13 +8204,13 @@ impl super::stub::Intents for Intents {
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8249,9 +8256,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8266,13 +8273,13 @@ impl super::stub::Intents for Intents {
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8314,9 +8321,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8331,13 +8338,13 @@ impl super::stub::Intents for Intents {
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8401,9 +8408,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8418,13 +8425,13 @@ impl super::stub::Intents for Intents {
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8469,9 +8476,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8480,24 +8487,25 @@ impl super::stub::Intents for Intents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn import_intents(
         &self,
         req: crate::model::ImportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8538,9 +8546,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8555,13 +8563,13 @@ impl super::stub::Intents for Intents {
     async fn export_intents(
         &self,
         req: crate::model::ExportIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8602,9 +8610,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8619,13 +8627,13 @@ impl super::stub::Intents for Intents {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8655,9 +8663,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8672,13 +8680,13 @@ impl super::stub::Intents for Intents {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8715,9 +8723,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8732,14 +8740,13 @@ impl super::stub::Intents for Intents {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8809,9 +8816,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8826,13 +8833,13 @@ impl super::stub::Intents for Intents {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8906,9 +8913,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8923,13 +8930,13 @@ impl super::stub::Intents for Intents {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9003,9 +9010,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9014,25 +9021,26 @@ impl super::stub::Intents for Intents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9053,7 +9061,7 @@ impl std::fmt::Debug for Pages {
 
 #[cfg(feature = "pages")]
 impl Pages {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -9064,13 +9072,13 @@ impl super::stub::Pages for Pages {
     async fn list_pages(
         &self,
         req: crate::model::ListPagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPagesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPagesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9118,9 +9126,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9135,13 +9143,13 @@ impl super::stub::Pages for Pages {
     async fn get_page(
         &self,
         req: crate::model::GetPageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Page>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Page>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9191,9 +9199,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9208,13 +9216,13 @@ impl super::stub::Pages for Pages {
     async fn create_page(
         &self,
         req: crate::model::CreatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Page>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Page>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9260,9 +9268,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9277,13 +9285,13 @@ impl super::stub::Pages for Pages {
     async fn update_page(
         &self,
         req: crate::model::UpdatePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Page>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Page>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9351,9 +9359,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9368,13 +9376,13 @@ impl super::stub::Pages for Pages {
     async fn delete_page(
         &self,
         req: crate::model::DeletePageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9424,9 +9432,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9435,24 +9443,25 @@ impl super::stub::Pages for Pages {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9482,9 +9491,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9499,13 +9508,13 @@ impl super::stub::Pages for Pages {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9542,9 +9551,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9559,14 +9568,13 @@ impl super::stub::Pages for Pages {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9636,9 +9644,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9653,13 +9661,13 @@ impl super::stub::Pages for Pages {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9733,9 +9741,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9750,13 +9758,13 @@ impl super::stub::Pages for Pages {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9830,9 +9838,9 @@ impl super::stub::Pages for Pages {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9841,12 +9849,13 @@ impl super::stub::Pages for Pages {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -9868,7 +9877,7 @@ impl std::fmt::Debug for Playbooks {
 
 #[cfg(feature = "playbooks")]
 impl Playbooks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -9879,13 +9888,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn create_playbook(
         &self,
         req: crate::model::CreatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Playbook>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Playbook>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9926,9 +9935,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9943,13 +9952,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn delete_playbook(
         &self,
         req: crate::model::DeletePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9994,9 +10003,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10005,24 +10014,25 @@ impl super::stub::Playbooks for Playbooks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_playbooks(
         &self,
         req: crate::model::ListPlaybooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPlaybooksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPlaybooksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10065,9 +10075,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10082,13 +10092,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn get_playbook(
         &self,
         req: crate::model::GetPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Playbook>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Playbook>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10133,9 +10143,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10150,13 +10160,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn export_playbook(
         &self,
         req: crate::model::ExportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10201,9 +10211,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10218,13 +10228,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn import_playbook(
         &self,
         req: crate::model::ImportPlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10265,9 +10275,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10282,13 +10292,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn update_playbook(
         &self,
         req: crate::model::UpdatePlaybookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Playbook>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Playbook>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10351,9 +10361,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10368,13 +10378,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn create_playbook_version(
         &self,
         req: crate::model::CreatePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PlaybookVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PlaybookVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10419,9 +10429,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10436,13 +10446,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn get_playbook_version(
         &self,
         req: crate::model::GetPlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PlaybookVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PlaybookVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10491,9 +10501,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10508,13 +10518,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn restore_playbook_version(
         &self,
         req: crate::model::RestorePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestorePlaybookVersionResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestorePlaybookVersionResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10563,9 +10573,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10580,13 +10590,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn list_playbook_versions(
         &self,
         req: crate::model::ListPlaybookVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPlaybookVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPlaybookVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10633,9 +10643,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10650,13 +10660,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn delete_playbook_version(
         &self,
         req: crate::model::DeletePlaybookVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10705,9 +10715,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10716,24 +10726,25 @@ impl super::stub::Playbooks for Playbooks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10763,9 +10774,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10780,13 +10791,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10823,9 +10834,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10840,14 +10851,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10917,9 +10927,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10934,13 +10944,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11014,9 +11024,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11031,13 +11041,13 @@ impl super::stub::Playbooks for Playbooks {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11111,9 +11121,9 @@ impl super::stub::Playbooks for Playbooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11122,25 +11132,26 @@ impl super::stub::Playbooks for Playbooks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11163,7 +11174,7 @@ impl std::fmt::Debug for SecuritySettingsService {
 
 #[cfg(feature = "security-settings-service")]
 impl SecuritySettingsService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11174,13 +11185,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn create_security_settings(
         &self,
         req: crate::model::CreateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecuritySettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecuritySettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11217,9 +11228,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11234,13 +11245,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn get_security_settings(
         &self,
         req: crate::model::GetSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecuritySettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecuritySettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11281,9 +11292,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11298,13 +11309,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn update_security_settings(
         &self,
         req: crate::model::UpdateSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SecuritySettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SecuritySettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11363,9 +11374,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11380,13 +11391,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn list_security_settings(
         &self,
         req: crate::model::ListSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSecuritySettingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSecuritySettingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11425,9 +11436,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11442,13 +11453,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn delete_security_settings(
         &self,
         req: crate::model::DeleteSecuritySettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11489,9 +11500,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11500,24 +11511,25 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11547,9 +11559,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11564,13 +11576,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11607,9 +11619,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11624,14 +11636,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11701,9 +11712,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11718,13 +11729,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11798,9 +11809,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11815,13 +11826,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11895,9 +11906,9 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11906,12 +11917,13 @@ impl super::stub::SecuritySettingsService for SecuritySettingsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -11933,7 +11945,7 @@ impl std::fmt::Debug for Sessions {
 
 #[cfg(feature = "sessions")]
 impl Sessions {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11944,13 +11956,13 @@ impl super::stub::Sessions for Sessions {
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DetectIntentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DetectIntentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12040,9 +12052,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12057,13 +12069,13 @@ impl super::stub::Sessions for Sessions {
     async fn match_intent(
         &self,
         req: crate::model::MatchIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MatchIntentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MatchIntentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12153,9 +12165,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12170,13 +12182,13 @@ impl super::stub::Sessions for Sessions {
     async fn fulfill_intent(
         &self,
         req: crate::model::FulfillIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FulfillIntentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FulfillIntentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12278,9 +12290,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12295,13 +12307,13 @@ impl super::stub::Sessions for Sessions {
     async fn submit_answer_feedback(
         &self,
         req: crate::model::SubmitAnswerFeedbackRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnswerFeedback>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnswerFeedback>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12346,9 +12358,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12363,13 +12375,13 @@ impl super::stub::Sessions for Sessions {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12399,9 +12411,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12416,13 +12428,13 @@ impl super::stub::Sessions for Sessions {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12459,9 +12471,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12476,14 +12488,13 @@ impl super::stub::Sessions for Sessions {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12553,9 +12564,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12570,13 +12581,13 @@ impl super::stub::Sessions for Sessions {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12650,9 +12661,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12667,13 +12678,13 @@ impl super::stub::Sessions for Sessions {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12747,9 +12758,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12758,12 +12769,13 @@ impl super::stub::Sessions for Sessions {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -12785,7 +12797,7 @@ impl std::fmt::Debug for SessionEntityTypes {
 
 #[cfg(feature = "session-entity-types")]
 impl SessionEntityTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -12796,13 +12808,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionEntityTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12896,9 +12908,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12913,13 +12925,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13017,9 +13029,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13034,13 +13046,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13130,9 +13142,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13147,13 +13159,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13287,9 +13299,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13304,13 +13316,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13408,9 +13420,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13419,24 +13431,25 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13466,9 +13479,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13483,13 +13496,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13526,9 +13539,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13543,14 +13556,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13620,9 +13632,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13637,13 +13649,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13717,9 +13729,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13734,13 +13746,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13814,9 +13826,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13825,12 +13837,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -13852,7 +13865,7 @@ impl std::fmt::Debug for TestCases {
 
 #[cfg(feature = "test-cases")]
 impl TestCases {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13863,13 +13876,13 @@ impl super::stub::TestCases for TestCases {
     async fn list_test_cases(
         &self,
         req: crate::model::ListTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTestCasesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTestCasesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13913,9 +13926,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13930,13 +13943,13 @@ impl super::stub::TestCases for TestCases {
     async fn batch_delete_test_cases(
         &self,
         req: crate::model::BatchDeleteTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13977,9 +13990,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13988,24 +14001,25 @@ impl super::stub::TestCases for TestCases {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_test_case(
         &self,
         req: crate::model::GetTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCase>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCase>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14050,9 +14064,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14067,13 +14081,13 @@ impl super::stub::TestCases for TestCases {
     async fn create_test_case(
         &self,
         req: crate::model::CreateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCase>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCase>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14114,9 +14128,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14131,13 +14145,13 @@ impl super::stub::TestCases for TestCases {
     async fn update_test_case(
         &self,
         req: crate::model::UpdateTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCase>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCase>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14200,9 +14214,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14217,13 +14231,13 @@ impl super::stub::TestCases for TestCases {
     async fn run_test_case(
         &self,
         req: crate::model::RunTestCaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14268,9 +14282,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14285,13 +14299,13 @@ impl super::stub::TestCases for TestCases {
     async fn batch_run_test_cases(
         &self,
         req: crate::model::BatchRunTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14332,9 +14346,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14349,13 +14363,13 @@ impl super::stub::TestCases for TestCases {
     async fn calculate_coverage(
         &self,
         req: crate::model::CalculateCoverageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CalculateCoverageResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CalculateCoverageResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14397,9 +14411,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14414,13 +14428,13 @@ impl super::stub::TestCases for TestCases {
     async fn import_test_cases(
         &self,
         req: crate::model::ImportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14461,9 +14475,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14478,13 +14492,13 @@ impl super::stub::TestCases for TestCases {
     async fn export_test_cases(
         &self,
         req: crate::model::ExportTestCasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14525,9 +14539,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14542,13 +14556,13 @@ impl super::stub::TestCases for TestCases {
     async fn list_test_case_results(
         &self,
         req: crate::model::ListTestCaseResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTestCaseResultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTestCaseResultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14596,9 +14610,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14613,13 +14627,13 @@ impl super::stub::TestCases for TestCases {
     async fn get_test_case_result(
         &self,
         req: crate::model::GetTestCaseResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TestCaseResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TestCaseResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14668,9 +14682,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14685,13 +14699,13 @@ impl super::stub::TestCases for TestCases {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14721,9 +14735,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14738,13 +14752,13 @@ impl super::stub::TestCases for TestCases {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14781,9 +14795,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14798,14 +14812,13 @@ impl super::stub::TestCases for TestCases {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14875,9 +14888,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14892,13 +14905,13 @@ impl super::stub::TestCases for TestCases {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14972,9 +14985,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14989,13 +15002,13 @@ impl super::stub::TestCases for TestCases {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15069,9 +15082,9 @@ impl super::stub::TestCases for TestCases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15080,25 +15093,26 @@ impl super::stub::TestCases for TestCases {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -15119,7 +15133,7 @@ impl std::fmt::Debug for Tools {
 
 #[cfg(feature = "tools")]
 impl Tools {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -15130,13 +15144,13 @@ impl super::stub::Tools for Tools {
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15177,9 +15191,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15194,13 +15208,13 @@ impl super::stub::Tools for Tools {
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListToolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListToolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15243,9 +15257,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15260,13 +15274,13 @@ impl super::stub::Tools for Tools {
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15311,9 +15325,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15328,13 +15342,13 @@ impl super::stub::Tools for Tools {
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15397,9 +15411,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15414,13 +15428,13 @@ impl super::stub::Tools for Tools {
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15466,9 +15480,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15477,24 +15491,25 @@ impl super::stub::Tools for Tools {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_tool_versions(
         &self,
         req: crate::model::ListToolVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListToolVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListToolVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15541,9 +15556,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15558,13 +15573,13 @@ impl super::stub::Tools for Tools {
     async fn create_tool_version(
         &self,
         req: crate::model::CreateToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ToolVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ToolVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15609,9 +15624,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15626,13 +15641,13 @@ impl super::stub::Tools for Tools {
     async fn get_tool_version(
         &self,
         req: crate::model::GetToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ToolVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ToolVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15681,9 +15696,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15698,13 +15713,13 @@ impl super::stub::Tools for Tools {
     async fn delete_tool_version(
         &self,
         req: crate::model::DeleteToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15754,9 +15769,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15765,24 +15780,25 @@ impl super::stub::Tools for Tools {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn restore_tool_version(
         &self,
         req: crate::model::RestoreToolVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestoreToolVersionResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestoreToolVersionResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15831,9 +15847,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15848,13 +15864,13 @@ impl super::stub::Tools for Tools {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15884,9 +15900,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15901,13 +15917,13 @@ impl super::stub::Tools for Tools {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15944,9 +15960,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15961,14 +15977,13 @@ impl super::stub::Tools for Tools {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16038,9 +16053,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16055,13 +16070,13 @@ impl super::stub::Tools for Tools {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16135,9 +16150,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16152,13 +16167,13 @@ impl super::stub::Tools for Tools {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16232,9 +16247,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16243,12 +16258,13 @@ impl super::stub::Tools for Tools {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -16270,7 +16286,7 @@ impl std::fmt::Debug for TransitionRouteGroups {
 
 #[cfg(feature = "transition-route-groups")]
 impl TransitionRouteGroups {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -16281,13 +16297,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn list_transition_route_groups(
         &self,
         req: crate::model::ListTransitionRouteGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTransitionRouteGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTransitionRouteGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16375,9 +16391,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16392,13 +16408,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn get_transition_route_group(
         &self,
         req: crate::model::GetTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransitionRouteGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16490,9 +16506,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16507,13 +16523,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn create_transition_route_group(
         &self,
         req: crate::model::CreateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransitionRouteGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16597,9 +16613,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16614,13 +16630,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn update_transition_route_group(
         &self,
         req: crate::model::UpdateTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TransitionRouteGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TransitionRouteGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16748,9 +16764,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16765,13 +16781,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn delete_transition_route_group(
         &self,
         req: crate::model::DeleteTransitionRouteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16863,9 +16879,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16874,24 +16890,25 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16921,9 +16938,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16938,13 +16955,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16981,9 +16998,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16998,14 +17015,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17075,9 +17091,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17092,13 +17108,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17172,9 +17188,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17189,13 +17205,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17269,9 +17285,9 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17280,12 +17296,13 @@ impl super::stub::TransitionRouteGroups for TransitionRouteGroups {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -17307,7 +17324,7 @@ impl std::fmt::Debug for Versions {
 
 #[cfg(feature = "versions")]
 impl Versions {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -17318,13 +17335,13 @@ impl super::stub::Versions for Versions {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17371,9 +17388,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17388,13 +17405,13 @@ impl super::stub::Versions for Versions {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17443,9 +17460,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17460,13 +17477,13 @@ impl super::stub::Versions for Versions {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17511,9 +17528,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17528,13 +17545,13 @@ impl super::stub::Versions for Versions {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17601,9 +17618,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17618,13 +17635,13 @@ impl super::stub::Versions for Versions {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17673,9 +17690,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17684,24 +17701,25 @@ impl super::stub::Versions for Versions {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn load_version(
         &self,
         req: crate::model::LoadVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17750,9 +17768,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17767,13 +17785,13 @@ impl super::stub::Versions for Versions {
     async fn compare_versions(
         &self,
         req: crate::model::CompareVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompareVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompareVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17822,9 +17840,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17839,13 +17857,13 @@ impl super::stub::Versions for Versions {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17875,9 +17893,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17892,13 +17910,13 @@ impl super::stub::Versions for Versions {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17935,9 +17953,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17952,14 +17970,13 @@ impl super::stub::Versions for Versions {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18029,9 +18046,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18046,13 +18063,13 @@ impl super::stub::Versions for Versions {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18126,9 +18143,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18143,13 +18160,13 @@ impl super::stub::Versions for Versions {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18223,9 +18240,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18234,25 +18251,26 @@ impl super::stub::Versions for Versions {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -18275,7 +18293,7 @@ impl std::fmt::Debug for Webhooks {
 
 #[cfg(feature = "webhooks")]
 impl Webhooks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18286,13 +18304,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn list_webhooks(
         &self,
         req: crate::model::ListWebhooksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListWebhooksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListWebhooksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18335,9 +18353,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18352,13 +18370,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn get_webhook(
         &self,
         req: crate::model::GetWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Webhook>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Webhook>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18403,9 +18421,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18420,13 +18438,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn create_webhook(
         &self,
         req: crate::model::CreateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Webhook>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Webhook>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18467,9 +18485,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18484,13 +18502,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn update_webhook(
         &self,
         req: crate::model::UpdateWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Webhook>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Webhook>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18553,9 +18571,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18570,13 +18588,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn delete_webhook(
         &self,
         req: crate::model::DeleteWebhookRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18622,9 +18640,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18633,24 +18651,25 @@ impl super::stub::Webhooks for Webhooks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18680,9 +18699,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18697,13 +18716,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18740,9 +18759,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18757,14 +18776,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18834,9 +18852,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18851,13 +18869,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18931,9 +18949,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18948,13 +18966,13 @@ impl super::stub::Webhooks for Webhooks {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19028,9 +19046,9 @@ impl super::stub::Webhooks for Webhooks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19039,11 +19057,12 @@ impl super::stub::Webhooks for Webhooks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/dialogflow/v2/Cargo.toml b/src/generated/cloud/dialogflow/v2/Cargo.toml
index 99bedf3b40..a8600fba9b 100644
--- a/src/generated/cloud/dialogflow/v2/Cargo.toml
+++ b/src/generated/cloud/dialogflow/v2/Cargo.toml
@@ -108,8 +108,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/dialogflow/v2/src/builder.rs b/src/generated/cloud/dialogflow/v2/src/builder.rs
index bc59ccd55f..c2aaa906d0 100644
--- a/src/generated/cloud/dialogflow/v2/src/builder.rs
+++ b/src/generated/cloud/dialogflow/v2/src/builder.rs
@@ -22,7 +22,7 @@ pub mod agents {
     /// A builder for [Agents][crate::client::Agents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::agents::ClientBuilder;
     /// # use client::Agents;
@@ -32,19 +32,18 @@ pub mod agents {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Agents;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Agents;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -55,7 +54,7 @@ pub mod agents {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Agents>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod agents {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::GetAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -102,7 +101,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -112,7 +111,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GetAgentRequest::parent].
@@ -125,8 +124,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -136,7 +135,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::SetAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -162,7 +161,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -172,7 +171,7 @@ pub mod agents {
             (*self.0.stub)
                 .set_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [agent][crate::model::SetAgentRequest::agent].
@@ -217,8 +216,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -228,7 +227,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::DeleteAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -254,7 +253,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -264,7 +263,7 @@ pub mod agents {
             (*self.0.stub)
                 .delete_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::DeleteAgentRequest::parent].
@@ -277,8 +276,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -288,8 +287,8 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::SearchAgents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -318,7 +317,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -328,13 +327,13 @@ pub mod agents {
             (*self.0.stub)
                 .search_agents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchAgentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchAgentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -343,15 +342,17 @@ pub mod agents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchAgentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::SearchAgentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -377,8 +378,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchAgents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchAgents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -388,7 +389,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::TrainAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -415,7 +416,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -430,7 +431,7 @@ pub mod agents {
             (*self.0.stub)
                 .train_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `train_agent`.
@@ -441,7 +442,7 @@ pub mod agents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -478,8 +479,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TrainAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TrainAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -489,7 +490,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::ExportAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -516,7 +517,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -531,7 +532,7 @@ pub mod agents {
             (*self.0.stub)
                 .export_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_agent`.
@@ -547,7 +548,7 @@ pub mod agents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -592,8 +593,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -603,7 +604,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::ImportAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -630,7 +631,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -645,7 +646,7 @@ pub mod agents {
             (*self.0.stub)
                 .import_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_agent`.
@@ -656,7 +657,7 @@ pub mod agents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -725,8 +726,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -736,7 +737,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::RestoreAgent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -763,7 +764,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -778,7 +779,7 @@ pub mod agents {
             (*self.0.stub)
                 .restore_agent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_agent`.
@@ -789,7 +790,7 @@ pub mod agents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -858,8 +859,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreAgent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreAgent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -869,7 +870,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::GetValidationResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -898,7 +899,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -908,7 +909,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_validation_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GetValidationResultRequest::parent].
@@ -927,8 +928,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetValidationResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetValidationResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -938,8 +939,8 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -971,7 +972,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -981,15 +982,15 @@ pub mod agents {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -998,17 +999,17 @@ pub mod agents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1038,8 +1039,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1049,7 +1050,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1078,7 +1079,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1088,7 +1089,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1099,8 +1100,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1110,8 +1111,8 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1145,7 +1146,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1155,15 +1156,15 @@ pub mod agents {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1172,17 +1173,17 @@ pub mod agents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1218,8 +1219,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1229,7 +1230,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1258,7 +1259,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1268,7 +1269,7 @@ pub mod agents {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1279,8 +1280,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1290,7 +1291,7 @@ pub mod agents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::agents::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1321,7 +1322,7 @@ pub mod agents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1331,7 +1332,7 @@ pub mod agents {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1342,8 +1343,8 @@ pub mod agents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1357,7 +1358,7 @@ pub mod answer_records {
     /// A builder for [AnswerRecords][crate::client::AnswerRecords].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::answer_records::ClientBuilder;
     /// # use client::AnswerRecords;
@@ -1367,19 +1368,18 @@ pub mod answer_records {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AnswerRecords;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AnswerRecords;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1390,7 +1390,7 @@ pub mod answer_records {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AnswerRecords>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1403,7 +1403,7 @@ pub mod answer_records {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1413,8 +1413,8 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::ListAnswerRecords;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1448,7 +1448,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1458,14 +1458,16 @@ pub mod answer_records {
             (*self.0.stub)
                 .list_answer_records(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAnswerRecordsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAnswerRecordsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1473,15 +1475,17 @@ pub mod answer_records {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAnswerRecordsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAnswerRecordsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1513,8 +1517,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAnswerRecords {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAnswerRecords {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1524,7 +1528,7 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::UpdateAnswerRecord;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1555,7 +1559,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1565,7 +1569,7 @@ pub mod answer_records {
             (*self.0.stub)
                 .update_answer_record(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [answer_record][crate::model::UpdateAnswerRecordRequest::answer_record].
@@ -1614,8 +1618,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAnswerRecord {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAnswerRecord {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1625,8 +1629,8 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1660,7 +1664,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1670,15 +1674,15 @@ pub mod answer_records {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1687,17 +1691,17 @@ pub mod answer_records {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1727,8 +1731,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1738,7 +1742,7 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1769,7 +1773,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1779,7 +1783,7 @@ pub mod answer_records {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1790,8 +1794,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1801,8 +1805,8 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1838,7 +1842,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1848,15 +1852,15 @@ pub mod answer_records {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1865,17 +1869,17 @@ pub mod answer_records {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1911,8 +1915,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1922,7 +1926,7 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1953,7 +1957,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1963,7 +1967,7 @@ pub mod answer_records {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1974,8 +1978,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1985,7 +1989,7 @@ pub mod answer_records {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::answer_records::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2018,7 +2022,7 @@ pub mod answer_records {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2028,7 +2032,7 @@ pub mod answer_records {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2039,8 +2043,8 @@ pub mod answer_records {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2054,7 +2058,7 @@ pub mod contexts {
     /// A builder for [Contexts][crate::client::Contexts].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::contexts::ClientBuilder;
     /// # use client::Contexts;
@@ -2064,19 +2068,18 @@ pub mod contexts {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Contexts;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Contexts;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2087,7 +2090,7 @@ pub mod contexts {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Contexts>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2098,7 +2101,7 @@ pub mod contexts {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2108,8 +2111,8 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::ListContexts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2138,7 +2141,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2148,13 +2151,13 @@ pub mod contexts {
             (*self.0.stub)
                 .list_contexts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListContextsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListContextsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2163,15 +2166,17 @@ pub mod contexts {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListContextsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListContextsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2197,8 +2202,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListContexts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListContexts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2208,7 +2213,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::GetContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2234,7 +2239,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2244,7 +2249,7 @@ pub mod contexts {
             (*self.0.stub)
                 .get_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetContextRequest::name].
@@ -2257,8 +2262,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2268,7 +2273,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::CreateContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2294,7 +2299,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2304,7 +2309,7 @@ pub mod contexts {
             (*self.0.stub)
                 .create_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateContextRequest::parent].
@@ -2339,8 +2344,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2350,7 +2355,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::UpdateContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2376,7 +2381,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2386,7 +2391,7 @@ pub mod contexts {
             (*self.0.stub)
                 .update_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [context][crate::model::UpdateContextRequest::context].
@@ -2431,8 +2436,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2442,7 +2447,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::DeleteContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2468,7 +2473,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2478,7 +2483,7 @@ pub mod contexts {
             (*self.0.stub)
                 .delete_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteContextRequest::name].
@@ -2491,8 +2496,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2502,7 +2507,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::DeleteAllContexts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2531,7 +2536,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2541,7 +2546,7 @@ pub mod contexts {
             (*self.0.stub)
                 .delete_all_contexts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::DeleteAllContextsRequest::parent].
@@ -2554,8 +2559,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAllContexts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAllContexts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2565,8 +2570,8 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2598,7 +2603,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2608,15 +2613,15 @@ pub mod contexts {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2625,17 +2630,17 @@ pub mod contexts {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2665,8 +2670,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2676,7 +2681,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2705,7 +2710,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2715,7 +2720,7 @@ pub mod contexts {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2726,8 +2731,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2737,8 +2742,8 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2772,7 +2777,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2782,15 +2787,15 @@ pub mod contexts {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2799,17 +2804,17 @@ pub mod contexts {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2845,8 +2850,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2856,7 +2861,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2885,7 +2890,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2895,7 +2900,7 @@ pub mod contexts {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2906,8 +2911,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2917,7 +2922,7 @@ pub mod contexts {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::contexts::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2948,7 +2953,7 @@ pub mod contexts {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2958,7 +2963,7 @@ pub mod contexts {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2969,8 +2974,8 @@ pub mod contexts {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2984,7 +2989,7 @@ pub mod conversations {
     /// A builder for [Conversations][crate::client::Conversations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::conversations::ClientBuilder;
     /// # use client::Conversations;
@@ -2994,19 +2999,18 @@ pub mod conversations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Conversations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Conversations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3017,7 +3021,7 @@ pub mod conversations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Conversations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3030,7 +3034,7 @@ pub mod conversations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3040,7 +3044,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::CreateConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3071,7 +3075,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3081,7 +3085,7 @@ pub mod conversations {
             (*self.0.stub)
                 .create_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateConversationRequest::parent].
@@ -3122,8 +3126,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3133,8 +3137,8 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::ListConversations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3168,7 +3172,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3178,14 +3182,16 @@ pub mod conversations {
             (*self.0.stub)
                 .list_conversations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConversationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConversationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3193,15 +3199,17 @@ pub mod conversations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConversationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConversationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3233,8 +3241,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3244,7 +3252,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::GetConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3272,7 +3280,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3282,7 +3290,7 @@ pub mod conversations {
             (*self.0.stub)
                 .get_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationRequest::name].
@@ -3295,8 +3303,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3306,7 +3314,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::CompleteConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3337,7 +3345,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3347,7 +3355,7 @@ pub mod conversations {
             (*self.0.stub)
                 .complete_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CompleteConversationRequest::name].
@@ -3360,8 +3368,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CompleteConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CompleteConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3371,7 +3379,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::IngestContextReferences;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3404,7 +3412,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3414,7 +3422,7 @@ pub mod conversations {
             (*self.0.stub)
                 .ingest_context_references(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversation][crate::model::IngestContextReferencesRequest::conversation].
@@ -3441,8 +3449,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for IngestContextReferences {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for IngestContextReferences {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3452,8 +3460,8 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::ListMessages;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3484,7 +3492,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3494,13 +3502,13 @@ pub mod conversations {
             (*self.0.stub)
                 .list_messages(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMessagesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListMessagesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3509,15 +3517,17 @@ pub mod conversations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMessagesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMessagesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3549,8 +3559,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMessages {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMessages {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3560,7 +3570,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::SuggestConversationSummary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3593,7 +3603,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3603,7 +3613,7 @@ pub mod conversations {
             (*self.0.stub)
                 .suggest_conversation_summary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversation][crate::model::SuggestConversationSummaryRequest::conversation].
@@ -3646,8 +3656,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuggestConversationSummary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuggestConversationSummary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3657,7 +3667,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::GenerateStatelessSummary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3690,7 +3700,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3700,7 +3710,7 @@ pub mod conversations {
             (*self.0.stub)
                 .generate_stateless_summary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [stateless_conversation][crate::model::GenerateStatelessSummaryRequest::stateless_conversation].
@@ -3765,8 +3775,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateStatelessSummary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateStatelessSummary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3776,7 +3786,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::GenerateStatelessSuggestion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3809,7 +3819,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3819,7 +3829,7 @@ pub mod conversations {
             (*self.0.stub)
                 .generate_stateless_suggestion(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GenerateStatelessSuggestionRequest::parent].
@@ -3919,8 +3929,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateStatelessSuggestion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateStatelessSuggestion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3930,7 +3940,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::SearchKnowledge;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3958,7 +3968,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3968,7 +3978,7 @@ pub mod conversations {
             (*self.0.stub)
                 .search_knowledge(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::SearchKnowledgeRequest::parent].
@@ -4082,8 +4092,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchKnowledge {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchKnowledge {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4093,7 +4103,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::GenerateSuggestions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4124,7 +4134,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4134,7 +4144,7 @@ pub mod conversations {
             (*self.0.stub)
                 .generate_suggestions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversation][crate::model::GenerateSuggestionsRequest::conversation].
@@ -4164,8 +4174,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateSuggestions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateSuggestions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4175,8 +4185,8 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4210,7 +4220,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4220,15 +4230,15 @@ pub mod conversations {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4237,17 +4247,17 @@ pub mod conversations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4277,8 +4287,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4288,7 +4298,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4319,7 +4329,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4329,7 +4339,7 @@ pub mod conversations {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4340,8 +4350,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4351,8 +4361,8 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4388,7 +4398,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4398,15 +4408,15 @@ pub mod conversations {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4415,17 +4425,17 @@ pub mod conversations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4461,8 +4471,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4472,7 +4482,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4503,7 +4513,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4513,7 +4523,7 @@ pub mod conversations {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4524,8 +4534,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4535,7 +4545,7 @@ pub mod conversations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversations::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4568,7 +4578,7 @@ pub mod conversations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4578,7 +4588,7 @@ pub mod conversations {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4589,8 +4599,8 @@ pub mod conversations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4604,7 +4614,7 @@ pub mod conversation_datasets {
     /// A builder for [ConversationDatasets][crate::client::ConversationDatasets].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::conversation_datasets::ClientBuilder;
     /// # use client::ConversationDatasets;
@@ -4614,19 +4624,18 @@ pub mod conversation_datasets {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConversationDatasets;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConversationDatasets;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4637,7 +4646,7 @@ pub mod conversation_datasets {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConversationDatasets>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4650,7 +4659,7 @@ pub mod conversation_datasets {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4660,7 +4669,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::CreateConversationDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4694,7 +4703,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4709,7 +4718,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .create_conversation_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_conversation_dataset`.
@@ -4728,7 +4737,7 @@ pub mod conversation_datasets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4787,8 +4796,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversationDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversationDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4798,7 +4807,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::GetConversationDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4829,7 +4838,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4839,7 +4848,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .get_conversation_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationDatasetRequest::name].
@@ -4852,8 +4861,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversationDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversationDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4863,8 +4872,8 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::ListConversationDatasets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4900,7 +4909,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4910,15 +4919,15 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .list_conversation_datasets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConversationDatasetsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4927,17 +4936,17 @@ pub mod conversation_datasets {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConversationDatasetsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4963,8 +4972,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversationDatasets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversationDatasets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4974,7 +4983,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::DeleteConversationDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5008,7 +5017,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5023,7 +5032,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .delete_conversation_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_conversation_dataset`.
@@ -5040,7 +5049,7 @@ pub mod conversation_datasets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5077,8 +5086,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConversationDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConversationDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5088,7 +5097,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::ImportConversationData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5120,7 +5129,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5135,7 +5144,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .import_conversation_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_conversation_data`.
@@ -5154,7 +5163,7 @@ pub mod conversation_datasets {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5213,8 +5222,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportConversationData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportConversationData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5224,8 +5233,8 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5259,7 +5268,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5269,15 +5278,15 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5286,17 +5295,17 @@ pub mod conversation_datasets {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5326,8 +5335,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5337,7 +5346,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5368,7 +5377,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5378,7 +5387,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5389,8 +5398,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5400,8 +5409,8 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5437,7 +5446,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5447,15 +5456,15 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5464,17 +5473,17 @@ pub mod conversation_datasets {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5510,8 +5519,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5521,7 +5530,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5552,7 +5561,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5562,7 +5571,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5573,8 +5582,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5584,7 +5593,7 @@ pub mod conversation_datasets {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_datasets::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5617,7 +5626,7 @@ pub mod conversation_datasets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5627,7 +5636,7 @@ pub mod conversation_datasets {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5638,8 +5647,8 @@ pub mod conversation_datasets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5653,7 +5662,7 @@ pub mod conversation_models {
     /// A builder for [ConversationModels][crate::client::ConversationModels].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::conversation_models::ClientBuilder;
     /// # use client::ConversationModels;
@@ -5663,19 +5672,18 @@ pub mod conversation_models {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConversationModels;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConversationModels;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5686,7 +5694,7 @@ pub mod conversation_models {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConversationModels>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5699,7 +5707,7 @@ pub mod conversation_models {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5709,7 +5717,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::CreateConversationModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5743,7 +5751,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5758,7 +5766,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .create_conversation_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_conversation_model`.
@@ -5777,7 +5785,7 @@ pub mod conversation_models {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5834,8 +5842,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversationModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversationModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5845,7 +5853,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::GetConversationModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5876,7 +5884,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5886,7 +5894,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .get_conversation_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationModelRequest::name].
@@ -5899,8 +5907,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversationModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversationModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5910,8 +5918,8 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::ListConversationModels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5945,7 +5953,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5955,15 +5963,15 @@ pub mod conversation_models {
             (*self.0.stub)
                 .list_conversation_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConversationModelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5972,17 +5980,17 @@ pub mod conversation_models {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConversationModelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6008,8 +6016,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversationModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversationModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6019,7 +6027,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::DeleteConversationModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6053,7 +6061,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6068,7 +6076,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .delete_conversation_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_conversation_model`.
@@ -6085,7 +6093,7 @@ pub mod conversation_models {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6122,8 +6130,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConversationModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConversationModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6133,7 +6141,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::DeployConversationModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6167,7 +6175,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6182,7 +6190,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .deploy_conversation_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy_conversation_model`.
@@ -6199,7 +6207,7 @@ pub mod conversation_models {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6236,8 +6244,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployConversationModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployConversationModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6247,7 +6255,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::UndeployConversationModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6281,7 +6289,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6296,7 +6304,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .undeploy_conversation_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undeploy_conversation_model`.
@@ -6313,7 +6321,7 @@ pub mod conversation_models {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6350,8 +6358,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeployConversationModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeployConversationModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6361,7 +6369,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::GetConversationModelEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6394,7 +6402,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6404,7 +6412,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .get_conversation_model_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationModelEvaluationRequest::name].
@@ -6417,8 +6425,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversationModelEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversationModelEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6428,8 +6436,8 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::ListConversationModelEvaluations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6465,7 +6473,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6475,15 +6483,15 @@ pub mod conversation_models {
             (*self.0.stub)
                 .list_conversation_model_evaluations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConversationModelEvaluationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6492,17 +6500,17 @@ pub mod conversation_models {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConversationModelEvaluationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6528,8 +6536,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversationModelEvaluations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversationModelEvaluations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6539,7 +6547,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::CreateConversationModelEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6573,7 +6581,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6588,7 +6596,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .create_conversation_model_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_conversation_model_evaluation`.
@@ -6607,7 +6615,7 @@ pub mod conversation_models {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6669,8 +6677,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversationModelEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversationModelEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6680,8 +6688,8 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6715,7 +6723,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6725,15 +6733,15 @@ pub mod conversation_models {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6742,17 +6750,17 @@ pub mod conversation_models {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6782,8 +6790,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6793,7 +6801,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6824,7 +6832,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6834,7 +6842,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -6845,8 +6853,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6856,8 +6864,8 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6893,7 +6901,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6903,15 +6911,15 @@ pub mod conversation_models {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6920,17 +6928,17 @@ pub mod conversation_models {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6966,8 +6974,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6977,7 +6985,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7008,7 +7016,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7018,7 +7026,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7029,8 +7037,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7040,7 +7048,7 @@ pub mod conversation_models {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_models::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7073,7 +7081,7 @@ pub mod conversation_models {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7083,7 +7091,7 @@ pub mod conversation_models {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7094,8 +7102,8 @@ pub mod conversation_models {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7109,7 +7117,7 @@ pub mod conversation_profiles {
     /// A builder for [ConversationProfiles][crate::client::ConversationProfiles].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::conversation_profiles::ClientBuilder;
     /// # use client::ConversationProfiles;
@@ -7119,19 +7127,18 @@ pub mod conversation_profiles {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConversationProfiles;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConversationProfiles;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7142,7 +7149,7 @@ pub mod conversation_profiles {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConversationProfiles>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7155,7 +7162,7 @@ pub mod conversation_profiles {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7165,8 +7172,8 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::ListConversationProfiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7202,7 +7209,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7212,15 +7219,15 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .list_conversation_profiles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListConversationProfilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7229,17 +7236,17 @@ pub mod conversation_profiles {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConversationProfilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7265,8 +7272,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversationProfiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversationProfiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7276,7 +7283,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::GetConversationProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7307,7 +7314,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7317,7 +7324,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .get_conversation_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationProfileRequest::name].
@@ -7330,8 +7337,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversationProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversationProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7341,7 +7348,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::CreateConversationProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7374,7 +7381,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7384,7 +7391,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .create_conversation_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateConversationProfileRequest::parent].
@@ -7419,8 +7426,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversationProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversationProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7430,7 +7437,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::UpdateConversationProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7463,7 +7470,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7473,7 +7480,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .update_conversation_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversation_profile][crate::model::UpdateConversationProfileRequest::conversation_profile].
@@ -7522,8 +7529,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConversationProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConversationProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7533,7 +7540,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::DeleteConversationProfile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7566,7 +7573,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7576,7 +7583,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .delete_conversation_profile(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteConversationProfileRequest::name].
@@ -7589,8 +7596,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConversationProfile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConversationProfile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7600,7 +7607,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::SetSuggestionFeatureConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7634,7 +7641,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7649,7 +7656,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .set_suggestion_feature_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_suggestion_feature_config`.
@@ -7668,7 +7675,7 @@ pub mod conversation_profiles {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7745,8 +7752,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetSuggestionFeatureConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetSuggestionFeatureConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7756,7 +7763,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::ClearSuggestionFeatureConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7790,7 +7797,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7805,7 +7812,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .clear_suggestion_feature_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `clear_suggestion_feature_config`.
@@ -7824,7 +7831,7 @@ pub mod conversation_profiles {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7883,8 +7890,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ClearSuggestionFeatureConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ClearSuggestionFeatureConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7894,8 +7901,8 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7929,7 +7936,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7939,15 +7946,15 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7956,17 +7963,17 @@ pub mod conversation_profiles {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7996,8 +8003,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8007,7 +8014,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8038,7 +8045,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8048,7 +8055,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -8059,8 +8066,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8070,8 +8077,8 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8107,7 +8114,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8117,15 +8124,15 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8134,17 +8141,17 @@ pub mod conversation_profiles {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8180,8 +8187,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8191,7 +8198,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8222,7 +8229,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8232,7 +8239,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8243,8 +8250,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8254,7 +8261,7 @@ pub mod conversation_profiles {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::conversation_profiles::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8287,7 +8294,7 @@ pub mod conversation_profiles {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8297,7 +8304,7 @@ pub mod conversation_profiles {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8308,8 +8315,8 @@ pub mod conversation_profiles {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8323,7 +8330,7 @@ pub mod documents {
     /// A builder for [Documents][crate::client::Documents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::documents::ClientBuilder;
     /// # use client::Documents;
@@ -8333,19 +8340,18 @@ pub mod documents {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Documents;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Documents;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8356,7 +8362,7 @@ pub mod documents {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Documents>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8369,7 +8375,7 @@ pub mod documents {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8379,8 +8385,8 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::ListDocuments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8411,7 +8417,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8421,13 +8427,13 @@ pub mod documents {
             (*self.0.stub)
                 .list_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDocumentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDocumentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8436,15 +8442,17 @@ pub mod documents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDocumentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDocumentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8476,8 +8484,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8487,7 +8495,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::GetDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8515,7 +8523,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8525,7 +8533,7 @@ pub mod documents {
             (*self.0.stub)
                 .get_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDocumentRequest::name].
@@ -8538,8 +8546,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8549,7 +8557,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::CreateDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8578,7 +8586,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8593,7 +8601,7 @@ pub mod documents {
             (*self.0.stub)
                 .create_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_document`.
@@ -8612,7 +8620,7 @@ pub mod documents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8671,8 +8679,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8682,7 +8690,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::ImportDocuments;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8711,7 +8719,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8726,7 +8734,7 @@ pub mod documents {
             (*self.0.stub)
                 .import_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_documents`.
@@ -8745,7 +8753,7 @@ pub mod documents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8835,8 +8843,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8846,7 +8854,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::DeleteDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8875,7 +8883,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8890,7 +8898,7 @@ pub mod documents {
             (*self.0.stub)
                 .delete_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_document`.
@@ -8906,7 +8914,7 @@ pub mod documents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8943,8 +8951,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8954,7 +8962,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::UpdateDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8983,7 +8991,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8998,7 +9006,7 @@ pub mod documents {
             (*self.0.stub)
                 .update_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_document`.
@@ -9017,7 +9025,7 @@ pub mod documents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9086,8 +9094,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9097,7 +9105,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::ReloadDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9126,7 +9134,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9141,7 +9149,7 @@ pub mod documents {
             (*self.0.stub)
                 .reload_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reload_document`.
@@ -9160,7 +9168,7 @@ pub mod documents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9231,8 +9239,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReloadDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReloadDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9242,7 +9250,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::ExportDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9271,7 +9279,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9286,7 +9294,7 @@ pub mod documents {
             (*self.0.stub)
                 .export_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_document`.
@@ -9305,7 +9313,7 @@ pub mod documents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9383,8 +9391,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9394,8 +9402,8 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9429,7 +9437,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9439,15 +9447,15 @@ pub mod documents {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9456,17 +9464,17 @@ pub mod documents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9496,8 +9504,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9507,7 +9515,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9538,7 +9546,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9548,7 +9556,7 @@ pub mod documents {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -9559,8 +9567,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9570,8 +9578,8 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9607,7 +9615,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9617,15 +9625,15 @@ pub mod documents {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9634,17 +9642,17 @@ pub mod documents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9680,8 +9688,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9691,7 +9699,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9722,7 +9730,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9732,7 +9740,7 @@ pub mod documents {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9743,8 +9751,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9754,7 +9762,7 @@ pub mod documents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::documents::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9787,7 +9795,7 @@ pub mod documents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9797,7 +9805,7 @@ pub mod documents {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9808,8 +9816,8 @@ pub mod documents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9823,7 +9831,7 @@ pub mod encryption_spec_service {
     /// A builder for [EncryptionSpecService][crate::client::EncryptionSpecService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::encryption_spec_service::ClientBuilder;
     /// # use client::EncryptionSpecService;
@@ -9833,19 +9841,18 @@ pub mod encryption_spec_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EncryptionSpecService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EncryptionSpecService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -9856,7 +9863,7 @@ pub mod encryption_spec_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EncryptionSpecService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -9869,7 +9876,7 @@ pub mod encryption_spec_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -9879,7 +9886,7 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::GetEncryptionSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9910,7 +9917,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9920,7 +9927,7 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .get_encryption_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEncryptionSpecRequest::name].
@@ -9933,8 +9940,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEncryptionSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEncryptionSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9944,7 +9951,7 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::InitializeEncryptionSpec;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9978,7 +9985,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9993,7 +10000,7 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .initialize_encryption_spec(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `initialize_encryption_spec`.
@@ -10012,7 +10019,7 @@ pub mod encryption_spec_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10063,8 +10070,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InitializeEncryptionSpec {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InitializeEncryptionSpec {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10074,8 +10081,8 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10109,7 +10116,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10119,15 +10126,15 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10136,17 +10143,17 @@ pub mod encryption_spec_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10176,8 +10183,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10187,7 +10194,7 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10218,7 +10225,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10228,7 +10235,7 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -10239,8 +10246,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10250,8 +10257,8 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10287,7 +10294,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10297,15 +10304,15 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10314,17 +10321,17 @@ pub mod encryption_spec_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10360,8 +10367,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10371,7 +10378,7 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10402,7 +10409,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10412,7 +10419,7 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -10423,8 +10430,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10434,7 +10441,7 @@ pub mod encryption_spec_service {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::encryption_spec_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10467,7 +10474,7 @@ pub mod encryption_spec_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10477,7 +10484,7 @@ pub mod encryption_spec_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -10488,8 +10495,8 @@ pub mod encryption_spec_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10503,7 +10510,7 @@ pub mod entity_types {
     /// A builder for [EntityTypes][crate::client::EntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::entity_types::ClientBuilder;
     /// # use client::EntityTypes;
@@ -10513,19 +10520,18 @@ pub mod entity_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EntityTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EntityTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -10536,7 +10542,7 @@ pub mod entity_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EntityTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -10549,7 +10555,7 @@ pub mod entity_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -10559,8 +10565,8 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::ListEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10591,7 +10597,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10601,14 +10607,16 @@ pub mod entity_types {
             (*self.0.stub)
                 .list_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEntityTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEntityTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -10616,15 +10624,17 @@ pub mod entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEntityTypesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEntityTypesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10656,8 +10666,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10667,7 +10677,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::GetEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10695,7 +10705,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10705,7 +10715,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .get_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEntityTypeRequest::name].
@@ -10724,8 +10734,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10735,7 +10745,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::CreateEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10766,7 +10776,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10776,7 +10786,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .create_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEntityTypeRequest::parent].
@@ -10817,8 +10827,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10828,7 +10838,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::UpdateEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10859,7 +10869,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10869,7 +10879,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .update_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [entity_type][crate::model::UpdateEntityTypeRequest::entity_type].
@@ -10920,8 +10930,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10931,7 +10941,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::DeleteEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10962,7 +10972,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10972,7 +10982,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .delete_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEntityTypeRequest::name].
@@ -10985,8 +10995,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10996,7 +11006,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::BatchUpdateEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11028,7 +11038,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11043,7 +11053,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .batch_update_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_update_entity_types`.
@@ -11060,7 +11070,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11163,8 +11173,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchUpdateEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchUpdateEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11174,7 +11184,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::BatchDeleteEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11206,7 +11216,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11221,7 +11231,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .batch_delete_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_delete_entity_types`.
@@ -11232,7 +11242,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11282,8 +11292,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeleteEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeleteEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11293,7 +11303,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::BatchCreateEntities;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11325,7 +11335,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11340,7 +11350,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .batch_create_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_create_entities`.
@@ -11351,7 +11361,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11407,8 +11417,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11418,7 +11428,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::BatchUpdateEntities;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11450,7 +11460,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11465,7 +11475,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .batch_update_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_update_entities`.
@@ -11476,7 +11486,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11550,8 +11560,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchUpdateEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchUpdateEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11561,7 +11571,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::BatchDeleteEntities;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -11593,7 +11603,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11608,7 +11618,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .batch_delete_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_delete_entities`.
@@ -11619,7 +11629,7 @@ pub mod entity_types {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -11675,8 +11685,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeleteEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeleteEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11686,8 +11696,8 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11721,7 +11731,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11731,15 +11741,15 @@ pub mod entity_types {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11748,17 +11758,17 @@ pub mod entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11788,8 +11798,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11799,7 +11809,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11830,7 +11840,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11840,7 +11850,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -11851,8 +11861,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11862,8 +11872,8 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11899,7 +11909,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11909,15 +11919,15 @@ pub mod entity_types {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11926,17 +11936,17 @@ pub mod entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11972,8 +11982,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11983,7 +11993,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12014,7 +12024,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12024,7 +12034,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -12035,8 +12045,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12046,7 +12056,7 @@ pub mod entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::entity_types::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12079,7 +12089,7 @@ pub mod entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12089,7 +12099,7 @@ pub mod entity_types {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -12100,8 +12110,8 @@ pub mod entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12115,7 +12125,7 @@ pub mod environments {
     /// A builder for [Environments][crate::client::Environments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::environments::ClientBuilder;
     /// # use client::Environments;
@@ -12125,19 +12135,18 @@ pub mod environments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Environments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Environments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -12148,7 +12157,7 @@ pub mod environments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Environments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -12161,7 +12170,7 @@ pub mod environments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -12171,8 +12180,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::ListEnvironments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12206,7 +12215,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12216,14 +12225,16 @@ pub mod environments {
             (*self.0.stub)
                 .list_environments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEnvironmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEnvironmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -12231,15 +12242,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEnvironmentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEnvironmentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12265,8 +12278,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEnvironments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEnvironments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12276,7 +12289,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::GetEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12304,7 +12317,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12314,7 +12327,7 @@ pub mod environments {
             (*self.0.stub)
                 .get_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEnvironmentRequest::name].
@@ -12327,8 +12340,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12338,7 +12351,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::CreateEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12369,7 +12382,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12379,7 +12392,7 @@ pub mod environments {
             (*self.0.stub)
                 .create_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEnvironmentRequest::parent].
@@ -12422,8 +12435,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12433,7 +12446,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::UpdateEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12464,7 +12477,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12474,7 +12487,7 @@ pub mod environments {
             (*self.0.stub)
                 .update_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [environment][crate::model::UpdateEnvironmentRequest::environment].
@@ -12529,8 +12542,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12540,7 +12553,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::DeleteEnvironment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12571,7 +12584,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12581,7 +12594,7 @@ pub mod environments {
             (*self.0.stub)
                 .delete_environment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteEnvironmentRequest::name].
@@ -12594,8 +12607,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEnvironment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEnvironment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12605,8 +12618,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::GetEnvironmentHistory;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12640,7 +12653,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12650,13 +12663,13 @@ pub mod environments {
             (*self.0.stub)
                 .get_environment_history(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::EnvironmentHistory, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::EnvironmentHistory, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12665,15 +12678,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::EnvironmentHistory, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::EnvironmentHistory,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12699,8 +12714,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEnvironmentHistory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEnvironmentHistory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12710,8 +12725,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12745,7 +12760,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12755,15 +12770,15 @@ pub mod environments {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12772,17 +12787,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12812,8 +12827,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12823,7 +12838,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12854,7 +12869,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12864,7 +12879,7 @@ pub mod environments {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -12875,8 +12890,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12886,8 +12901,8 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12923,7 +12938,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12933,15 +12948,15 @@ pub mod environments {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12950,17 +12965,17 @@ pub mod environments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12996,8 +13011,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13007,7 +13022,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13038,7 +13053,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13048,7 +13063,7 @@ pub mod environments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -13059,8 +13074,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13070,7 +13085,7 @@ pub mod environments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::environments::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13103,7 +13118,7 @@ pub mod environments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13113,7 +13128,7 @@ pub mod environments {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -13124,8 +13139,8 @@ pub mod environments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13139,7 +13154,7 @@ pub mod fulfillments {
     /// A builder for [Fulfillments][crate::client::Fulfillments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::fulfillments::ClientBuilder;
     /// # use client::Fulfillments;
@@ -13149,19 +13164,18 @@ pub mod fulfillments {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Fulfillments;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Fulfillments;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -13172,7 +13186,7 @@ pub mod fulfillments {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Fulfillments>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -13185,7 +13199,7 @@ pub mod fulfillments {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -13195,7 +13209,7 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::GetFulfillment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13223,7 +13237,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13233,7 +13247,7 @@ pub mod fulfillments {
             (*self.0.stub)
                 .get_fulfillment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFulfillmentRequest::name].
@@ -13246,8 +13260,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFulfillment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFulfillment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13257,7 +13271,7 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::UpdateFulfillment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13288,7 +13302,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13298,7 +13312,7 @@ pub mod fulfillments {
             (*self.0.stub)
                 .update_fulfillment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [fulfillment][crate::model::UpdateFulfillmentRequest::fulfillment].
@@ -13347,8 +13361,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFulfillment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFulfillment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13358,8 +13372,8 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13393,7 +13407,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13403,15 +13417,15 @@ pub mod fulfillments {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13420,17 +13434,17 @@ pub mod fulfillments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13460,8 +13474,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13471,7 +13485,7 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13502,7 +13516,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13512,7 +13526,7 @@ pub mod fulfillments {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -13523,8 +13537,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13534,8 +13548,8 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13571,7 +13585,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13581,15 +13595,15 @@ pub mod fulfillments {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13598,17 +13612,17 @@ pub mod fulfillments {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13644,8 +13658,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13655,7 +13669,7 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13686,7 +13700,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13696,7 +13710,7 @@ pub mod fulfillments {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -13707,8 +13721,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13718,7 +13732,7 @@ pub mod fulfillments {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::fulfillments::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13751,7 +13765,7 @@ pub mod fulfillments {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13761,7 +13775,7 @@ pub mod fulfillments {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -13772,8 +13786,8 @@ pub mod fulfillments {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13787,7 +13801,7 @@ pub mod generators {
     /// A builder for [Generators][crate::client::Generators].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::generators::ClientBuilder;
     /// # use client::Generators;
@@ -13797,19 +13811,18 @@ pub mod generators {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Generators;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Generators;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -13820,7 +13833,7 @@ pub mod generators {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Generators>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -13833,7 +13846,7 @@ pub mod generators {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -13843,7 +13856,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::CreateGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13871,7 +13884,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13881,7 +13894,7 @@ pub mod generators {
             (*self.0.stub)
                 .create_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateGeneratorRequest::parent].
@@ -13922,8 +13935,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13933,7 +13946,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::GetGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13961,7 +13974,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13971,7 +13984,7 @@ pub mod generators {
             (*self.0.stub)
                 .get_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGeneratorRequest::name].
@@ -13984,8 +13997,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13995,8 +14008,8 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::ListGenerators;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14027,7 +14040,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14037,14 +14050,16 @@ pub mod generators {
             (*self.0.stub)
                 .list_generators(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGeneratorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListGeneratorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -14052,15 +14067,17 @@ pub mod generators {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGeneratorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGeneratorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14086,8 +14103,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGenerators {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGenerators {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14097,7 +14114,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::DeleteGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14125,7 +14142,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14135,7 +14152,7 @@ pub mod generators {
             (*self.0.stub)
                 .delete_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteGeneratorRequest::name].
@@ -14148,8 +14165,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14159,7 +14176,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::UpdateGenerator;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14187,7 +14204,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14197,7 +14214,7 @@ pub mod generators {
             (*self.0.stub)
                 .update_generator(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [generator][crate::model::UpdateGeneratorRequest::generator].
@@ -14242,8 +14259,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGenerator {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGenerator {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14253,8 +14270,8 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14288,7 +14305,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14298,15 +14315,15 @@ pub mod generators {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14315,17 +14332,17 @@ pub mod generators {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14355,8 +14372,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14366,7 +14383,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14397,7 +14414,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14407,7 +14424,7 @@ pub mod generators {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -14418,8 +14435,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14429,8 +14446,8 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14466,7 +14483,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14476,15 +14493,15 @@ pub mod generators {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -14493,17 +14510,17 @@ pub mod generators {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14539,8 +14556,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14550,7 +14567,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14581,7 +14598,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14591,7 +14608,7 @@ pub mod generators {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -14602,8 +14619,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14613,7 +14630,7 @@ pub mod generators {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generators::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14646,7 +14663,7 @@ pub mod generators {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14656,7 +14673,7 @@ pub mod generators {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -14667,8 +14684,8 @@ pub mod generators {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14682,7 +14699,7 @@ pub mod generator_evaluations {
     /// A builder for [GeneratorEvaluations][crate::client::GeneratorEvaluations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::generator_evaluations::ClientBuilder;
     /// # use client::GeneratorEvaluations;
@@ -14692,19 +14709,18 @@ pub mod generator_evaluations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GeneratorEvaluations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GeneratorEvaluations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -14715,7 +14731,7 @@ pub mod generator_evaluations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GeneratorEvaluations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -14728,7 +14744,7 @@ pub mod generator_evaluations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -14738,7 +14754,7 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::CreateGeneratorEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14772,7 +14788,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14787,7 +14803,7 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .create_generator_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_generator_evaluation`.
@@ -14806,7 +14822,7 @@ pub mod generator_evaluations {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14865,8 +14881,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGeneratorEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGeneratorEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14876,7 +14892,7 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::GetGeneratorEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14907,7 +14923,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14917,7 +14933,7 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .get_generator_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGeneratorEvaluationRequest::name].
@@ -14930,8 +14946,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGeneratorEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGeneratorEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14941,8 +14957,8 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::ListGeneratorEvaluations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14978,7 +14994,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14988,15 +15004,15 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .list_generator_evaluations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListGeneratorEvaluationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15005,17 +15021,17 @@ pub mod generator_evaluations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListGeneratorEvaluationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15041,8 +15057,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGeneratorEvaluations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGeneratorEvaluations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15052,7 +15068,7 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::DeleteGeneratorEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15085,7 +15101,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15095,7 +15111,7 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .delete_generator_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteGeneratorEvaluationRequest::name].
@@ -15108,8 +15124,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGeneratorEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGeneratorEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15119,8 +15135,8 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15154,7 +15170,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15164,15 +15180,15 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15181,17 +15197,17 @@ pub mod generator_evaluations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15221,8 +15237,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15232,7 +15248,7 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15263,7 +15279,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15273,7 +15289,7 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -15284,8 +15300,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15295,8 +15311,8 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15332,7 +15348,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15342,15 +15358,15 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15359,17 +15375,17 @@ pub mod generator_evaluations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15405,8 +15421,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15416,7 +15432,7 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15447,7 +15463,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15457,7 +15473,7 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -15468,8 +15484,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15479,7 +15495,7 @@ pub mod generator_evaluations {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::generator_evaluations::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15512,7 +15528,7 @@ pub mod generator_evaluations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15522,7 +15538,7 @@ pub mod generator_evaluations {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -15533,8 +15549,8 @@ pub mod generator_evaluations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15548,7 +15564,7 @@ pub mod intents {
     /// A builder for [Intents][crate::client::Intents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::intents::ClientBuilder;
     /// # use client::Intents;
@@ -15558,19 +15574,18 @@ pub mod intents {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Intents;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Intents;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -15581,7 +15596,7 @@ pub mod intents {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Intents>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -15592,7 +15607,7 @@ pub mod intents {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -15602,8 +15617,8 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::ListIntents;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15632,7 +15647,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15642,13 +15657,13 @@ pub mod intents {
             (*self.0.stub)
                 .list_intents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListIntentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListIntentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15657,15 +15672,17 @@ pub mod intents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListIntentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListIntentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15703,8 +15720,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIntents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIntents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15714,7 +15731,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::GetIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15740,7 +15757,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15750,7 +15767,7 @@ pub mod intents {
             (*self.0.stub)
                 .get_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIntentRequest::name].
@@ -15775,8 +15792,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15786,7 +15803,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::CreateIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15812,7 +15829,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15822,7 +15839,7 @@ pub mod intents {
             (*self.0.stub)
                 .create_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIntentRequest::parent].
@@ -15869,8 +15886,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15880,7 +15897,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::UpdateIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15906,7 +15923,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15916,7 +15933,7 @@ pub mod intents {
             (*self.0.stub)
                 .update_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [intent][crate::model::UpdateIntentRequest::intent].
@@ -15973,8 +15990,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15984,7 +16001,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::DeleteIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16010,7 +16027,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16020,7 +16037,7 @@ pub mod intents {
             (*self.0.stub)
                 .delete_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIntentRequest::name].
@@ -16033,8 +16050,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16044,7 +16061,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::BatchUpdateIntents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16074,7 +16091,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16089,7 +16106,7 @@ pub mod intents {
             (*self.0.stub)
                 .batch_update_intents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_update_intents`.
@@ -16106,7 +16123,7 @@ pub mod intents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16215,8 +16232,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchUpdateIntents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchUpdateIntents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16226,7 +16243,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::BatchDeleteIntents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16256,7 +16273,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16271,7 +16288,7 @@ pub mod intents {
             (*self.0.stub)
                 .batch_delete_intents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_delete_intents`.
@@ -16282,7 +16299,7 @@ pub mod intents {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16332,8 +16349,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeleteIntents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeleteIntents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16343,8 +16360,8 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16376,7 +16393,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16386,15 +16403,15 @@ pub mod intents {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16403,17 +16420,17 @@ pub mod intents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16443,8 +16460,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16454,7 +16471,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16483,7 +16500,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16493,7 +16510,7 @@ pub mod intents {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -16504,8 +16521,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16515,8 +16532,8 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16550,7 +16567,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16560,15 +16577,15 @@ pub mod intents {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16577,17 +16594,17 @@ pub mod intents {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16623,8 +16640,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16634,7 +16651,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16663,7 +16680,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16673,7 +16690,7 @@ pub mod intents {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -16684,8 +16701,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16695,7 +16712,7 @@ pub mod intents {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::intents::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16726,7 +16743,7 @@ pub mod intents {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16736,7 +16753,7 @@ pub mod intents {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -16747,8 +16764,8 @@ pub mod intents {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16762,7 +16779,7 @@ pub mod knowledge_bases {
     /// A builder for [KnowledgeBases][crate::client::KnowledgeBases].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::knowledge_bases::ClientBuilder;
     /// # use client::KnowledgeBases;
@@ -16772,19 +16789,18 @@ pub mod knowledge_bases {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::KnowledgeBases;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = KnowledgeBases;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -16795,7 +16811,7 @@ pub mod knowledge_bases {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::KnowledgeBases>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -16808,7 +16824,7 @@ pub mod knowledge_bases {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -16818,8 +16834,8 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::ListKnowledgeBases;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16853,7 +16869,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16863,14 +16879,16 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .list_knowledge_bases(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListKnowledgeBasesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListKnowledgeBasesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -16878,17 +16896,17 @@ pub mod knowledge_bases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListKnowledgeBasesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16920,8 +16938,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListKnowledgeBases {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListKnowledgeBases {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16931,7 +16949,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::GetKnowledgeBase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16962,7 +16980,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16972,7 +16990,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .get_knowledge_base(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetKnowledgeBaseRequest::name].
@@ -16985,8 +17003,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetKnowledgeBase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetKnowledgeBase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16996,7 +17014,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::CreateKnowledgeBase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17027,7 +17045,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17037,7 +17055,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .create_knowledge_base(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateKnowledgeBaseRequest::parent].
@@ -17072,8 +17090,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateKnowledgeBase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateKnowledgeBase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17083,7 +17101,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::DeleteKnowledgeBase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17114,7 +17132,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17124,7 +17142,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .delete_knowledge_base(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteKnowledgeBaseRequest::name].
@@ -17143,8 +17161,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteKnowledgeBase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteKnowledgeBase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17154,7 +17172,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::UpdateKnowledgeBase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17185,7 +17203,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17195,7 +17213,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .update_knowledge_base(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [knowledge_base][crate::model::UpdateKnowledgeBaseRequest::knowledge_base].
@@ -17240,8 +17258,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateKnowledgeBase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateKnowledgeBase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17251,8 +17269,8 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17286,7 +17304,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17296,15 +17314,15 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17313,17 +17331,17 @@ pub mod knowledge_bases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17353,8 +17371,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17364,7 +17382,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17395,7 +17413,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17405,7 +17423,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -17416,8 +17434,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17427,8 +17445,8 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17464,7 +17482,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17474,15 +17492,15 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17491,17 +17509,17 @@ pub mod knowledge_bases {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17537,8 +17555,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17548,7 +17566,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17579,7 +17597,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17589,7 +17607,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -17600,8 +17618,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17611,7 +17629,7 @@ pub mod knowledge_bases {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::knowledge_bases::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17644,7 +17662,7 @@ pub mod knowledge_bases {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17654,7 +17672,7 @@ pub mod knowledge_bases {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -17665,8 +17683,8 @@ pub mod knowledge_bases {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17680,7 +17698,7 @@ pub mod participants {
     /// A builder for [Participants][crate::client::Participants].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::participants::ClientBuilder;
     /// # use client::Participants;
@@ -17690,19 +17708,18 @@ pub mod participants {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Participants;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Participants;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -17713,7 +17730,7 @@ pub mod participants {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Participants>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -17726,7 +17743,7 @@ pub mod participants {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -17736,7 +17753,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::CreateParticipant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17767,7 +17784,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17777,7 +17794,7 @@ pub mod participants {
             (*self.0.stub)
                 .create_participant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateParticipantRequest::parent].
@@ -17812,8 +17829,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateParticipant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateParticipant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17823,7 +17840,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::GetParticipant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17851,7 +17868,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17861,7 +17878,7 @@ pub mod participants {
             (*self.0.stub)
                 .get_participant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetParticipantRequest::name].
@@ -17874,8 +17891,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetParticipant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetParticipant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17885,8 +17902,8 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::ListParticipants;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17920,7 +17937,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17930,14 +17947,16 @@ pub mod participants {
             (*self.0.stub)
                 .list_participants(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListParticipantsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListParticipantsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -17945,15 +17964,17 @@ pub mod participants {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListParticipantsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListParticipantsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17979,8 +18000,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListParticipants {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListParticipants {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17990,7 +18011,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::UpdateParticipant;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18021,7 +18042,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18031,7 +18052,7 @@ pub mod participants {
             (*self.0.stub)
                 .update_participant(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [participant][crate::model::UpdateParticipantRequest::participant].
@@ -18080,8 +18101,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateParticipant {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateParticipant {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18091,7 +18112,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::AnalyzeContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18119,7 +18140,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18129,7 +18150,7 @@ pub mod participants {
             (*self.0.stub)
                 .analyze_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [participant][crate::model::AnalyzeContentRequest::participant].
@@ -18286,8 +18307,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18297,7 +18318,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::SuggestArticles;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18325,7 +18346,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18335,7 +18356,7 @@ pub mod participants {
             (*self.0.stub)
                 .suggest_articles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::SuggestArticlesRequest::parent].
@@ -18378,8 +18399,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuggestArticles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuggestArticles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18389,7 +18410,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::SuggestFaqAnswers;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18420,7 +18441,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18430,7 +18451,7 @@ pub mod participants {
             (*self.0.stub)
                 .suggest_faq_answers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::SuggestFaqAnswersRequest::parent].
@@ -18473,8 +18494,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuggestFaqAnswers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuggestFaqAnswers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18484,7 +18505,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::SuggestSmartReplies;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18515,7 +18536,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18525,7 +18546,7 @@ pub mod participants {
             (*self.0.stub)
                 .suggest_smart_replies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::SuggestSmartRepliesRequest::parent].
@@ -18568,8 +18589,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuggestSmartReplies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuggestSmartReplies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18579,7 +18600,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::SuggestKnowledgeAssist;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18610,7 +18631,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18620,7 +18641,7 @@ pub mod participants {
             (*self.0.stub)
                 .suggest_knowledge_assist(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::SuggestKnowledgeAssistRequest::parent].
@@ -18651,8 +18672,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SuggestKnowledgeAssist {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SuggestKnowledgeAssist {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18662,8 +18683,8 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18697,7 +18718,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18707,15 +18728,15 @@ pub mod participants {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18724,17 +18745,17 @@ pub mod participants {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18764,8 +18785,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18775,7 +18796,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18806,7 +18827,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18816,7 +18837,7 @@ pub mod participants {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -18827,8 +18848,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18838,8 +18859,8 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -18875,7 +18896,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -18885,15 +18906,15 @@ pub mod participants {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -18902,17 +18923,17 @@ pub mod participants {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -18948,8 +18969,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -18959,7 +18980,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -18990,7 +19011,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19000,7 +19021,7 @@ pub mod participants {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -19011,8 +19032,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19022,7 +19043,7 @@ pub mod participants {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::participants::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19055,7 +19076,7 @@ pub mod participants {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19065,7 +19086,7 @@ pub mod participants {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -19076,8 +19097,8 @@ pub mod participants {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19091,7 +19112,7 @@ pub mod sessions {
     /// A builder for [Sessions][crate::client::Sessions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::sessions::ClientBuilder;
     /// # use client::Sessions;
@@ -19101,19 +19122,18 @@ pub mod sessions {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Sessions;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Sessions;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -19124,7 +19144,7 @@ pub mod sessions {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Sessions>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -19135,7 +19155,7 @@ pub mod sessions {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -19145,7 +19165,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sessions::DetectIntent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19171,7 +19191,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19181,7 +19201,7 @@ pub mod sessions {
             (*self.0.stub)
                 .detect_intent(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session][crate::model::DetectIntentRequest::session].
@@ -19276,8 +19296,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetectIntent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetectIntent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19287,8 +19307,8 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sessions::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19320,7 +19340,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19330,15 +19350,15 @@ pub mod sessions {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19347,17 +19367,17 @@ pub mod sessions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19387,8 +19407,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19398,7 +19418,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sessions::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19427,7 +19447,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19437,7 +19457,7 @@ pub mod sessions {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -19448,8 +19468,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19459,8 +19479,8 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sessions::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19494,7 +19514,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19504,15 +19524,15 @@ pub mod sessions {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19521,17 +19541,17 @@ pub mod sessions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19567,8 +19587,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19578,7 +19598,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sessions::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19607,7 +19627,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19617,7 +19637,7 @@ pub mod sessions {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -19628,8 +19648,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19639,7 +19659,7 @@ pub mod sessions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sessions::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19670,7 +19690,7 @@ pub mod sessions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19680,7 +19700,7 @@ pub mod sessions {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -19691,8 +19711,8 @@ pub mod sessions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19706,7 +19726,7 @@ pub mod session_entity_types {
     /// A builder for [SessionEntityTypes][crate::client::SessionEntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::session_entity_types::ClientBuilder;
     /// # use client::SessionEntityTypes;
@@ -19716,19 +19736,18 @@ pub mod session_entity_types {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SessionEntityTypes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SessionEntityTypes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -19739,7 +19758,7 @@ pub mod session_entity_types {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SessionEntityTypes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -19752,7 +19771,7 @@ pub mod session_entity_types {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -19762,8 +19781,8 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::ListSessionEntityTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -19797,7 +19816,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19807,15 +19826,15 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .list_session_entity_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListSessionEntityTypesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -19824,17 +19843,17 @@ pub mod session_entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSessionEntityTypesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -19860,8 +19879,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessionEntityTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessionEntityTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19871,7 +19890,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::GetSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19902,7 +19921,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19912,7 +19931,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .get_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSessionEntityTypeRequest::name].
@@ -19925,8 +19944,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -19936,7 +19955,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::CreateSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -19969,7 +19988,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -19979,7 +19998,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .create_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSessionEntityTypeRequest::parent].
@@ -20014,8 +20033,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20025,7 +20044,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::UpdateSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20058,7 +20077,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20068,7 +20087,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .update_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session_entity_type][crate::model::UpdateSessionEntityTypeRequest::session_entity_type].
@@ -20113,8 +20132,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20124,7 +20143,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::DeleteSessionEntityType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20157,7 +20176,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20167,7 +20186,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .delete_session_entity_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSessionEntityTypeRequest::name].
@@ -20180,8 +20199,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSessionEntityType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSessionEntityType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20191,8 +20210,8 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20226,7 +20245,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20236,15 +20255,15 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20253,17 +20272,17 @@ pub mod session_entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20293,8 +20312,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20304,7 +20323,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20335,7 +20354,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20345,7 +20364,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -20356,8 +20375,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20367,8 +20386,8 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20404,7 +20423,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20414,15 +20433,15 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20431,17 +20450,17 @@ pub mod session_entity_types {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20477,8 +20496,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20488,7 +20507,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20519,7 +20538,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20529,7 +20548,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -20540,8 +20559,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20551,7 +20570,7 @@ pub mod session_entity_types {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::session_entity_types::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20584,7 +20603,7 @@ pub mod session_entity_types {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20594,7 +20613,7 @@ pub mod session_entity_types {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -20605,8 +20624,8 @@ pub mod session_entity_types {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20620,7 +20639,7 @@ pub mod sip_trunks {
     /// A builder for [SipTrunks][crate::client::SipTrunks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::sip_trunks::ClientBuilder;
     /// # use client::SipTrunks;
@@ -20630,19 +20649,18 @@ pub mod sip_trunks {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SipTrunks;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SipTrunks;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -20653,7 +20671,7 @@ pub mod sip_trunks {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SipTrunks>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -20666,7 +20684,7 @@ pub mod sip_trunks {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -20676,7 +20694,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::CreateSipTrunk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20704,7 +20722,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20714,7 +20732,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .create_sip_trunk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSipTrunkRequest::parent].
@@ -20749,8 +20767,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSipTrunk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSipTrunk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20760,7 +20778,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::DeleteSipTrunk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20788,7 +20806,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20798,7 +20816,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .delete_sip_trunk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSipTrunkRequest::name].
@@ -20811,8 +20829,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSipTrunk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSipTrunk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20822,8 +20840,8 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::ListSipTrunks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -20854,7 +20872,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20864,13 +20882,13 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .list_sip_trunks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSipTrunksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSipTrunksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -20879,15 +20897,17 @@ pub mod sip_trunks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSipTrunksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSipTrunksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -20913,8 +20933,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSipTrunks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSipTrunks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20924,7 +20944,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::GetSipTrunk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -20952,7 +20972,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -20962,7 +20982,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .get_sip_trunk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSipTrunkRequest::name].
@@ -20975,8 +20995,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSipTrunk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSipTrunk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -20986,7 +21006,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::UpdateSipTrunk;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21014,7 +21034,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21024,7 +21044,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .update_sip_trunk(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [sip_trunk][crate::model::UpdateSipTrunkRequest::sip_trunk].
@@ -21069,8 +21089,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSipTrunk {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSipTrunk {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21080,8 +21100,8 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21115,7 +21135,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21125,15 +21145,15 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21142,17 +21162,17 @@ pub mod sip_trunks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21182,8 +21202,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21193,7 +21213,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21224,7 +21244,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21234,7 +21254,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -21245,8 +21265,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21256,8 +21276,8 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21293,7 +21313,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21303,15 +21323,15 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21320,17 +21340,17 @@ pub mod sip_trunks {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21366,8 +21386,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21377,7 +21397,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21408,7 +21428,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21418,7 +21438,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -21429,8 +21449,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21440,7 +21460,7 @@ pub mod sip_trunks {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::sip_trunks::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21473,7 +21493,7 @@ pub mod sip_trunks {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21483,7 +21503,7 @@ pub mod sip_trunks {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -21494,8 +21514,8 @@ pub mod sip_trunks {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21509,7 +21529,7 @@ pub mod tools {
     /// A builder for [Tools][crate::client::Tools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::tools::ClientBuilder;
     /// # use client::Tools;
@@ -21519,19 +21539,18 @@ pub mod tools {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Tools;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Tools;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -21542,7 +21561,7 @@ pub mod tools {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Tools>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -21553,7 +21572,7 @@ pub mod tools {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -21563,7 +21582,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::CreateTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21589,7 +21608,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21599,7 +21618,7 @@ pub mod tools {
             (*self.0.stub)
                 .create_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateToolRequest::parent].
@@ -21640,8 +21659,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21651,7 +21670,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::GetTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21677,7 +21696,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21687,7 +21706,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetToolRequest::name].
@@ -21700,8 +21719,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21711,8 +21730,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::ListTools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21741,7 +21760,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21751,13 +21770,13 @@ pub mod tools {
             (*self.0.stub)
                 .list_tools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListToolsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListToolsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -21766,15 +21785,15 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListToolsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListToolsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -21800,8 +21819,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21811,7 +21830,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::DeleteTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21837,7 +21856,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21847,7 +21866,7 @@ pub mod tools {
             (*self.0.stub)
                 .delete_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteToolRequest::name].
@@ -21860,8 +21879,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21871,7 +21890,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::UpdateTool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -21897,7 +21916,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -21907,7 +21926,7 @@ pub mod tools {
             (*self.0.stub)
                 .update_tool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tool][crate::model::UpdateToolRequest::tool].
@@ -21952,8 +21971,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -21963,8 +21982,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -21996,7 +22015,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22006,15 +22025,15 @@ pub mod tools {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -22023,17 +22042,17 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22063,8 +22082,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22074,7 +22093,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22103,7 +22122,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22113,7 +22132,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -22124,8 +22143,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22135,8 +22154,8 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -22170,7 +22189,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22180,15 +22199,15 @@ pub mod tools {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -22197,17 +22216,17 @@ pub mod tools {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22243,8 +22262,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22254,7 +22273,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22283,7 +22302,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22293,7 +22312,7 @@ pub mod tools {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -22304,8 +22323,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22315,7 +22334,7 @@ pub mod tools {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::tools::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22346,7 +22365,7 @@ pub mod tools {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22356,7 +22375,7 @@ pub mod tools {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -22367,8 +22386,8 @@ pub mod tools {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22382,7 +22401,7 @@ pub mod versions {
     /// A builder for [Versions][crate::client::Versions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::*;
     /// # use builder::versions::ClientBuilder;
     /// # use client::Versions;
@@ -22392,19 +22411,18 @@ pub mod versions {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Versions;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Versions;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -22415,7 +22433,7 @@ pub mod versions {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Versions>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -22426,7 +22444,7 @@ pub mod versions {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -22436,8 +22454,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::ListVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -22466,7 +22484,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22476,13 +22494,13 @@ pub mod versions {
             (*self.0.stub)
                 .list_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVersionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVersionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -22491,15 +22509,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVersionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVersionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22525,8 +22545,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22536,7 +22556,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::GetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22562,7 +22582,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22572,7 +22592,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVersionRequest::name].
@@ -22585,8 +22605,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22596,7 +22616,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::CreateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22622,7 +22642,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22632,7 +22652,7 @@ pub mod versions {
             (*self.0.stub)
                 .create_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateVersionRequest::parent].
@@ -22667,8 +22687,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22678,7 +22698,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::UpdateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22704,7 +22724,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22714,7 +22734,7 @@ pub mod versions {
             (*self.0.stub)
                 .update_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [version][crate::model::UpdateVersionRequest::version].
@@ -22763,8 +22783,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22774,7 +22794,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::DeleteVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22800,7 +22820,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22810,7 +22830,7 @@ pub mod versions {
             (*self.0.stub)
                 .delete_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteVersionRequest::name].
@@ -22823,8 +22843,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22834,8 +22854,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -22867,7 +22887,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22877,15 +22897,15 @@ pub mod versions {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -22894,17 +22914,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -22934,8 +22954,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -22945,7 +22965,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -22974,7 +22994,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -22984,7 +23004,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -22995,8 +23015,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23006,8 +23026,8 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -23041,7 +23061,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23051,15 +23071,15 @@ pub mod versions {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -23068,17 +23088,17 @@ pub mod versions {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -23114,8 +23134,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23125,7 +23145,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23154,7 +23174,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23164,7 +23184,7 @@ pub mod versions {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -23175,8 +23195,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -23186,7 +23206,7 @@ pub mod versions {
     /// # Example
     /// ```
     /// # use google_cloud_dialogflow_v2::builder::versions::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dialogflow_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -23217,7 +23237,7 @@ pub mod versions {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -23227,7 +23247,7 @@ pub mod versions {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -23238,8 +23258,8 @@ pub mod versions {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/dialogflow/v2/src/client.rs b/src/generated/cloud/dialogflow/v2/src/client.rs
index 99d3d0ac37..00de25bfdc 100644
--- a/src/generated/cloud/dialogflow/v2/src/client.rs
+++ b/src/generated/cloud/dialogflow/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Agents;
 /// let client = Agents::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -71,13 +71,13 @@ impl Agents {
     /// Returns a builder for [Agents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Agents;
     /// let client = Agents::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::agents::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::agents::client::Factory)
+        crate::new_client_builder(super::builder::agents::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,14 +95,14 @@ impl Agents {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Agents>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Agents>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -111,13 +111,13 @@ impl Agents {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Agents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Agents> {
         super::transport::Agents::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Agents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Agents> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Agents::new)
@@ -334,7 +334,7 @@ impl Agents {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::AnswerRecords;
 /// let client = AnswerRecords::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -386,13 +386,13 @@ impl AnswerRecords {
     /// Returns a builder for [AnswerRecords].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::AnswerRecords;
     /// let client = AnswerRecords::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::answer_records::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::answer_records::client::Factory)
+        crate::new_client_builder(super::builder::answer_records::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -410,14 +410,14 @@ impl AnswerRecords {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AnswerRecords>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AnswerRecords>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -426,13 +426,13 @@ impl AnswerRecords {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AnswerRecords> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AnswerRecords> {
         super::transport::AnswerRecords::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AnswerRecords> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AnswerRecords> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AnswerRecords::new)
@@ -485,7 +485,7 @@ impl AnswerRecords {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Contexts;
 /// let client = Contexts::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -536,13 +536,13 @@ impl Contexts {
     /// Returns a builder for [Contexts].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Contexts;
     /// let client = Contexts::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::contexts::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::contexts::client::Factory)
+        crate::new_client_builder(super::builder::contexts::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -560,14 +560,14 @@ impl Contexts {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Contexts>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Contexts>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -576,13 +576,13 @@ impl Contexts {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Contexts> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Contexts> {
         super::transport::Contexts::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Contexts> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Contexts> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Contexts::new)
@@ -656,7 +656,7 @@ impl Contexts {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Conversations;
 /// let client = Conversations::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -708,13 +708,13 @@ impl Conversations {
     /// Returns a builder for [Conversations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Conversations;
     /// let client = Conversations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::conversations::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::conversations::client::Factory)
+        crate::new_client_builder(super::builder::conversations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -732,14 +732,14 @@ impl Conversations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Conversations>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Conversations>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -748,13 +748,13 @@ impl Conversations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Conversations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Conversations> {
         super::transport::Conversations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Conversations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Conversations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Conversations::new)
@@ -895,7 +895,7 @@ impl Conversations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::ConversationDatasets;
 /// let client = ConversationDatasets::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -947,15 +947,13 @@ impl ConversationDatasets {
     /// Returns a builder for [ConversationDatasets].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::ConversationDatasets;
     /// let client = ConversationDatasets::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::conversation_datasets::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::conversation_datasets::client::Factory,
-        )
+        crate::new_client_builder(super::builder::conversation_datasets::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -973,14 +971,14 @@ impl ConversationDatasets {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConversationDatasets>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConversationDatasets>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -990,13 +988,13 @@ impl ConversationDatasets {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationDatasets> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationDatasets> {
         super::transport::ConversationDatasets::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationDatasets> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationDatasets> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConversationDatasets::new)
@@ -1141,7 +1139,7 @@ impl ConversationDatasets {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::ConversationModels;
 /// let client = ConversationModels::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1190,15 +1188,13 @@ impl ConversationModels {
     /// Returns a builder for [ConversationModels].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::ConversationModels;
     /// let client = ConversationModels::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::conversation_models::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::conversation_models::client::Factory,
-        )
+        crate::new_client_builder(super::builder::conversation_models::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1216,14 +1212,14 @@ impl ConversationModels {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConversationModels>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConversationModels>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1233,13 +1229,13 @@ impl ConversationModels {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationModels> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationModels> {
         super::transport::ConversationModels::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationModels> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationModels> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConversationModels::new)
@@ -1450,7 +1446,7 @@ impl ConversationModels {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::ConversationProfiles;
 /// let client = ConversationProfiles::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1502,15 +1498,13 @@ impl ConversationProfiles {
     /// Returns a builder for [ConversationProfiles].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::ConversationProfiles;
     /// let client = ConversationProfiles::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::conversation_profiles::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::conversation_profiles::client::Factory,
-        )
+        crate::new_client_builder(super::builder::conversation_profiles::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1528,14 +1522,14 @@ impl ConversationProfiles {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ConversationProfiles>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ConversationProfiles>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1545,13 +1539,13 @@ impl ConversationProfiles {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationProfiles> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationProfiles> {
         super::transport::ConversationProfiles::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationProfiles> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationProfiles> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConversationProfiles::new)
@@ -1717,7 +1711,7 @@ impl ConversationProfiles {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Documents;
 /// let client = Documents::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -1769,13 +1763,13 @@ impl Documents {
     /// Returns a builder for [Documents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Documents;
     /// let client = Documents::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::documents::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::documents::client::Factory)
+        crate::new_client_builder(super::builder::documents::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1793,14 +1787,14 @@ impl Documents {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Documents>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Documents>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1809,13 +1803,13 @@ impl Documents {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Documents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Documents> {
         super::transport::Documents::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Documents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Documents> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Documents::new)
@@ -2033,7 +2027,7 @@ impl Documents {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::EncryptionSpecService;
 /// let client = EncryptionSpecService::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2082,15 +2076,13 @@ impl EncryptionSpecService {
     /// Returns a builder for [EncryptionSpecService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::EncryptionSpecService;
     /// let client = EncryptionSpecService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::encryption_spec_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::encryption_spec_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::encryption_spec_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2108,14 +2100,14 @@ impl EncryptionSpecService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EncryptionSpecService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EncryptionSpecService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2125,13 +2117,13 @@ impl EncryptionSpecService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EncryptionSpecService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EncryptionSpecService> {
         super::transport::EncryptionSpecService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EncryptionSpecService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EncryptionSpecService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EncryptionSpecService::new)
@@ -2201,7 +2193,7 @@ impl EncryptionSpecService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::EntityTypes;
 /// let client = EntityTypes::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2252,13 +2244,13 @@ impl EntityTypes {
     /// Returns a builder for [EntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::EntityTypes;
     /// let client = EntityTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::entity_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::entity_types::client::Factory)
+        crate::new_client_builder(super::builder::entity_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2276,14 +2268,14 @@ impl EntityTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EntityTypes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EntityTypes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2292,13 +2284,13 @@ impl EntityTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EntityTypes> {
         super::transport::EntityTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EntityTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EntityTypes::new)
@@ -2525,7 +2517,7 @@ impl EntityTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Environments;
 /// let client = Environments::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2576,13 +2568,13 @@ impl Environments {
     /// Returns a builder for [Environments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Environments;
     /// let client = Environments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::environments::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::environments::client::Factory)
+        crate::new_client_builder(super::builder::environments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2600,14 +2592,14 @@ impl Environments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Environments>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Environments>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2616,13 +2608,13 @@ impl Environments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Environments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Environments> {
         super::transport::Environments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Environments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Environments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Environments::new)
@@ -2705,7 +2697,7 @@ impl Environments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Fulfillments;
 /// let client = Fulfillments::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2756,13 +2748,13 @@ impl Fulfillments {
     /// Returns a builder for [Fulfillments].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Fulfillments;
     /// let client = Fulfillments::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::fulfillments::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::fulfillments::client::Factory)
+        crate::new_client_builder(super::builder::fulfillments::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2780,14 +2772,14 @@ impl Fulfillments {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Fulfillments>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Fulfillments>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2796,13 +2788,13 @@ impl Fulfillments {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Fulfillments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Fulfillments> {
         super::transport::Fulfillments::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Fulfillments> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Fulfillments> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Fulfillments::new)
@@ -2854,7 +2846,7 @@ impl Fulfillments {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Generators;
 /// let client = Generators::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -2907,13 +2899,13 @@ impl Generators {
     /// Returns a builder for [Generators].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Generators;
     /// let client = Generators::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::generators::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::generators::client::Factory)
+        crate::new_client_builder(super::builder::generators::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2931,14 +2923,14 @@ impl Generators {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Generators>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Generators>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2947,13 +2939,13 @@ impl Generators {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Generators> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Generators> {
         super::transport::Generators::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Generators> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Generators> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Generators::new)
@@ -3020,7 +3012,7 @@ impl Generators {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::GeneratorEvaluations;
 /// let client = GeneratorEvaluations::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3069,15 +3061,13 @@ impl GeneratorEvaluations {
     /// Returns a builder for [GeneratorEvaluations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::GeneratorEvaluations;
     /// let client = GeneratorEvaluations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::generator_evaluations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::generator_evaluations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::generator_evaluations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3095,14 +3085,14 @@ impl GeneratorEvaluations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GeneratorEvaluations>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GeneratorEvaluations>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3112,13 +3102,13 @@ impl GeneratorEvaluations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GeneratorEvaluations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GeneratorEvaluations> {
         super::transport::GeneratorEvaluations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GeneratorEvaluations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GeneratorEvaluations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GeneratorEvaluations::new)
@@ -3198,7 +3188,7 @@ impl GeneratorEvaluations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Intents;
 /// let client = Intents::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3249,13 +3239,13 @@ impl Intents {
     /// Returns a builder for [Intents].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Intents;
     /// let client = Intents::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::intents::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::intents::client::Factory)
+        crate::new_client_builder(super::builder::intents::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3273,14 +3263,14 @@ impl Intents {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Intents>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Intents>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3289,13 +3279,13 @@ impl Intents {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Intents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Intents> {
         super::transport::Intents::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Intents> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Intents> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Intents::new)
@@ -3432,7 +3422,7 @@ impl Intents {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::KnowledgeBases;
 /// let client = KnowledgeBases::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3484,13 +3474,13 @@ impl KnowledgeBases {
     /// Returns a builder for [KnowledgeBases].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::KnowledgeBases;
     /// let client = KnowledgeBases::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::knowledge_bases::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::knowledge_bases::client::Factory)
+        crate::new_client_builder(super::builder::knowledge_bases::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3508,14 +3498,14 @@ impl KnowledgeBases {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::KnowledgeBases>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::KnowledgeBases>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3524,13 +3514,13 @@ impl KnowledgeBases {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KnowledgeBases> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KnowledgeBases> {
         super::transport::KnowledgeBases::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KnowledgeBases> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KnowledgeBases> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::KnowledgeBases::new)
@@ -3597,7 +3587,7 @@ impl KnowledgeBases {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Participants;
 /// let client = Participants::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3648,13 +3638,13 @@ impl Participants {
     /// Returns a builder for [Participants].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Participants;
     /// let client = Participants::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::participants::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::participants::client::Factory)
+        crate::new_client_builder(super::builder::participants::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3672,14 +3662,14 @@ impl Participants {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Participants>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Participants>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3688,13 +3678,13 @@ impl Participants {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Participants> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Participants> {
         super::transport::Participants::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Participants> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Participants> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Participants::new)
@@ -3789,7 +3779,7 @@ impl Participants {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Sessions;
 /// let client = Sessions::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -3841,13 +3831,13 @@ impl Sessions {
     /// Returns a builder for [Sessions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Sessions;
     /// let client = Sessions::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::sessions::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::sessions::client::Factory)
+        crate::new_client_builder(super::builder::sessions::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3865,14 +3855,14 @@ impl Sessions {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Sessions>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Sessions>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3881,13 +3871,13 @@ impl Sessions {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Sessions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Sessions> {
         super::transport::Sessions::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Sessions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Sessions> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Sessions::new)
@@ -3950,7 +3940,7 @@ impl Sessions {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::SessionEntityTypes;
 /// let client = SessionEntityTypes::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -4002,15 +3992,13 @@ impl SessionEntityTypes {
     /// Returns a builder for [SessionEntityTypes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::SessionEntityTypes;
     /// let client = SessionEntityTypes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::session_entity_types::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::session_entity_types::client::Factory,
-        )
+        crate::new_client_builder(super::builder::session_entity_types::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4028,14 +4016,14 @@ impl SessionEntityTypes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SessionEntityTypes>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SessionEntityTypes>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -4045,13 +4033,13 @@ impl SessionEntityTypes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionEntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionEntityTypes> {
         super::transport::SessionEntityTypes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionEntityTypes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionEntityTypes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SessionEntityTypes::new)
@@ -4151,7 +4139,7 @@ impl SessionEntityTypes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::SipTrunks;
 /// let client = SipTrunks::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -4202,13 +4190,13 @@ impl SipTrunks {
     /// Returns a builder for [SipTrunks].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::SipTrunks;
     /// let client = SipTrunks::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::sip_trunks::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::sip_trunks::client::Factory)
+        crate::new_client_builder(super::builder::sip_trunks::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4226,14 +4214,14 @@ impl SipTrunks {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SipTrunks>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SipTrunks>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4242,13 +4230,13 @@ impl SipTrunks {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SipTrunks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SipTrunks> {
         super::transport::SipTrunks::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SipTrunks> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SipTrunks> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SipTrunks::new)
@@ -4315,7 +4303,7 @@ impl SipTrunks {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Tools;
 /// let client = Tools::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -4366,13 +4354,13 @@ impl Tools {
     /// Returns a builder for [Tools].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Tools;
     /// let client = Tools::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::tools::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::tools::client::Factory)
+        crate::new_client_builder(super::builder::tools::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4390,14 +4378,14 @@ impl Tools {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Tools>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Tools>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4406,13 +4394,13 @@ impl Tools {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Tools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Tools> {
         super::transport::Tools::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Tools> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Tools> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Tools::new)
@@ -4479,7 +4467,7 @@ impl Tools {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dialogflow_v2::client::Versions;
 /// let client = Versions::builder().build().await?;
 /// // use `client` to make requests to the Dialogflow API.
@@ -4530,13 +4518,13 @@ impl Versions {
     /// Returns a builder for [Versions].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dialogflow_v2::client::Versions;
     /// let client = Versions::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::versions::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::versions::client::Factory)
+        crate::new_client_builder(super::builder::versions::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -4554,14 +4542,14 @@ impl Versions {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Versions>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Versions>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -4570,13 +4558,13 @@ impl Versions {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Versions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Versions> {
         super::transport::Versions::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Versions> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Versions> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Versions::new)
diff --git a/src/generated/cloud/dialogflow/v2/src/lib.rs b/src/generated/cloud/dialogflow/v2/src/lib.rs
index 72a657dd95..5c396c1c03 100644
--- a/src/generated/cloud/dialogflow/v2/src/lib.rs
+++ b/src/generated/cloud/dialogflow/v2/src/lib.rs
@@ -77,8 +77,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -161,3 +161,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/dialogflow/v2/src/model.rs b/src/generated/cloud/dialogflow/v2/src/model.rs
index 1909ce6eed..f37dad5d0e 100644
--- a/src/generated/cloud/dialogflow/v2/src/model.rs
+++ b/src/generated/cloud/dialogflow/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1061,7 +1061,7 @@ impl wkt::message::Message for SearchAgentsResponse {
 
 #[cfg(feature = "agents")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchAgentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchAgentsResponse {
     type PageItem = crate::model::Agent;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2640,7 +2640,7 @@ impl wkt::message::Message for ListAnswerRecordsResponse {
 
 #[cfg(feature = "answer-records")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAnswerRecordsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAnswerRecordsResponse {
     type PageItem = crate::model::AnswerRecord;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6057,7 +6057,7 @@ impl wkt::message::Message for ListContextsResponse {
 
 #[cfg(feature = "contexts")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListContextsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListContextsResponse {
     type PageItem = crate::model::Context;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8009,7 +8009,7 @@ impl wkt::message::Message for ListConversationsResponse {
 
 #[cfg(feature = "conversations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversationsResponse {
     type PageItem = crate::model::Conversation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8271,7 +8271,7 @@ impl wkt::message::Message for ListMessagesResponse {
 
 #[cfg(feature = "conversations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMessagesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMessagesResponse {
     type PageItem = crate::model::Message;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12057,7 +12057,7 @@ impl wkt::message::Message for ListConversationDatasetsResponse {
 
 #[cfg(feature = "conversation-datasets")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationDatasetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversationDatasetsResponse {
     type PageItem = crate::model::ConversationDataset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -14892,7 +14892,7 @@ impl wkt::message::Message for ListConversationModelsResponse {
 
 #[cfg(feature = "conversation-models")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationModelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversationModelsResponse {
     type PageItem = crate::model::ConversationModel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -15210,7 +15210,9 @@ impl wkt::message::Message for ListConversationModelEvaluationsResponse {
 
 #[cfg(feature = "conversation-models")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationModelEvaluationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListConversationModelEvaluationsResponse
+{
     type PageItem = crate::model::ConversationModelEvaluation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -16949,7 +16951,7 @@ impl wkt::message::Message for ListConversationProfilesResponse {
 
 #[cfg(feature = "conversation-profiles")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationProfilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversationProfilesResponse {
     type PageItem = crate::model::ConversationProfile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -21383,7 +21385,7 @@ impl wkt::message::Message for ListDocumentsResponse {
 
 #[cfg(feature = "documents")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDocumentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDocumentsResponse {
     type PageItem = crate::model::Document;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -23694,7 +23696,7 @@ impl wkt::message::Message for ListEntityTypesResponse {
 
 #[cfg(feature = "entity-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEntityTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEntityTypesResponse {
     type PageItem = crate::model::EntityType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -25337,7 +25339,7 @@ impl wkt::message::Message for ListEnvironmentsResponse {
 
 #[cfg(feature = "environments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEnvironmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEnvironmentsResponse {
     type PageItem = crate::model::Environment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -25826,7 +25828,7 @@ impl wkt::message::Message for EnvironmentHistory {
 
 #[cfg(feature = "environments")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for EnvironmentHistory {
+impl google_cloud_gax::paginator::internal::PageableResponse for EnvironmentHistory {
     type PageItem = crate::model::environment_history::Entry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -26930,7 +26932,7 @@ impl wkt::message::Message for ListGeneratorsResponse {
 
 #[cfg(feature = "generators")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGeneratorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGeneratorsResponse {
     type PageItem = crate::model::Generator;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -31036,7 +31038,7 @@ impl wkt::message::Message for ListGeneratorEvaluationsResponse {
 
 #[cfg(feature = "generator-evaluations")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGeneratorEvaluationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGeneratorEvaluationsResponse {
     type PageItem = crate::model::GeneratorEvaluation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -40506,7 +40508,7 @@ impl wkt::message::Message for ListIntentsResponse {
 
 #[cfg(feature = "intents")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIntentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIntentsResponse {
     type PageItem = crate::model::Intent;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -41550,7 +41552,7 @@ impl wkt::message::Message for ListKnowledgeBasesResponse {
 
 #[cfg(feature = "knowledge-bases")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListKnowledgeBasesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListKnowledgeBasesResponse {
     type PageItem = crate::model::KnowledgeBase;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -43026,7 +43028,7 @@ impl wkt::message::Message for ListParticipantsResponse {
 
 #[cfg(feature = "participants")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListParticipantsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListParticipantsResponse {
     type PageItem = crate::model::Participant;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -51986,7 +51988,7 @@ impl wkt::message::Message for ListSessionEntityTypesResponse {
 
 #[cfg(feature = "session-entity-types")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSessionEntityTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSessionEntityTypesResponse {
     type PageItem = crate::model::SessionEntityType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -52528,7 +52530,7 @@ impl wkt::message::Message for ListSipTrunksResponse {
 
 #[cfg(feature = "sip-trunks")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSipTrunksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSipTrunksResponse {
     type PageItem = crate::model::SipTrunk;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -53635,7 +53637,7 @@ impl wkt::message::Message for ListToolsResponse {
 
 #[cfg(feature = "tools")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListToolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListToolsResponse {
     type PageItem = crate::model::Tool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -58272,7 +58274,7 @@ impl wkt::message::Message for ListVersionsResponse {
 
 #[cfg(feature = "versions")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVersionsResponse {
     type PageItem = crate::model::Version;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/dialogflow/v2/src/stub.rs b/src/generated/cloud/dialogflow/v2/src/stub.rs
index 21f6805a01..863c4f1ff8 100644
--- a/src/generated/cloud/dialogflow/v2/src/stub.rs
+++ b/src/generated/cloud/dialogflow/v2/src/stub.rs
@@ -44,10 +44,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_agent(
         &self,
         _req: crate::model::GetAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Agent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Agent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -55,10 +54,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn set_agent(
         &self,
         _req: crate::model::SetAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Agent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Agent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -66,8 +64,8 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn delete_agent(
         &self,
         _req: crate::model::DeleteAgentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +73,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn search_agents(
         &self,
         _req: crate::model::SearchAgentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchAgentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchAgentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +84,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn train_agent(
         &self,
         _req: crate::model::TrainAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +95,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn export_agent(
         &self,
         _req: crate::model::ExportAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +106,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn import_agent(
         &self,
         _req: crate::model::ImportAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +117,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn restore_agent(
         &self,
         _req: crate::model::RestoreAgentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +128,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_validation_result(
         &self,
         _req: crate::model::GetValidationResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ValidationResult>>,
+        Output = crate::Result<crate::Response<crate::model::ValidationResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,10 +139,10 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -154,9 +152,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,10 +163,10 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -178,9 +176,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,8 +187,8 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -200,9 +198,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -211,9 +209,9 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -235,9 +233,9 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn list_answer_records(
         &self,
         _req: crate::model::ListAnswerRecordsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAnswerRecordsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAnswerRecordsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -246,9 +244,9 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn update_answer_record(
         &self,
         _req: crate::model::UpdateAnswerRecordRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnswerRecord>>,
+        Output = crate::Result<crate::Response<crate::model::AnswerRecord>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -257,10 +255,10 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -270,9 +268,9 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -281,10 +279,10 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -294,9 +292,9 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -305,8 +303,8 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -329,9 +327,9 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn list_contexts(
         &self,
         _req: crate::model::ListContextsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListContextsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListContextsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -340,10 +338,9 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn get_context(
         &self,
         _req: crate::model::GetContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -351,10 +348,9 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn create_context(
         &self,
         _req: crate::model::CreateContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -362,10 +358,9 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn update_context(
         &self,
         _req: crate::model::UpdateContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -373,8 +368,8 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn delete_context(
         &self,
         _req: crate::model::DeleteContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -382,8 +377,8 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn delete_all_contexts(
         &self,
         _req: crate::model::DeleteAllContextsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -391,10 +386,10 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -404,9 +399,9 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -415,10 +410,10 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -428,9 +423,9 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -439,8 +434,8 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -463,9 +458,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn create_conversation(
         &self,
         _req: crate::model::CreateConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -474,9 +469,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn list_conversations(
         &self,
         _req: crate::model::ListConversationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConversationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConversationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -485,9 +480,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn get_conversation(
         &self,
         _req: crate::model::GetConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -496,9 +491,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn complete_conversation(
         &self,
         _req: crate::model::CompleteConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -507,11 +502,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn ingest_context_references(
         &self,
         _req: crate::model::IngestContextReferencesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::IngestContextReferencesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::IngestContextReferencesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -520,9 +513,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn list_messages(
         &self,
         _req: crate::model::ListMessagesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMessagesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMessagesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -531,11 +524,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn suggest_conversation_summary(
         &self,
         _req: crate::model::SuggestConversationSummaryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SuggestConversationSummaryResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SuggestConversationSummaryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -544,11 +535,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn generate_stateless_summary(
         &self,
         _req: crate::model::GenerateStatelessSummaryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateStatelessSummaryResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateStatelessSummaryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -557,11 +546,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn generate_stateless_suggestion(
         &self,
         _req: crate::model::GenerateStatelessSuggestionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateStatelessSuggestionResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateStatelessSuggestionResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -570,9 +557,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn search_knowledge(
         &self,
         _req: crate::model::SearchKnowledgeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchKnowledgeResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchKnowledgeResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -581,9 +568,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn generate_suggestions(
         &self,
         _req: crate::model::GenerateSuggestionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateSuggestionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateSuggestionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -592,10 +579,10 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -605,9 +592,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -616,10 +603,10 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -629,9 +616,9 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -640,8 +627,8 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -664,9 +651,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn create_conversation_dataset(
         &self,
         _req: crate::model::CreateConversationDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -675,9 +662,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn get_conversation_dataset(
         &self,
         _req: crate::model::GetConversationDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversationDataset>>,
+        Output = crate::Result<crate::Response<crate::model::ConversationDataset>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -686,11 +673,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn list_conversation_datasets(
         &self,
         _req: crate::model::ListConversationDatasetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConversationDatasetsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConversationDatasetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -699,9 +684,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn delete_conversation_dataset(
         &self,
         _req: crate::model::DeleteConversationDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -710,9 +695,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn import_conversation_data(
         &self,
         _req: crate::model::ImportConversationDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -721,10 +706,10 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -734,9 +719,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -745,10 +730,10 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -758,9 +743,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -769,8 +754,8 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -780,9 +765,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -791,9 +776,9 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -815,9 +800,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn create_conversation_model(
         &self,
         _req: crate::model::CreateConversationModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -826,9 +811,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn get_conversation_model(
         &self,
         _req: crate::model::GetConversationModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversationModel>>,
+        Output = crate::Result<crate::Response<crate::model::ConversationModel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -837,11 +822,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn list_conversation_models(
         &self,
         _req: crate::model::ListConversationModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConversationModelsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConversationModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -850,9 +833,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn delete_conversation_model(
         &self,
         _req: crate::model::DeleteConversationModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -861,9 +844,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn deploy_conversation_model(
         &self,
         _req: crate::model::DeployConversationModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -872,9 +855,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn undeploy_conversation_model(
         &self,
         _req: crate::model::UndeployConversationModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -883,9 +866,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn get_conversation_model_evaluation(
         &self,
         _req: crate::model::GetConversationModelEvaluationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversationModelEvaluation>>,
+        Output = crate::Result<crate::Response<crate::model::ConversationModelEvaluation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -894,10 +877,10 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn list_conversation_model_evaluations(
         &self,
         _req: crate::model::ListConversationModelEvaluationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListConversationModelEvaluationsResponse>,
+            crate::Response<crate::model::ListConversationModelEvaluationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -907,9 +890,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn create_conversation_model_evaluation(
         &self,
         _req: crate::model::CreateConversationModelEvaluationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -918,10 +901,10 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -931,9 +914,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -942,10 +925,10 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -955,9 +938,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -966,8 +949,8 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -977,9 +960,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -988,9 +971,9 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1012,11 +995,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn list_conversation_profiles(
         &self,
         _req: crate::model::ListConversationProfilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListConversationProfilesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListConversationProfilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1025,9 +1006,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn get_conversation_profile(
         &self,
         _req: crate::model::GetConversationProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversationProfile>>,
+        Output = crate::Result<crate::Response<crate::model::ConversationProfile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1036,9 +1017,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn create_conversation_profile(
         &self,
         _req: crate::model::CreateConversationProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversationProfile>>,
+        Output = crate::Result<crate::Response<crate::model::ConversationProfile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1047,9 +1028,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn update_conversation_profile(
         &self,
         _req: crate::model::UpdateConversationProfileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConversationProfile>>,
+        Output = crate::Result<crate::Response<crate::model::ConversationProfile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1058,8 +1039,8 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn delete_conversation_profile(
         &self,
         _req: crate::model::DeleteConversationProfileRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1067,9 +1048,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn set_suggestion_feature_config(
         &self,
         _req: crate::model::SetSuggestionFeatureConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1078,9 +1059,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn clear_suggestion_feature_config(
         &self,
         _req: crate::model::ClearSuggestionFeatureConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1089,10 +1070,10 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1102,9 +1083,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1113,10 +1094,10 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1126,9 +1107,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1137,8 +1118,8 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1148,9 +1129,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1159,9 +1140,9 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1183,9 +1164,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn list_documents(
         &self,
         _req: crate::model::ListDocumentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDocumentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1194,10 +1175,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn get_document(
         &self,
         _req: crate::model::GetDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1205,9 +1185,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn create_document(
         &self,
         _req: crate::model::CreateDocumentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1216,9 +1196,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn import_documents(
         &self,
         _req: crate::model::ImportDocumentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1227,9 +1207,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn delete_document(
         &self,
         _req: crate::model::DeleteDocumentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1238,9 +1218,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn update_document(
         &self,
         _req: crate::model::UpdateDocumentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1249,9 +1229,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn reload_document(
         &self,
         _req: crate::model::ReloadDocumentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1260,9 +1240,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn export_document(
         &self,
         _req: crate::model::ExportDocumentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1271,10 +1251,10 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1284,9 +1264,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1295,10 +1275,10 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1308,9 +1288,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1319,8 +1299,8 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1330,9 +1310,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1341,9 +1321,9 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1365,9 +1345,9 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn get_encryption_spec(
         &self,
         _req: crate::model::GetEncryptionSpecRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EncryptionSpec>>,
+        Output = crate::Result<crate::Response<crate::model::EncryptionSpec>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1376,9 +1356,9 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn initialize_encryption_spec(
         &self,
         _req: crate::model::InitializeEncryptionSpecRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1387,10 +1367,10 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1400,9 +1380,9 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1411,10 +1391,10 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1424,9 +1404,9 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1435,8 +1415,8 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1446,9 +1426,9 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1457,9 +1437,9 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1481,9 +1461,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn list_entity_types(
         &self,
         _req: crate::model::ListEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEntityTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1492,10 +1472,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn get_entity_type(
         &self,
         _req: crate::model::GetEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1503,10 +1482,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn create_entity_type(
         &self,
         _req: crate::model::CreateEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1514,10 +1492,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn update_entity_type(
         &self,
         _req: crate::model::UpdateEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EntityType>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EntityType>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1525,8 +1502,8 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn delete_entity_type(
         &self,
         _req: crate::model::DeleteEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1534,9 +1511,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn batch_update_entity_types(
         &self,
         _req: crate::model::BatchUpdateEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1545,9 +1522,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn batch_delete_entity_types(
         &self,
         _req: crate::model::BatchDeleteEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1556,9 +1533,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn batch_create_entities(
         &self,
         _req: crate::model::BatchCreateEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1567,9 +1544,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn batch_update_entities(
         &self,
         _req: crate::model::BatchUpdateEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1578,9 +1555,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn batch_delete_entities(
         &self,
         _req: crate::model::BatchDeleteEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1589,10 +1566,10 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1602,9 +1579,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1613,10 +1590,10 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1626,9 +1603,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1637,8 +1614,8 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1648,9 +1625,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1659,9 +1636,9 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1683,9 +1660,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_environments(
         &self,
         _req: crate::model::ListEnvironmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1694,10 +1671,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_environment(
         &self,
         _req: crate::model::GetEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Environment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Environment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1705,10 +1681,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn create_environment(
         &self,
         _req: crate::model::CreateEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Environment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Environment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1716,10 +1691,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn update_environment(
         &self,
         _req: crate::model::UpdateEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Environment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Environment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1727,8 +1701,8 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn delete_environment(
         &self,
         _req: crate::model::DeleteEnvironmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1736,9 +1710,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_environment_history(
         &self,
         _req: crate::model::GetEnvironmentHistoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EnvironmentHistory>>,
+        Output = crate::Result<crate::Response<crate::model::EnvironmentHistory>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1747,10 +1721,10 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1760,9 +1734,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1771,10 +1745,10 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1784,9 +1758,9 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1795,8 +1769,8 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1819,10 +1793,9 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn get_fulfillment(
         &self,
         _req: crate::model::GetFulfillmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Fulfillment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Fulfillment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1830,10 +1803,9 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn update_fulfillment(
         &self,
         _req: crate::model::UpdateFulfillmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Fulfillment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Fulfillment>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1841,10 +1813,10 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1854,9 +1826,9 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1865,10 +1837,10 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1878,9 +1850,9 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1889,8 +1861,8 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1913,10 +1885,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn create_generator(
         &self,
         _req: crate::model::CreateGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Generator>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Generator>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1924,10 +1895,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn get_generator(
         &self,
         _req: crate::model::GetGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Generator>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Generator>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1935,9 +1905,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn list_generators(
         &self,
         _req: crate::model::ListGeneratorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGeneratorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGeneratorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1946,8 +1916,8 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn delete_generator(
         &self,
         _req: crate::model::DeleteGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1955,10 +1925,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn update_generator(
         &self,
         _req: crate::model::UpdateGeneratorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Generator>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Generator>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1966,10 +1935,10 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1979,9 +1948,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1990,10 +1959,10 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2003,9 +1972,9 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2014,8 +1983,8 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2038,9 +2007,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn create_generator_evaluation(
         &self,
         _req: crate::model::CreateGeneratorEvaluationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2049,9 +2018,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn get_generator_evaluation(
         &self,
         _req: crate::model::GetGeneratorEvaluationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GeneratorEvaluation>>,
+        Output = crate::Result<crate::Response<crate::model::GeneratorEvaluation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2060,11 +2029,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn list_generator_evaluations(
         &self,
         _req: crate::model::ListGeneratorEvaluationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListGeneratorEvaluationsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListGeneratorEvaluationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2073,8 +2040,8 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn delete_generator_evaluation(
         &self,
         _req: crate::model::DeleteGeneratorEvaluationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2082,10 +2049,10 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2095,9 +2062,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2106,10 +2073,10 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2119,9 +2086,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2130,8 +2097,8 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2141,9 +2108,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2152,9 +2119,9 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2176,9 +2143,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn list_intents(
         &self,
         _req: crate::model::ListIntentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIntentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIntentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2187,10 +2154,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn get_intent(
         &self,
         _req: crate::model::GetIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Intent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Intent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2198,10 +2164,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn create_intent(
         &self,
         _req: crate::model::CreateIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Intent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Intent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2209,10 +2174,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn update_intent(
         &self,
         _req: crate::model::UpdateIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Intent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Intent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2220,8 +2184,8 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn delete_intent(
         &self,
         _req: crate::model::DeleteIntentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2229,9 +2193,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn batch_update_intents(
         &self,
         _req: crate::model::BatchUpdateIntentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2240,9 +2204,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn batch_delete_intents(
         &self,
         _req: crate::model::BatchDeleteIntentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2251,10 +2215,10 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2264,9 +2228,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2275,10 +2239,10 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2288,9 +2252,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2299,8 +2263,8 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2310,9 +2274,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2321,9 +2285,9 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2345,9 +2309,9 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn list_knowledge_bases(
         &self,
         _req: crate::model::ListKnowledgeBasesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListKnowledgeBasesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListKnowledgeBasesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2356,9 +2320,9 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn get_knowledge_base(
         &self,
         _req: crate::model::GetKnowledgeBaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KnowledgeBase>>,
+        Output = crate::Result<crate::Response<crate::model::KnowledgeBase>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2367,9 +2331,9 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn create_knowledge_base(
         &self,
         _req: crate::model::CreateKnowledgeBaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KnowledgeBase>>,
+        Output = crate::Result<crate::Response<crate::model::KnowledgeBase>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2378,8 +2342,8 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn delete_knowledge_base(
         &self,
         _req: crate::model::DeleteKnowledgeBaseRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2387,9 +2351,9 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn update_knowledge_base(
         &self,
         _req: crate::model::UpdateKnowledgeBaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KnowledgeBase>>,
+        Output = crate::Result<crate::Response<crate::model::KnowledgeBase>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2398,10 +2362,10 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2411,9 +2375,9 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2422,10 +2386,10 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2435,9 +2399,9 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2446,8 +2410,8 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2470,10 +2434,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn create_participant(
         &self,
         _req: crate::model::CreateParticipantRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Participant>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Participant>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2481,10 +2444,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn get_participant(
         &self,
         _req: crate::model::GetParticipantRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Participant>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Participant>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2492,9 +2454,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn list_participants(
         &self,
         _req: crate::model::ListParticipantsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListParticipantsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListParticipantsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2503,10 +2465,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn update_participant(
         &self,
         _req: crate::model::UpdateParticipantRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Participant>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Participant>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2514,9 +2475,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn analyze_content(
         &self,
         _req: crate::model::AnalyzeContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalyzeContentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnalyzeContentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2525,9 +2486,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn suggest_articles(
         &self,
         _req: crate::model::SuggestArticlesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SuggestArticlesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SuggestArticlesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2536,9 +2497,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn suggest_faq_answers(
         &self,
         _req: crate::model::SuggestFaqAnswersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SuggestFaqAnswersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SuggestFaqAnswersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2547,9 +2508,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn suggest_smart_replies(
         &self,
         _req: crate::model::SuggestSmartRepliesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SuggestSmartRepliesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SuggestSmartRepliesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2558,11 +2519,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn suggest_knowledge_assist(
         &self,
         _req: crate::model::SuggestKnowledgeAssistRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SuggestKnowledgeAssistResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SuggestKnowledgeAssistResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2571,10 +2530,10 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2584,9 +2543,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2595,10 +2554,10 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2608,9 +2567,9 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2619,8 +2578,8 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2643,9 +2602,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn detect_intent(
         &self,
         _req: crate::model::DetectIntentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DetectIntentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DetectIntentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2654,10 +2613,10 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2667,9 +2626,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2678,10 +2637,10 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2691,9 +2650,9 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2702,8 +2661,8 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2726,11 +2685,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn list_session_entity_types(
         &self,
         _req: crate::model::ListSessionEntityTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListSessionEntityTypesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListSessionEntityTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2739,9 +2696,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn get_session_entity_type(
         &self,
         _req: crate::model::GetSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionEntityType>>,
+        Output = crate::Result<crate::Response<crate::model::SessionEntityType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2750,9 +2707,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn create_session_entity_type(
         &self,
         _req: crate::model::CreateSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionEntityType>>,
+        Output = crate::Result<crate::Response<crate::model::SessionEntityType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2761,9 +2718,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn update_session_entity_type(
         &self,
         _req: crate::model::UpdateSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SessionEntityType>>,
+        Output = crate::Result<crate::Response<crate::model::SessionEntityType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2772,8 +2729,8 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn delete_session_entity_type(
         &self,
         _req: crate::model::DeleteSessionEntityTypeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2781,10 +2738,10 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2794,9 +2751,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2805,10 +2762,10 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2818,9 +2775,9 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2829,8 +2786,8 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2853,10 +2810,9 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn create_sip_trunk(
         &self,
         _req: crate::model::CreateSipTrunkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SipTrunk>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SipTrunk>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2864,8 +2820,8 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn delete_sip_trunk(
         &self,
         _req: crate::model::DeleteSipTrunkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2873,9 +2829,9 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn list_sip_trunks(
         &self,
         _req: crate::model::ListSipTrunksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSipTrunksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSipTrunksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2884,10 +2840,9 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn get_sip_trunk(
         &self,
         _req: crate::model::GetSipTrunkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SipTrunk>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SipTrunk>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2895,10 +2850,9 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn update_sip_trunk(
         &self,
         _req: crate::model::UpdateSipTrunkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SipTrunk>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SipTrunk>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2906,10 +2860,10 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2919,9 +2873,9 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2930,10 +2884,10 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2943,9 +2897,9 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2954,8 +2908,8 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -2978,10 +2932,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn create_tool(
         &self,
         _req: crate::model::CreateToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2989,10 +2942,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_tool(
         &self,
         _req: crate::model::GetToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3000,9 +2952,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_tools(
         &self,
         _req: crate::model::ListToolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListToolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListToolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3011,8 +2963,8 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn delete_tool(
         &self,
         _req: crate::model::DeleteToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3020,10 +2972,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn update_tool(
         &self,
         _req: crate::model::UpdateToolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Tool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Tool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3031,10 +2982,10 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3044,9 +2995,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3055,10 +3006,10 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3068,9 +3019,9 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3079,8 +3030,8 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -3103,9 +3054,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_versions(
         &self,
         _req: crate::model::ListVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3114,10 +3065,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_version(
         &self,
         _req: crate::model::GetVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3125,10 +3075,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn create_version(
         &self,
         _req: crate::model::CreateVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3136,10 +3085,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn update_version(
         &self,
         _req: crate::model::UpdateVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Version>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Version>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3147,8 +3095,8 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn delete_version(
         &self,
         _req: crate::model::DeleteVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -3156,10 +3104,10 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3169,9 +3117,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3180,10 +3128,10 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -3193,9 +3141,9 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -3204,8 +3152,8 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/dialogflow/v2/src/stub/dynamic.rs b/src/generated/cloud/dialogflow/v2/src/stub/dynamic.rs
index 702c9b3cc2..5ccf490a0c 100644
--- a/src/generated/cloud/dialogflow/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/dialogflow/v2/src/stub/dynamic.rs
@@ -21,98 +21,96 @@ pub trait Agents: std::fmt::Debug + Send + Sync {
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>>;
 
     async fn set_agent(
         &self,
         req: crate::model::SetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>>;
 
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn search_agents(
         &self,
         req: crate::model::SearchAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAgentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAgentsResponse>>;
 
     async fn train_agent(
         &self,
         req: crate::model::TrainAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_agent(
         &self,
         req: crate::model::ImportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_validation_result(
         &self,
         req: crate::model::GetValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ValidationResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ValidationResult>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Agents] also implement [Agents].
@@ -123,8 +121,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>> {
         T::get_agent(self, req, options).await
     }
 
@@ -132,8 +130,8 @@ impl<T: super::Agents> Agents for T {
     async fn set_agent(
         &self,
         req: crate::model::SetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Agent>> {
         T::set_agent(self, req, options).await
     }
 
@@ -141,8 +139,8 @@ impl<T: super::Agents> Agents for T {
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_agent(self, req, options).await
     }
 
@@ -150,8 +148,8 @@ impl<T: super::Agents> Agents for T {
     async fn search_agents(
         &self,
         req: crate::model::SearchAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchAgentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchAgentsResponse>> {
         T::search_agents(self, req, options).await
     }
 
@@ -159,8 +157,8 @@ impl<T: super::Agents> Agents for T {
     async fn train_agent(
         &self,
         req: crate::model::TrainAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::train_agent(self, req, options).await
     }
 
@@ -168,8 +166,8 @@ impl<T: super::Agents> Agents for T {
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_agent(self, req, options).await
     }
 
@@ -177,8 +175,8 @@ impl<T: super::Agents> Agents for T {
     async fn import_agent(
         &self,
         req: crate::model::ImportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_agent(self, req, options).await
     }
 
@@ -186,8 +184,8 @@ impl<T: super::Agents> Agents for T {
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_agent(self, req, options).await
     }
 
@@ -195,8 +193,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_validation_result(
         &self,
         req: crate::model::GetValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ValidationResult>> {
         T::get_validation_result(self, req, options).await
     }
 
@@ -204,9 +202,8 @@ impl<T: super::Agents> Agents for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -214,8 +211,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -223,10 +220,9 @@ impl<T: super::Agents> Agents for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -234,8 +230,8 @@ impl<T: super::Agents> Agents for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -243,22 +239,22 @@ impl<T: super::Agents> Agents for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -270,46 +266,44 @@ pub trait AnswerRecords: std::fmt::Debug + Send + Sync {
     async fn list_answer_records(
         &self,
         req: crate::model::ListAnswerRecordsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnswerRecordsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnswerRecordsResponse>>;
 
     async fn update_answer_record(
         &self,
         req: crate::model::UpdateAnswerRecordRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnswerRecord>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnswerRecord>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::AnswerRecords] also implement [AnswerRecords].
@@ -320,8 +314,8 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn list_answer_records(
         &self,
         req: crate::model::ListAnswerRecordsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAnswerRecordsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAnswerRecordsResponse>> {
         T::list_answer_records(self, req, options).await
     }
 
@@ -329,8 +323,8 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn update_answer_record(
         &self,
         req: crate::model::UpdateAnswerRecordRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnswerRecord>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnswerRecord>> {
         T::update_answer_record(self, req, options).await
     }
 
@@ -338,9 +332,8 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -348,8 +341,8 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -357,10 +350,9 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -368,8 +360,8 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -377,8 +369,8 @@ impl<T: super::AnswerRecords> AnswerRecords for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -390,70 +382,68 @@ pub trait Contexts: std::fmt::Debug + Send + Sync {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContextsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContextsResponse>>;
 
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn delete_all_contexts(
         &self,
         req: crate::model::DeleteAllContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Contexts] also implement [Contexts].
@@ -464,8 +454,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContextsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContextsResponse>> {
         T::list_contexts(self, req, options).await
     }
 
@@ -473,8 +463,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::get_context(self, req, options).await
     }
 
@@ -482,8 +472,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::create_context(self, req, options).await
     }
 
@@ -491,8 +481,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::update_context(self, req, options).await
     }
 
@@ -500,8 +490,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_context(self, req, options).await
     }
 
@@ -509,8 +499,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn delete_all_contexts(
         &self,
         req: crate::model::DeleteAllContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_all_contexts(self, req, options).await
     }
 
@@ -518,9 +508,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -528,8 +517,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -537,10 +526,9 @@ impl<T: super::Contexts> Contexts for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -548,8 +536,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -557,8 +545,8 @@ impl<T: super::Contexts> Contexts for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -570,100 +558,98 @@ pub trait Conversations: std::fmt::Debug + Send + Sync {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationsResponse>>;
 
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn complete_conversation(
         &self,
         req: crate::model::CompleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn ingest_context_references(
         &self,
         req: crate::model::IngestContextReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IngestContextReferencesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IngestContextReferencesResponse>>;
 
     async fn list_messages(
         &self,
         req: crate::model::ListMessagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMessagesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMessagesResponse>>;
 
     async fn suggest_conversation_summary(
         &self,
         req: crate::model::SuggestConversationSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestConversationSummaryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestConversationSummaryResponse>>;
 
     async fn generate_stateless_summary(
         &self,
         req: crate::model::GenerateStatelessSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateStatelessSummaryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateStatelessSummaryResponse>>;
 
     async fn generate_stateless_suggestion(
         &self,
         req: crate::model::GenerateStatelessSuggestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateStatelessSuggestionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateStatelessSuggestionResponse>>;
 
     async fn search_knowledge(
         &self,
         req: crate::model::SearchKnowledgeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchKnowledgeResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchKnowledgeResponse>>;
 
     async fn generate_suggestions(
         &self,
         req: crate::model::GenerateSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateSuggestionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateSuggestionsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Conversations] also implement [Conversations].
@@ -674,8 +660,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::create_conversation(self, req, options).await
     }
 
@@ -683,8 +669,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationsResponse>> {
         T::list_conversations(self, req, options).await
     }
 
@@ -692,8 +678,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::get_conversation(self, req, options).await
     }
 
@@ -701,8 +687,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn complete_conversation(
         &self,
         req: crate::model::CompleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::complete_conversation(self, req, options).await
     }
 
@@ -710,8 +696,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn ingest_context_references(
         &self,
         req: crate::model::IngestContextReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IngestContextReferencesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IngestContextReferencesResponse>> {
         T::ingest_context_references(self, req, options).await
     }
 
@@ -719,8 +705,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn list_messages(
         &self,
         req: crate::model::ListMessagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMessagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMessagesResponse>> {
         T::list_messages(self, req, options).await
     }
 
@@ -728,9 +714,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn suggest_conversation_summary(
         &self,
         req: crate::model::SuggestConversationSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestConversationSummaryResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestConversationSummaryResponse>> {
         T::suggest_conversation_summary(self, req, options).await
     }
 
@@ -738,9 +723,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn generate_stateless_summary(
         &self,
         req: crate::model::GenerateStatelessSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateStatelessSummaryResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateStatelessSummaryResponse>> {
         T::generate_stateless_summary(self, req, options).await
     }
 
@@ -748,9 +732,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn generate_stateless_suggestion(
         &self,
         req: crate::model::GenerateStatelessSuggestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateStatelessSuggestionResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateStatelessSuggestionResponse>> {
         T::generate_stateless_suggestion(self, req, options).await
     }
 
@@ -758,8 +741,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn search_knowledge(
         &self,
         req: crate::model::SearchKnowledgeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchKnowledgeResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchKnowledgeResponse>> {
         T::search_knowledge(self, req, options).await
     }
 
@@ -767,8 +750,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn generate_suggestions(
         &self,
         req: crate::model::GenerateSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateSuggestionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateSuggestionsResponse>> {
         T::generate_suggestions(self, req, options).await
     }
 
@@ -776,9 +759,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -786,8 +768,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -795,10 +777,9 @@ impl<T: super::Conversations> Conversations for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -806,8 +787,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -815,8 +796,8 @@ impl<T: super::Conversations> Conversations for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -828,74 +809,72 @@ pub trait ConversationDatasets: std::fmt::Debug + Send + Sync {
     async fn create_conversation_dataset(
         &self,
         req: crate::model::CreateConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_conversation_dataset(
         &self,
         req: crate::model::GetConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationDataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationDataset>>;
 
     async fn list_conversation_datasets(
         &self,
         req: crate::model::ListConversationDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationDatasetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationDatasetsResponse>>;
 
     async fn delete_conversation_dataset(
         &self,
         req: crate::model::DeleteConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_conversation_data(
         &self,
         req: crate::model::ImportConversationDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ConversationDatasets] also implement [ConversationDatasets].
@@ -906,8 +885,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn create_conversation_dataset(
         &self,
         req: crate::model::CreateConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_conversation_dataset(self, req, options).await
     }
 
@@ -915,8 +894,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn get_conversation_dataset(
         &self,
         req: crate::model::GetConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationDataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationDataset>> {
         T::get_conversation_dataset(self, req, options).await
     }
 
@@ -924,9 +903,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn list_conversation_datasets(
         &self,
         req: crate::model::ListConversationDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationDatasetsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationDatasetsResponse>> {
         T::list_conversation_datasets(self, req, options).await
     }
 
@@ -934,8 +912,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn delete_conversation_dataset(
         &self,
         req: crate::model::DeleteConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_conversation_dataset(self, req, options).await
     }
 
@@ -943,8 +921,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn import_conversation_data(
         &self,
         req: crate::model::ImportConversationDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_conversation_data(self, req, options).await
     }
 
@@ -952,9 +930,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -962,8 +939,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -971,10 +948,9 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -982,8 +958,8 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -991,22 +967,22 @@ impl<T: super::ConversationDatasets> ConversationDatasets for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1018,100 +994,96 @@ pub trait ConversationModels: std::fmt::Debug + Send + Sync {
     async fn create_conversation_model(
         &self,
         req: crate::model::CreateConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_conversation_model(
         &self,
         req: crate::model::GetConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationModel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationModel>>;
 
     async fn list_conversation_models(
         &self,
         req: crate::model::ListConversationModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationModelsResponse>>;
 
     async fn delete_conversation_model(
         &self,
         req: crate::model::DeleteConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn deploy_conversation_model(
         &self,
         req: crate::model::DeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undeploy_conversation_model(
         &self,
         req: crate::model::UndeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_conversation_model_evaluation(
         &self,
         req: crate::model::GetConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationModelEvaluation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationModelEvaluation>>;
 
     async fn list_conversation_model_evaluations(
         &self,
         req: crate::model::ListConversationModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListConversationModelEvaluationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationModelEvaluationsResponse>>;
 
     async fn create_conversation_model_evaluation(
         &self,
         req: crate::model::CreateConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ConversationModels] also implement [ConversationModels].
@@ -1122,8 +1094,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn create_conversation_model(
         &self,
         req: crate::model::CreateConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_conversation_model(self, req, options).await
     }
 
@@ -1131,8 +1103,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn get_conversation_model(
         &self,
         req: crate::model::GetConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationModel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationModel>> {
         T::get_conversation_model(self, req, options).await
     }
 
@@ -1140,8 +1112,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn list_conversation_models(
         &self,
         req: crate::model::ListConversationModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationModelsResponse>> {
         T::list_conversation_models(self, req, options).await
     }
 
@@ -1149,8 +1121,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn delete_conversation_model(
         &self,
         req: crate::model::DeleteConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_conversation_model(self, req, options).await
     }
 
@@ -1158,8 +1130,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn deploy_conversation_model(
         &self,
         req: crate::model::DeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy_conversation_model(self, req, options).await
     }
 
@@ -1167,8 +1139,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn undeploy_conversation_model(
         &self,
         req: crate::model::UndeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undeploy_conversation_model(self, req, options).await
     }
 
@@ -1176,8 +1148,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn get_conversation_model_evaluation(
         &self,
         req: crate::model::GetConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationModelEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationModelEvaluation>> {
         T::get_conversation_model_evaluation(self, req, options).await
     }
 
@@ -1185,10 +1157,9 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn list_conversation_model_evaluations(
         &self,
         req: crate::model::ListConversationModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListConversationModelEvaluationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationModelEvaluationsResponse>>
+    {
         T::list_conversation_model_evaluations(self, req, options).await
     }
 
@@ -1196,8 +1167,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn create_conversation_model_evaluation(
         &self,
         req: crate::model::CreateConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_conversation_model_evaluation(self, req, options).await
     }
 
@@ -1205,9 +1176,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1215,8 +1185,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1224,10 +1194,9 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1235,8 +1204,8 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1244,22 +1213,22 @@ impl<T: super::ConversationModels> ConversationModels for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1271,86 +1240,84 @@ pub trait ConversationProfiles: std::fmt::Debug + Send + Sync {
     async fn list_conversation_profiles(
         &self,
         req: crate::model::ListConversationProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationProfilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationProfilesResponse>>;
 
     async fn get_conversation_profile(
         &self,
         req: crate::model::GetConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationProfile>>;
 
     async fn create_conversation_profile(
         &self,
         req: crate::model::CreateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationProfile>>;
 
     async fn update_conversation_profile(
         &self,
         req: crate::model::UpdateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationProfile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationProfile>>;
 
     async fn delete_conversation_profile(
         &self,
         req: crate::model::DeleteConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn set_suggestion_feature_config(
         &self,
         req: crate::model::SetSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn clear_suggestion_feature_config(
         &self,
         req: crate::model::ClearSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ConversationProfiles] also implement [ConversationProfiles].
@@ -1361,9 +1328,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn list_conversation_profiles(
         &self,
         req: crate::model::ListConversationProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationProfilesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationProfilesResponse>> {
         T::list_conversation_profiles(self, req, options).await
     }
 
@@ -1371,8 +1337,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn get_conversation_profile(
         &self,
         req: crate::model::GetConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationProfile>> {
         T::get_conversation_profile(self, req, options).await
     }
 
@@ -1380,8 +1346,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn create_conversation_profile(
         &self,
         req: crate::model::CreateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationProfile>> {
         T::create_conversation_profile(self, req, options).await
     }
 
@@ -1389,8 +1355,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn update_conversation_profile(
         &self,
         req: crate::model::UpdateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConversationProfile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConversationProfile>> {
         T::update_conversation_profile(self, req, options).await
     }
 
@@ -1398,8 +1364,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn delete_conversation_profile(
         &self,
         req: crate::model::DeleteConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_conversation_profile(self, req, options).await
     }
 
@@ -1407,8 +1373,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn set_suggestion_feature_config(
         &self,
         req: crate::model::SetSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::set_suggestion_feature_config(self, req, options).await
     }
 
@@ -1416,8 +1382,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn clear_suggestion_feature_config(
         &self,
         req: crate::model::ClearSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::clear_suggestion_feature_config(self, req, options).await
     }
 
@@ -1425,9 +1391,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1435,8 +1400,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1444,10 +1409,9 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1455,8 +1419,8 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1464,22 +1428,22 @@ impl<T: super::ConversationProfiles> ConversationProfiles for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1491,92 +1455,90 @@ pub trait Documents: std::fmt::Debug + Send + Sync {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDocumentsResponse>>;
 
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reload_document(
         &self,
         req: crate::model::ReloadDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_document(
         &self,
         req: crate::model::ExportDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Documents] also implement [Documents].
@@ -1587,8 +1549,8 @@ impl<T: super::Documents> Documents for T {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDocumentsResponse>> {
         T::list_documents(self, req, options).await
     }
 
@@ -1596,8 +1558,8 @@ impl<T: super::Documents> Documents for T {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::get_document(self, req, options).await
     }
 
@@ -1605,8 +1567,8 @@ impl<T: super::Documents> Documents for T {
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_document(self, req, options).await
     }
 
@@ -1614,8 +1576,8 @@ impl<T: super::Documents> Documents for T {
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_documents(self, req, options).await
     }
 
@@ -1623,8 +1585,8 @@ impl<T: super::Documents> Documents for T {
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_document(self, req, options).await
     }
 
@@ -1632,8 +1594,8 @@ impl<T: super::Documents> Documents for T {
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_document(self, req, options).await
     }
 
@@ -1641,8 +1603,8 @@ impl<T: super::Documents> Documents for T {
     async fn reload_document(
         &self,
         req: crate::model::ReloadDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reload_document(self, req, options).await
     }
 
@@ -1650,8 +1612,8 @@ impl<T: super::Documents> Documents for T {
     async fn export_document(
         &self,
         req: crate::model::ExportDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_document(self, req, options).await
     }
 
@@ -1659,9 +1621,8 @@ impl<T: super::Documents> Documents for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1669,8 +1630,8 @@ impl<T: super::Documents> Documents for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1678,10 +1639,9 @@ impl<T: super::Documents> Documents for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1689,8 +1649,8 @@ impl<T: super::Documents> Documents for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1698,22 +1658,22 @@ impl<T: super::Documents> Documents for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1725,56 +1685,54 @@ pub trait EncryptionSpecService: std::fmt::Debug + Send + Sync {
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptionSpec>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptionSpec>>;
 
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EncryptionSpecService] also implement [EncryptionSpecService].
@@ -1785,8 +1743,8 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptionSpec>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptionSpec>> {
         T::get_encryption_spec(self, req, options).await
     }
 
@@ -1794,8 +1752,8 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::initialize_encryption_spec(self, req, options).await
     }
 
@@ -1803,9 +1761,8 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1813,8 +1770,8 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1822,10 +1779,9 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1833,8 +1789,8 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1842,22 +1798,22 @@ impl<T: super::EncryptionSpecService> EncryptionSpecService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1869,104 +1825,102 @@ pub trait EntityTypes: std::fmt::Debug + Send + Sync {
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntityTypesResponse>>;
 
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>>;
 
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn batch_update_entity_types(
         &self,
         req: crate::model::BatchUpdateEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_delete_entity_types(
         &self,
         req: crate::model::BatchDeleteEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_create_entities(
         &self,
         req: crate::model::BatchCreateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_update_entities(
         &self,
         req: crate::model::BatchUpdateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_delete_entities(
         &self,
         req: crate::model::BatchDeleteEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EntityTypes] also implement [EntityTypes].
@@ -1977,8 +1931,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         T::list_entity_types(self, req, options).await
     }
 
@@ -1986,8 +1940,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::get_entity_type(self, req, options).await
     }
 
@@ -1995,8 +1949,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::create_entity_type(self, req, options).await
     }
 
@@ -2004,8 +1958,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EntityType>> {
         T::update_entity_type(self, req, options).await
     }
 
@@ -2013,8 +1967,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_entity_type(self, req, options).await
     }
 
@@ -2022,8 +1976,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn batch_update_entity_types(
         &self,
         req: crate::model::BatchUpdateEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_update_entity_types(self, req, options).await
     }
 
@@ -2031,8 +1985,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn batch_delete_entity_types(
         &self,
         req: crate::model::BatchDeleteEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_delete_entity_types(self, req, options).await
     }
 
@@ -2040,8 +1994,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn batch_create_entities(
         &self,
         req: crate::model::BatchCreateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_create_entities(self, req, options).await
     }
 
@@ -2049,8 +2003,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn batch_update_entities(
         &self,
         req: crate::model::BatchUpdateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_update_entities(self, req, options).await
     }
 
@@ -2058,8 +2012,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn batch_delete_entities(
         &self,
         req: crate::model::BatchDeleteEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_delete_entities(self, req, options).await
     }
 
@@ -2067,9 +2021,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2077,8 +2030,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2086,10 +2039,9 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2097,8 +2049,8 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2106,22 +2058,22 @@ impl<T: super::EntityTypes> EntityTypes for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2133,70 +2085,68 @@ pub trait Environments: std::fmt::Debug + Send + Sync {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>>;
 
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>>;
 
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>>;
 
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>>;
 
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_environment_history(
         &self,
         req: crate::model::GetEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EnvironmentHistory>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EnvironmentHistory>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Environments] also implement [Environments].
@@ -2207,8 +2157,8 @@ impl<T: super::Environments> Environments for T {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         T::list_environments(self, req, options).await
     }
 
@@ -2216,8 +2166,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>> {
         T::get_environment(self, req, options).await
     }
 
@@ -2225,8 +2175,8 @@ impl<T: super::Environments> Environments for T {
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>> {
         T::create_environment(self, req, options).await
     }
 
@@ -2234,8 +2184,8 @@ impl<T: super::Environments> Environments for T {
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Environment>> {
         T::update_environment(self, req, options).await
     }
 
@@ -2243,8 +2193,8 @@ impl<T: super::Environments> Environments for T {
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_environment(self, req, options).await
     }
 
@@ -2252,8 +2202,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_environment_history(
         &self,
         req: crate::model::GetEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EnvironmentHistory>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EnvironmentHistory>> {
         T::get_environment_history(self, req, options).await
     }
 
@@ -2261,9 +2211,8 @@ impl<T: super::Environments> Environments for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2271,8 +2220,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2280,10 +2229,9 @@ impl<T: super::Environments> Environments for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2291,8 +2239,8 @@ impl<T: super::Environments> Environments for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2300,8 +2248,8 @@ impl<T: super::Environments> Environments for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2313,46 +2261,44 @@ pub trait Fulfillments: std::fmt::Debug + Send + Sync {
     async fn get_fulfillment(
         &self,
         req: crate::model::GetFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Fulfillment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Fulfillment>>;
 
     async fn update_fulfillment(
         &self,
         req: crate::model::UpdateFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Fulfillment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Fulfillment>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Fulfillments] also implement [Fulfillments].
@@ -2363,8 +2309,8 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn get_fulfillment(
         &self,
         req: crate::model::GetFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Fulfillment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Fulfillment>> {
         T::get_fulfillment(self, req, options).await
     }
 
@@ -2372,8 +2318,8 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn update_fulfillment(
         &self,
         req: crate::model::UpdateFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Fulfillment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Fulfillment>> {
         T::update_fulfillment(self, req, options).await
     }
 
@@ -2381,9 +2327,8 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2391,8 +2336,8 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2400,10 +2345,9 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2411,8 +2355,8 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2420,8 +2364,8 @@ impl<T: super::Fulfillments> Fulfillments for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2433,64 +2377,62 @@ pub trait Generators: std::fmt::Debug + Send + Sync {
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>>;
 
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>>;
 
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGeneratorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGeneratorsResponse>>;
 
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Generators] also implement [Generators].
@@ -2501,8 +2443,8 @@ impl<T: super::Generators> Generators for T {
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>> {
         T::create_generator(self, req, options).await
     }
 
@@ -2510,8 +2452,8 @@ impl<T: super::Generators> Generators for T {
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>> {
         T::get_generator(self, req, options).await
     }
 
@@ -2519,8 +2461,8 @@ impl<T: super::Generators> Generators for T {
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGeneratorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGeneratorsResponse>> {
         T::list_generators(self, req, options).await
     }
 
@@ -2528,8 +2470,8 @@ impl<T: super::Generators> Generators for T {
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_generator(self, req, options).await
     }
 
@@ -2537,8 +2479,8 @@ impl<T: super::Generators> Generators for T {
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Generator>> {
         T::update_generator(self, req, options).await
     }
 
@@ -2546,9 +2488,8 @@ impl<T: super::Generators> Generators for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2556,8 +2497,8 @@ impl<T: super::Generators> Generators for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2565,10 +2506,9 @@ impl<T: super::Generators> Generators for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2576,8 +2516,8 @@ impl<T: super::Generators> Generators for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2585,8 +2525,8 @@ impl<T: super::Generators> Generators for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2598,68 +2538,66 @@ pub trait GeneratorEvaluations: std::fmt::Debug + Send + Sync {
     async fn create_generator_evaluation(
         &self,
         req: crate::model::CreateGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_generator_evaluation(
         &self,
         req: crate::model::GetGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GeneratorEvaluation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GeneratorEvaluation>>;
 
     async fn list_generator_evaluations(
         &self,
         req: crate::model::ListGeneratorEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGeneratorEvaluationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGeneratorEvaluationsResponse>>;
 
     async fn delete_generator_evaluation(
         &self,
         req: crate::model::DeleteGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GeneratorEvaluations] also implement [GeneratorEvaluations].
@@ -2670,8 +2608,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn create_generator_evaluation(
         &self,
         req: crate::model::CreateGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_generator_evaluation(self, req, options).await
     }
 
@@ -2679,8 +2617,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn get_generator_evaluation(
         &self,
         req: crate::model::GetGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GeneratorEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GeneratorEvaluation>> {
         T::get_generator_evaluation(self, req, options).await
     }
 
@@ -2688,9 +2626,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn list_generator_evaluations(
         &self,
         req: crate::model::ListGeneratorEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGeneratorEvaluationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGeneratorEvaluationsResponse>> {
         T::list_generator_evaluations(self, req, options).await
     }
 
@@ -2698,8 +2635,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn delete_generator_evaluation(
         &self,
         req: crate::model::DeleteGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_generator_evaluation(self, req, options).await
     }
 
@@ -2707,9 +2644,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2717,8 +2653,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2726,10 +2662,9 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2737,8 +2672,8 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2746,22 +2681,22 @@ impl<T: super::GeneratorEvaluations> GeneratorEvaluations for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2773,86 +2708,84 @@ pub trait Intents: std::fmt::Debug + Send + Sync {
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIntentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIntentsResponse>>;
 
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>>;
 
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>>;
 
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>>;
 
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn batch_update_intents(
         &self,
         req: crate::model::BatchUpdateIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_delete_intents(
         &self,
         req: crate::model::BatchDeleteIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Intents] also implement [Intents].
@@ -2863,8 +2796,8 @@ impl<T: super::Intents> Intents for T {
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIntentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIntentsResponse>> {
         T::list_intents(self, req, options).await
     }
 
@@ -2872,8 +2805,8 @@ impl<T: super::Intents> Intents for T {
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>> {
         T::get_intent(self, req, options).await
     }
 
@@ -2881,8 +2814,8 @@ impl<T: super::Intents> Intents for T {
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>> {
         T::create_intent(self, req, options).await
     }
 
@@ -2890,8 +2823,8 @@ impl<T: super::Intents> Intents for T {
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Intent>> {
         T::update_intent(self, req, options).await
     }
 
@@ -2899,8 +2832,8 @@ impl<T: super::Intents> Intents for T {
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_intent(self, req, options).await
     }
 
@@ -2908,8 +2841,8 @@ impl<T: super::Intents> Intents for T {
     async fn batch_update_intents(
         &self,
         req: crate::model::BatchUpdateIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_update_intents(self, req, options).await
     }
 
@@ -2917,8 +2850,8 @@ impl<T: super::Intents> Intents for T {
     async fn batch_delete_intents(
         &self,
         req: crate::model::BatchDeleteIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_delete_intents(self, req, options).await
     }
 
@@ -2926,9 +2859,8 @@ impl<T: super::Intents> Intents for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -2936,8 +2868,8 @@ impl<T: super::Intents> Intents for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -2945,10 +2877,9 @@ impl<T: super::Intents> Intents for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2956,8 +2887,8 @@ impl<T: super::Intents> Intents for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2965,22 +2896,22 @@ impl<T: super::Intents> Intents for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2992,64 +2923,62 @@ pub trait KnowledgeBases: std::fmt::Debug + Send + Sync {
     async fn list_knowledge_bases(
         &self,
         req: crate::model::ListKnowledgeBasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKnowledgeBasesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKnowledgeBasesResponse>>;
 
     async fn get_knowledge_base(
         &self,
         req: crate::model::GetKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KnowledgeBase>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KnowledgeBase>>;
 
     async fn create_knowledge_base(
         &self,
         req: crate::model::CreateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KnowledgeBase>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KnowledgeBase>>;
 
     async fn delete_knowledge_base(
         &self,
         req: crate::model::DeleteKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_knowledge_base(
         &self,
         req: crate::model::UpdateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KnowledgeBase>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KnowledgeBase>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::KnowledgeBases] also implement [KnowledgeBases].
@@ -3060,8 +2989,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn list_knowledge_bases(
         &self,
         req: crate::model::ListKnowledgeBasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKnowledgeBasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKnowledgeBasesResponse>> {
         T::list_knowledge_bases(self, req, options).await
     }
 
@@ -3069,8 +2998,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn get_knowledge_base(
         &self,
         req: crate::model::GetKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KnowledgeBase>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KnowledgeBase>> {
         T::get_knowledge_base(self, req, options).await
     }
 
@@ -3078,8 +3007,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn create_knowledge_base(
         &self,
         req: crate::model::CreateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KnowledgeBase>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KnowledgeBase>> {
         T::create_knowledge_base(self, req, options).await
     }
 
@@ -3087,8 +3016,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn delete_knowledge_base(
         &self,
         req: crate::model::DeleteKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_knowledge_base(self, req, options).await
     }
 
@@ -3096,8 +3025,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn update_knowledge_base(
         &self,
         req: crate::model::UpdateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KnowledgeBase>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KnowledgeBase>> {
         T::update_knowledge_base(self, req, options).await
     }
 
@@ -3105,9 +3034,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3115,8 +3043,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3124,10 +3052,9 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3135,8 +3062,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3144,8 +3071,8 @@ impl<T: super::KnowledgeBases> KnowledgeBases for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3157,88 +3084,86 @@ pub trait Participants: std::fmt::Debug + Send + Sync {
     async fn create_participant(
         &self,
         req: crate::model::CreateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Participant>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Participant>>;
 
     async fn get_participant(
         &self,
         req: crate::model::GetParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Participant>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Participant>>;
 
     async fn list_participants(
         &self,
         req: crate::model::ListParticipantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListParticipantsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListParticipantsResponse>>;
 
     async fn update_participant(
         &self,
         req: crate::model::UpdateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Participant>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Participant>>;
 
     async fn analyze_content(
         &self,
         req: crate::model::AnalyzeContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeContentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeContentResponse>>;
 
     async fn suggest_articles(
         &self,
         req: crate::model::SuggestArticlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestArticlesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestArticlesResponse>>;
 
     async fn suggest_faq_answers(
         &self,
         req: crate::model::SuggestFaqAnswersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestFaqAnswersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestFaqAnswersResponse>>;
 
     async fn suggest_smart_replies(
         &self,
         req: crate::model::SuggestSmartRepliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestSmartRepliesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestSmartRepliesResponse>>;
 
     async fn suggest_knowledge_assist(
         &self,
         req: crate::model::SuggestKnowledgeAssistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestKnowledgeAssistResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestKnowledgeAssistResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Participants] also implement [Participants].
@@ -3249,8 +3174,8 @@ impl<T: super::Participants> Participants for T {
     async fn create_participant(
         &self,
         req: crate::model::CreateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Participant>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Participant>> {
         T::create_participant(self, req, options).await
     }
 
@@ -3258,8 +3183,8 @@ impl<T: super::Participants> Participants for T {
     async fn get_participant(
         &self,
         req: crate::model::GetParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Participant>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Participant>> {
         T::get_participant(self, req, options).await
     }
 
@@ -3267,8 +3192,8 @@ impl<T: super::Participants> Participants for T {
     async fn list_participants(
         &self,
         req: crate::model::ListParticipantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListParticipantsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListParticipantsResponse>> {
         T::list_participants(self, req, options).await
     }
 
@@ -3276,8 +3201,8 @@ impl<T: super::Participants> Participants for T {
     async fn update_participant(
         &self,
         req: crate::model::UpdateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Participant>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Participant>> {
         T::update_participant(self, req, options).await
     }
 
@@ -3285,8 +3210,8 @@ impl<T: super::Participants> Participants for T {
     async fn analyze_content(
         &self,
         req: crate::model::AnalyzeContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeContentResponse>> {
         T::analyze_content(self, req, options).await
     }
 
@@ -3294,8 +3219,8 @@ impl<T: super::Participants> Participants for T {
     async fn suggest_articles(
         &self,
         req: crate::model::SuggestArticlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestArticlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestArticlesResponse>> {
         T::suggest_articles(self, req, options).await
     }
 
@@ -3303,8 +3228,8 @@ impl<T: super::Participants> Participants for T {
     async fn suggest_faq_answers(
         &self,
         req: crate::model::SuggestFaqAnswersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestFaqAnswersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestFaqAnswersResponse>> {
         T::suggest_faq_answers(self, req, options).await
     }
 
@@ -3312,8 +3237,8 @@ impl<T: super::Participants> Participants for T {
     async fn suggest_smart_replies(
         &self,
         req: crate::model::SuggestSmartRepliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestSmartRepliesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestSmartRepliesResponse>> {
         T::suggest_smart_replies(self, req, options).await
     }
 
@@ -3321,8 +3246,8 @@ impl<T: super::Participants> Participants for T {
     async fn suggest_knowledge_assist(
         &self,
         req: crate::model::SuggestKnowledgeAssistRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SuggestKnowledgeAssistResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SuggestKnowledgeAssistResponse>> {
         T::suggest_knowledge_assist(self, req, options).await
     }
 
@@ -3330,9 +3255,8 @@ impl<T: super::Participants> Participants for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3340,8 +3264,8 @@ impl<T: super::Participants> Participants for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3349,10 +3273,9 @@ impl<T: super::Participants> Participants for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3360,8 +3283,8 @@ impl<T: super::Participants> Participants for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3369,8 +3292,8 @@ impl<T: super::Participants> Participants for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3382,40 +3305,38 @@ pub trait Sessions: std::fmt::Debug + Send + Sync {
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DetectIntentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DetectIntentResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Sessions] also implement [Sessions].
@@ -3426,8 +3347,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DetectIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DetectIntentResponse>> {
         T::detect_intent(self, req, options).await
     }
 
@@ -3435,9 +3356,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3445,8 +3365,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3454,10 +3374,9 @@ impl<T: super::Sessions> Sessions for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3465,8 +3384,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3474,8 +3393,8 @@ impl<T: super::Sessions> Sessions for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3487,64 +3406,62 @@ pub trait SessionEntityTypes: std::fmt::Debug + Send + Sync {
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionEntityTypesResponse>>;
 
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>>;
 
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>>;
 
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>>;
 
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SessionEntityTypes] also implement [SessionEntityTypes].
@@ -3555,8 +3472,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionEntityTypesResponse>> {
         T::list_session_entity_types(self, req, options).await
     }
 
@@ -3564,8 +3481,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>> {
         T::get_session_entity_type(self, req, options).await
     }
 
@@ -3573,8 +3490,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>> {
         T::create_session_entity_type(self, req, options).await
     }
 
@@ -3582,8 +3499,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SessionEntityType>> {
         T::update_session_entity_type(self, req, options).await
     }
 
@@ -3591,8 +3508,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_session_entity_type(self, req, options).await
     }
 
@@ -3600,9 +3517,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3610,8 +3526,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3619,10 +3535,9 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3630,8 +3545,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3639,8 +3554,8 @@ impl<T: super::SessionEntityTypes> SessionEntityTypes for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3652,64 +3567,62 @@ pub trait SipTrunks: std::fmt::Debug + Send + Sync {
     async fn create_sip_trunk(
         &self,
         req: crate::model::CreateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SipTrunk>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SipTrunk>>;
 
     async fn delete_sip_trunk(
         &self,
         req: crate::model::DeleteSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_sip_trunks(
         &self,
         req: crate::model::ListSipTrunksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSipTrunksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSipTrunksResponse>>;
 
     async fn get_sip_trunk(
         &self,
         req: crate::model::GetSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SipTrunk>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SipTrunk>>;
 
     async fn update_sip_trunk(
         &self,
         req: crate::model::UpdateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SipTrunk>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SipTrunk>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SipTrunks] also implement [SipTrunks].
@@ -3720,8 +3633,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn create_sip_trunk(
         &self,
         req: crate::model::CreateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SipTrunk>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SipTrunk>> {
         T::create_sip_trunk(self, req, options).await
     }
 
@@ -3729,8 +3642,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn delete_sip_trunk(
         &self,
         req: crate::model::DeleteSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_sip_trunk(self, req, options).await
     }
 
@@ -3738,8 +3651,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn list_sip_trunks(
         &self,
         req: crate::model::ListSipTrunksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSipTrunksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSipTrunksResponse>> {
         T::list_sip_trunks(self, req, options).await
     }
 
@@ -3747,8 +3660,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn get_sip_trunk(
         &self,
         req: crate::model::GetSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SipTrunk>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SipTrunk>> {
         T::get_sip_trunk(self, req, options).await
     }
 
@@ -3756,8 +3669,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn update_sip_trunk(
         &self,
         req: crate::model::UpdateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SipTrunk>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SipTrunk>> {
         T::update_sip_trunk(self, req, options).await
     }
 
@@ -3765,9 +3678,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3775,8 +3687,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3784,10 +3696,9 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3795,8 +3706,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3804,8 +3715,8 @@ impl<T: super::SipTrunks> SipTrunks for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3817,64 +3728,62 @@ pub trait Tools: std::fmt::Debug + Send + Sync {
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>>;
 
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>>;
 
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListToolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListToolsResponse>>;
 
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Tools] also implement [Tools].
@@ -3885,8 +3794,8 @@ impl<T: super::Tools> Tools for T {
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>> {
         T::create_tool(self, req, options).await
     }
 
@@ -3894,8 +3803,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>> {
         T::get_tool(self, req, options).await
     }
 
@@ -3903,8 +3812,8 @@ impl<T: super::Tools> Tools for T {
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListToolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListToolsResponse>> {
         T::list_tools(self, req, options).await
     }
 
@@ -3912,8 +3821,8 @@ impl<T: super::Tools> Tools for T {
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tool(self, req, options).await
     }
 
@@ -3921,8 +3830,8 @@ impl<T: super::Tools> Tools for T {
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Tool>> {
         T::update_tool(self, req, options).await
     }
 
@@ -3930,9 +3839,8 @@ impl<T: super::Tools> Tools for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -3940,8 +3848,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -3949,10 +3857,9 @@ impl<T: super::Tools> Tools for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -3960,8 +3867,8 @@ impl<T: super::Tools> Tools for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -3969,8 +3876,8 @@ impl<T: super::Tools> Tools for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -3982,64 +3889,62 @@ pub trait Versions: std::fmt::Debug + Send + Sync {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>>;
 
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>>;
 
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::Versions] also implement [Versions].
@@ -4050,8 +3955,8 @@ impl<T: super::Versions> Versions for T {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVersionsResponse>> {
         T::list_versions(self, req, options).await
     }
 
@@ -4059,8 +3964,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::get_version(self, req, options).await
     }
 
@@ -4068,8 +3973,8 @@ impl<T: super::Versions> Versions for T {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::create_version(self, req, options).await
     }
 
@@ -4077,8 +3982,8 @@ impl<T: super::Versions> Versions for T {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Version>> {
         T::update_version(self, req, options).await
     }
 
@@ -4086,8 +3991,8 @@ impl<T: super::Versions> Versions for T {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_version(self, req, options).await
     }
 
@@ -4095,9 +4000,8 @@ impl<T: super::Versions> Versions for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -4105,8 +4009,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -4114,10 +4018,9 @@ impl<T: super::Versions> Versions for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -4125,8 +4028,8 @@ impl<T: super::Versions> Versions for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -4134,8 +4037,8 @@ impl<T: super::Versions> Versions for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/dialogflow/v2/src/tracing.rs b/src/generated/cloud/dialogflow/v2/src/tracing.rs
index 912367c74b..0c5ab0717f 100644
--- a/src/generated/cloud/dialogflow/v2/src/tracing.rs
+++ b/src/generated/cloud/dialogflow/v2/src/tracing.rs
@@ -68,8 +68,8 @@ where
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         self.inner.get_agent(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn set_agent(
         &self,
         req: crate::model::SetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         self.inner.set_agent(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_agent(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn search_agents(
         &self,
         req: crate::model::SearchAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAgentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAgentsResponse>> {
         self.inner.search_agents(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn train_agent(
         &self,
         req: crate::model::TrainAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.train_agent(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_agent(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn import_agent(
         &self,
         req: crate::model::ImportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_agent(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_agent(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_validation_result(
         &self,
         req: crate::model::GetValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ValidationResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ValidationResult>> {
         self.inner.get_validation_result(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -167,9 +167,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -177,8 +176,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -186,22 +185,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -235,8 +234,8 @@ where
     async fn list_answer_records(
         &self,
         req: crate::model::ListAnswerRecordsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnswerRecordsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnswerRecordsResponse>> {
         self.inner.list_answer_records(req, options).await
     }
 
@@ -244,8 +243,8 @@ where
     async fn update_answer_record(
         &self,
         req: crate::model::UpdateAnswerRecordRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnswerRecord>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnswerRecord>> {
         self.inner.update_answer_record(req, options).await
     }
 
@@ -253,8 +252,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -262,8 +261,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -271,9 +270,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -281,8 +279,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -290,8 +288,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -325,8 +323,8 @@ where
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContextsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContextsResponse>> {
         self.inner.list_contexts(req, options).await
     }
 
@@ -334,8 +332,8 @@ where
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.get_context(req, options).await
     }
 
@@ -343,8 +341,8 @@ where
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.create_context(req, options).await
     }
 
@@ -352,8 +350,8 @@ where
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.update_context(req, options).await
     }
 
@@ -361,8 +359,8 @@ where
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_context(req, options).await
     }
 
@@ -370,8 +368,8 @@ where
     async fn delete_all_contexts(
         &self,
         req: crate::model::DeleteAllContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_all_contexts(req, options).await
     }
 
@@ -379,8 +377,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -388,8 +386,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -397,9 +395,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -407,8 +404,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -416,8 +413,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -451,8 +448,8 @@ where
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.create_conversation(req, options).await
     }
 
@@ -460,8 +457,8 @@ where
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationsResponse>> {
         self.inner.list_conversations(req, options).await
     }
 
@@ -469,8 +466,8 @@ where
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.get_conversation(req, options).await
     }
 
@@ -478,8 +475,8 @@ where
     async fn complete_conversation(
         &self,
         req: crate::model::CompleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.complete_conversation(req, options).await
     }
 
@@ -487,8 +484,8 @@ where
     async fn ingest_context_references(
         &self,
         req: crate::model::IngestContextReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IngestContextReferencesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IngestContextReferencesResponse>> {
         self.inner.ingest_context_references(req, options).await
     }
 
@@ -496,8 +493,8 @@ where
     async fn list_messages(
         &self,
         req: crate::model::ListMessagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMessagesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMessagesResponse>> {
         self.inner.list_messages(req, options).await
     }
 
@@ -505,8 +502,8 @@ where
     async fn suggest_conversation_summary(
         &self,
         req: crate::model::SuggestConversationSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestConversationSummaryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestConversationSummaryResponse>> {
         self.inner.suggest_conversation_summary(req, options).await
     }
 
@@ -514,8 +511,8 @@ where
     async fn generate_stateless_summary(
         &self,
         req: crate::model::GenerateStatelessSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateStatelessSummaryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateStatelessSummaryResponse>> {
         self.inner.generate_stateless_summary(req, options).await
     }
 
@@ -523,8 +520,8 @@ where
     async fn generate_stateless_suggestion(
         &self,
         req: crate::model::GenerateStatelessSuggestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateStatelessSuggestionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateStatelessSuggestionResponse>> {
         self.inner.generate_stateless_suggestion(req, options).await
     }
 
@@ -532,8 +529,8 @@ where
     async fn search_knowledge(
         &self,
         req: crate::model::SearchKnowledgeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchKnowledgeResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchKnowledgeResponse>> {
         self.inner.search_knowledge(req, options).await
     }
 
@@ -541,8 +538,8 @@ where
     async fn generate_suggestions(
         &self,
         req: crate::model::GenerateSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateSuggestionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateSuggestionsResponse>> {
         self.inner.generate_suggestions(req, options).await
     }
 
@@ -550,8 +547,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -559,8 +556,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -568,9 +565,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -578,8 +574,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -587,8 +583,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -622,8 +618,8 @@ where
     async fn create_conversation_dataset(
         &self,
         req: crate::model::CreateConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_conversation_dataset(req, options).await
     }
 
@@ -631,8 +627,8 @@ where
     async fn get_conversation_dataset(
         &self,
         req: crate::model::GetConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationDataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationDataset>> {
         self.inner.get_conversation_dataset(req, options).await
     }
 
@@ -640,8 +636,8 @@ where
     async fn list_conversation_datasets(
         &self,
         req: crate::model::ListConversationDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationDatasetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationDatasetsResponse>> {
         self.inner.list_conversation_datasets(req, options).await
     }
 
@@ -649,8 +645,8 @@ where
     async fn delete_conversation_dataset(
         &self,
         req: crate::model::DeleteConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_conversation_dataset(req, options).await
     }
 
@@ -658,8 +654,8 @@ where
     async fn import_conversation_data(
         &self,
         req: crate::model::ImportConversationDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_conversation_data(req, options).await
     }
 
@@ -667,8 +663,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -676,8 +672,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -685,9 +681,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -695,8 +690,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -704,22 +699,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -753,8 +748,8 @@ where
     async fn create_conversation_model(
         &self,
         req: crate::model::CreateConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_conversation_model(req, options).await
     }
 
@@ -762,8 +757,8 @@ where
     async fn get_conversation_model(
         &self,
         req: crate::model::GetConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationModel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationModel>> {
         self.inner.get_conversation_model(req, options).await
     }
 
@@ -771,8 +766,8 @@ where
     async fn list_conversation_models(
         &self,
         req: crate::model::ListConversationModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationModelsResponse>> {
         self.inner.list_conversation_models(req, options).await
     }
 
@@ -780,8 +775,8 @@ where
     async fn delete_conversation_model(
         &self,
         req: crate::model::DeleteConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_conversation_model(req, options).await
     }
 
@@ -789,8 +784,8 @@ where
     async fn deploy_conversation_model(
         &self,
         req: crate::model::DeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy_conversation_model(req, options).await
     }
 
@@ -798,8 +793,8 @@ where
     async fn undeploy_conversation_model(
         &self,
         req: crate::model::UndeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undeploy_conversation_model(req, options).await
     }
 
@@ -807,8 +802,8 @@ where
     async fn get_conversation_model_evaluation(
         &self,
         req: crate::model::GetConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationModelEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationModelEvaluation>> {
         self.inner
             .get_conversation_model_evaluation(req, options)
             .await
@@ -818,9 +813,8 @@ where
     async fn list_conversation_model_evaluations(
         &self,
         req: crate::model::ListConversationModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationModelEvaluationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationModelEvaluationsResponse>> {
         self.inner
             .list_conversation_model_evaluations(req, options)
             .await
@@ -830,8 +824,8 @@ where
     async fn create_conversation_model_evaluation(
         &self,
         req: crate::model::CreateConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_conversation_model_evaluation(req, options)
             .await
@@ -841,8 +835,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -850,8 +844,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -859,9 +853,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -869,8 +862,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -878,22 +871,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -927,8 +920,8 @@ where
     async fn list_conversation_profiles(
         &self,
         req: crate::model::ListConversationProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationProfilesResponse>> {
         self.inner.list_conversation_profiles(req, options).await
     }
 
@@ -936,8 +929,8 @@ where
     async fn get_conversation_profile(
         &self,
         req: crate::model::GetConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationProfile>> {
         self.inner.get_conversation_profile(req, options).await
     }
 
@@ -945,8 +938,8 @@ where
     async fn create_conversation_profile(
         &self,
         req: crate::model::CreateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationProfile>> {
         self.inner.create_conversation_profile(req, options).await
     }
 
@@ -954,8 +947,8 @@ where
     async fn update_conversation_profile(
         &self,
         req: crate::model::UpdateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationProfile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationProfile>> {
         self.inner.update_conversation_profile(req, options).await
     }
 
@@ -963,8 +956,8 @@ where
     async fn delete_conversation_profile(
         &self,
         req: crate::model::DeleteConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_conversation_profile(req, options).await
     }
 
@@ -972,8 +965,8 @@ where
     async fn set_suggestion_feature_config(
         &self,
         req: crate::model::SetSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.set_suggestion_feature_config(req, options).await
     }
 
@@ -981,8 +974,8 @@ where
     async fn clear_suggestion_feature_config(
         &self,
         req: crate::model::ClearSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .clear_suggestion_feature_config(req, options)
             .await
@@ -992,8 +985,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1001,8 +994,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1010,9 +1003,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1020,8 +1012,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1029,22 +1021,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1078,8 +1070,8 @@ where
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDocumentsResponse>> {
         self.inner.list_documents(req, options).await
     }
 
@@ -1087,8 +1079,8 @@ where
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.get_document(req, options).await
     }
 
@@ -1096,8 +1088,8 @@ where
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_document(req, options).await
     }
 
@@ -1105,8 +1097,8 @@ where
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_documents(req, options).await
     }
 
@@ -1114,8 +1106,8 @@ where
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_document(req, options).await
     }
 
@@ -1123,8 +1115,8 @@ where
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_document(req, options).await
     }
 
@@ -1132,8 +1124,8 @@ where
     async fn reload_document(
         &self,
         req: crate::model::ReloadDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reload_document(req, options).await
     }
 
@@ -1141,8 +1133,8 @@ where
     async fn export_document(
         &self,
         req: crate::model::ExportDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_document(req, options).await
     }
 
@@ -1150,8 +1142,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1159,8 +1151,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1168,9 +1160,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1178,8 +1169,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1187,22 +1178,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1236,8 +1227,8 @@ where
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptionSpec>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptionSpec>> {
         self.inner.get_encryption_spec(req, options).await
     }
 
@@ -1245,8 +1236,8 @@ where
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.initialize_encryption_spec(req, options).await
     }
 
@@ -1254,8 +1245,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1263,8 +1254,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1272,9 +1263,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1282,8 +1272,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1291,22 +1281,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1340,8 +1330,8 @@ where
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         self.inner.list_entity_types(req, options).await
     }
 
@@ -1349,8 +1339,8 @@ where
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.get_entity_type(req, options).await
     }
 
@@ -1358,8 +1348,8 @@ where
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.create_entity_type(req, options).await
     }
 
@@ -1367,8 +1357,8 @@ where
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         self.inner.update_entity_type(req, options).await
     }
 
@@ -1376,8 +1366,8 @@ where
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_entity_type(req, options).await
     }
 
@@ -1385,8 +1375,8 @@ where
     async fn batch_update_entity_types(
         &self,
         req: crate::model::BatchUpdateEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_update_entity_types(req, options).await
     }
 
@@ -1394,8 +1384,8 @@ where
     async fn batch_delete_entity_types(
         &self,
         req: crate::model::BatchDeleteEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_delete_entity_types(req, options).await
     }
 
@@ -1403,8 +1393,8 @@ where
     async fn batch_create_entities(
         &self,
         req: crate::model::BatchCreateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_create_entities(req, options).await
     }
 
@@ -1412,8 +1402,8 @@ where
     async fn batch_update_entities(
         &self,
         req: crate::model::BatchUpdateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_update_entities(req, options).await
     }
 
@@ -1421,8 +1411,8 @@ where
     async fn batch_delete_entities(
         &self,
         req: crate::model::BatchDeleteEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_delete_entities(req, options).await
     }
 
@@ -1430,8 +1420,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1439,8 +1429,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1448,9 +1438,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1458,8 +1447,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1467,22 +1456,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1516,8 +1505,8 @@ where
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         self.inner.list_environments(req, options).await
     }
 
@@ -1525,8 +1514,8 @@ where
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         self.inner.get_environment(req, options).await
     }
 
@@ -1534,8 +1523,8 @@ where
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         self.inner.create_environment(req, options).await
     }
 
@@ -1543,8 +1532,8 @@ where
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         self.inner.update_environment(req, options).await
     }
 
@@ -1552,8 +1541,8 @@ where
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_environment(req, options).await
     }
 
@@ -1561,8 +1550,8 @@ where
     async fn get_environment_history(
         &self,
         req: crate::model::GetEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EnvironmentHistory>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EnvironmentHistory>> {
         self.inner.get_environment_history(req, options).await
     }
 
@@ -1570,8 +1559,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1579,8 +1568,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1588,9 +1577,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1598,8 +1586,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1607,8 +1595,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1642,8 +1630,8 @@ where
     async fn get_fulfillment(
         &self,
         req: crate::model::GetFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Fulfillment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Fulfillment>> {
         self.inner.get_fulfillment(req, options).await
     }
 
@@ -1651,8 +1639,8 @@ where
     async fn update_fulfillment(
         &self,
         req: crate::model::UpdateFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Fulfillment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Fulfillment>> {
         self.inner.update_fulfillment(req, options).await
     }
 
@@ -1660,8 +1648,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1669,8 +1657,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1678,9 +1666,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1688,8 +1675,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1697,8 +1684,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1732,8 +1719,8 @@ where
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         self.inner.create_generator(req, options).await
     }
 
@@ -1741,8 +1728,8 @@ where
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         self.inner.get_generator(req, options).await
     }
 
@@ -1750,8 +1737,8 @@ where
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGeneratorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGeneratorsResponse>> {
         self.inner.list_generators(req, options).await
     }
 
@@ -1759,8 +1746,8 @@ where
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_generator(req, options).await
     }
 
@@ -1768,8 +1755,8 @@ where
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         self.inner.update_generator(req, options).await
     }
 
@@ -1777,8 +1764,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1786,8 +1773,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1795,9 +1782,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1805,8 +1791,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1814,8 +1800,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1849,8 +1835,8 @@ where
     async fn create_generator_evaluation(
         &self,
         req: crate::model::CreateGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_generator_evaluation(req, options).await
     }
 
@@ -1858,8 +1844,8 @@ where
     async fn get_generator_evaluation(
         &self,
         req: crate::model::GetGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GeneratorEvaluation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GeneratorEvaluation>> {
         self.inner.get_generator_evaluation(req, options).await
     }
 
@@ -1867,8 +1853,8 @@ where
     async fn list_generator_evaluations(
         &self,
         req: crate::model::ListGeneratorEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGeneratorEvaluationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGeneratorEvaluationsResponse>> {
         self.inner.list_generator_evaluations(req, options).await
     }
 
@@ -1876,8 +1862,8 @@ where
     async fn delete_generator_evaluation(
         &self,
         req: crate::model::DeleteGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_generator_evaluation(req, options).await
     }
 
@@ -1885,8 +1871,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1894,8 +1880,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1903,9 +1889,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1913,8 +1898,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1922,22 +1907,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1971,8 +1956,8 @@ where
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIntentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIntentsResponse>> {
         self.inner.list_intents(req, options).await
     }
 
@@ -1980,8 +1965,8 @@ where
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         self.inner.get_intent(req, options).await
     }
 
@@ -1989,8 +1974,8 @@ where
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         self.inner.create_intent(req, options).await
     }
 
@@ -1998,8 +1983,8 @@ where
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         self.inner.update_intent(req, options).await
     }
 
@@ -2007,8 +1992,8 @@ where
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_intent(req, options).await
     }
 
@@ -2016,8 +2001,8 @@ where
     async fn batch_update_intents(
         &self,
         req: crate::model::BatchUpdateIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_update_intents(req, options).await
     }
 
@@ -2025,8 +2010,8 @@ where
     async fn batch_delete_intents(
         &self,
         req: crate::model::BatchDeleteIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_delete_intents(req, options).await
     }
 
@@ -2034,8 +2019,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2043,8 +2028,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2052,9 +2037,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2062,8 +2046,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2071,22 +2055,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2120,8 +2104,8 @@ where
     async fn list_knowledge_bases(
         &self,
         req: crate::model::ListKnowledgeBasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKnowledgeBasesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKnowledgeBasesResponse>> {
         self.inner.list_knowledge_bases(req, options).await
     }
 
@@ -2129,8 +2113,8 @@ where
     async fn get_knowledge_base(
         &self,
         req: crate::model::GetKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KnowledgeBase>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KnowledgeBase>> {
         self.inner.get_knowledge_base(req, options).await
     }
 
@@ -2138,8 +2122,8 @@ where
     async fn create_knowledge_base(
         &self,
         req: crate::model::CreateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KnowledgeBase>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KnowledgeBase>> {
         self.inner.create_knowledge_base(req, options).await
     }
 
@@ -2147,8 +2131,8 @@ where
     async fn delete_knowledge_base(
         &self,
         req: crate::model::DeleteKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_knowledge_base(req, options).await
     }
 
@@ -2156,8 +2140,8 @@ where
     async fn update_knowledge_base(
         &self,
         req: crate::model::UpdateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KnowledgeBase>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KnowledgeBase>> {
         self.inner.update_knowledge_base(req, options).await
     }
 
@@ -2165,8 +2149,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2174,8 +2158,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2183,9 +2167,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2193,8 +2176,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2202,8 +2185,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2237,8 +2220,8 @@ where
     async fn create_participant(
         &self,
         req: crate::model::CreateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Participant>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Participant>> {
         self.inner.create_participant(req, options).await
     }
 
@@ -2246,8 +2229,8 @@ where
     async fn get_participant(
         &self,
         req: crate::model::GetParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Participant>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Participant>> {
         self.inner.get_participant(req, options).await
     }
 
@@ -2255,8 +2238,8 @@ where
     async fn list_participants(
         &self,
         req: crate::model::ListParticipantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListParticipantsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListParticipantsResponse>> {
         self.inner.list_participants(req, options).await
     }
 
@@ -2264,8 +2247,8 @@ where
     async fn update_participant(
         &self,
         req: crate::model::UpdateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Participant>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Participant>> {
         self.inner.update_participant(req, options).await
     }
 
@@ -2273,8 +2256,8 @@ where
     async fn analyze_content(
         &self,
         req: crate::model::AnalyzeContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeContentResponse>> {
         self.inner.analyze_content(req, options).await
     }
 
@@ -2282,8 +2265,8 @@ where
     async fn suggest_articles(
         &self,
         req: crate::model::SuggestArticlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestArticlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestArticlesResponse>> {
         self.inner.suggest_articles(req, options).await
     }
 
@@ -2291,8 +2274,8 @@ where
     async fn suggest_faq_answers(
         &self,
         req: crate::model::SuggestFaqAnswersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestFaqAnswersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestFaqAnswersResponse>> {
         self.inner.suggest_faq_answers(req, options).await
     }
 
@@ -2300,8 +2283,8 @@ where
     async fn suggest_smart_replies(
         &self,
         req: crate::model::SuggestSmartRepliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestSmartRepliesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestSmartRepliesResponse>> {
         self.inner.suggest_smart_replies(req, options).await
     }
 
@@ -2309,8 +2292,8 @@ where
     async fn suggest_knowledge_assist(
         &self,
         req: crate::model::SuggestKnowledgeAssistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestKnowledgeAssistResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestKnowledgeAssistResponse>> {
         self.inner.suggest_knowledge_assist(req, options).await
     }
 
@@ -2318,8 +2301,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2327,8 +2310,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2336,9 +2319,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2346,8 +2328,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2355,8 +2337,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2390,8 +2372,8 @@ where
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DetectIntentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DetectIntentResponse>> {
         self.inner.detect_intent(req, options).await
     }
 
@@ -2399,8 +2381,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2408,8 +2390,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2417,9 +2399,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2427,8 +2408,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2436,8 +2417,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2471,8 +2452,8 @@ where
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionEntityTypesResponse>> {
         self.inner.list_session_entity_types(req, options).await
     }
 
@@ -2480,8 +2461,8 @@ where
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         self.inner.get_session_entity_type(req, options).await
     }
 
@@ -2489,8 +2470,8 @@ where
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         self.inner.create_session_entity_type(req, options).await
     }
 
@@ -2498,8 +2479,8 @@ where
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         self.inner.update_session_entity_type(req, options).await
     }
 
@@ -2507,8 +2488,8 @@ where
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_session_entity_type(req, options).await
     }
 
@@ -2516,8 +2497,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2525,8 +2506,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2534,9 +2515,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2544,8 +2524,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2553,8 +2533,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2588,8 +2568,8 @@ where
     async fn create_sip_trunk(
         &self,
         req: crate::model::CreateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SipTrunk>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SipTrunk>> {
         self.inner.create_sip_trunk(req, options).await
     }
 
@@ -2597,8 +2577,8 @@ where
     async fn delete_sip_trunk(
         &self,
         req: crate::model::DeleteSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_sip_trunk(req, options).await
     }
 
@@ -2606,8 +2586,8 @@ where
     async fn list_sip_trunks(
         &self,
         req: crate::model::ListSipTrunksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSipTrunksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSipTrunksResponse>> {
         self.inner.list_sip_trunks(req, options).await
     }
 
@@ -2615,8 +2595,8 @@ where
     async fn get_sip_trunk(
         &self,
         req: crate::model::GetSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SipTrunk>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SipTrunk>> {
         self.inner.get_sip_trunk(req, options).await
     }
 
@@ -2624,8 +2604,8 @@ where
     async fn update_sip_trunk(
         &self,
         req: crate::model::UpdateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SipTrunk>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SipTrunk>> {
         self.inner.update_sip_trunk(req, options).await
     }
 
@@ -2633,8 +2613,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2642,8 +2622,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2651,9 +2631,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2661,8 +2640,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2670,8 +2649,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2705,8 +2684,8 @@ where
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         self.inner.create_tool(req, options).await
     }
 
@@ -2714,8 +2693,8 @@ where
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         self.inner.get_tool(req, options).await
     }
 
@@ -2723,8 +2702,8 @@ where
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListToolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListToolsResponse>> {
         self.inner.list_tools(req, options).await
     }
 
@@ -2732,8 +2711,8 @@ where
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tool(req, options).await
     }
 
@@ -2741,8 +2720,8 @@ where
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         self.inner.update_tool(req, options).await
     }
 
@@ -2750,8 +2729,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2759,8 +2738,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2768,9 +2747,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2778,8 +2756,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2787,8 +2765,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -2822,8 +2800,8 @@ where
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         self.inner.list_versions(req, options).await
     }
 
@@ -2831,8 +2809,8 @@ where
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.get_version(req, options).await
     }
 
@@ -2840,8 +2818,8 @@ where
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.create_version(req, options).await
     }
 
@@ -2849,8 +2827,8 @@ where
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         self.inner.update_version(req, options).await
     }
 
@@ -2858,8 +2836,8 @@ where
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_version(req, options).await
     }
 
@@ -2867,8 +2845,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -2876,8 +2854,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -2885,9 +2863,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2895,8 +2872,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2904,8 +2881,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/dialogflow/v2/src/transport.rs b/src/generated/cloud/dialogflow/v2/src/transport.rs
index 43210d1ed6..a38ae60bb3 100644
--- a/src/generated/cloud/dialogflow/v2/src/transport.rs
+++ b/src/generated/cloud/dialogflow/v2/src/transport.rs
@@ -14,6 +14,8 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
+#[allow(unused_imports)]
+use crate::Error;
 #[cfg(any(
     feature = "agents",
     feature = "answer-records",
@@ -39,8 +41,6 @@
     feature = "versions",
 ))]
 use crate::Result;
-#[allow(unused_imports)]
-use gax::error::Error;
 
 /// Implements [Agents](super::stub::Agents) using a [gaxi::http::ReqwestClient].
 #[cfg(feature = "agents")]
@@ -60,7 +60,7 @@ impl std::fmt::Debug for Agents {
 
 #[cfg(feature = "agents")]
 impl Agents {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -71,13 +71,13 @@ impl super::stub::Agents for Agents {
     async fn get_agent(
         &self,
         req: crate::model::GetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -137,9 +137,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -154,13 +154,13 @@ impl super::stub::Agents for Agents {
     async fn set_agent(
         &self,
         req: crate::model::SetAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Agent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Agent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -256,9 +256,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -273,13 +273,13 @@ impl super::stub::Agents for Agents {
     async fn delete_agent(
         &self,
         req: crate::model::DeleteAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -339,9 +339,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -350,24 +350,25 @@ impl super::stub::Agents for Agents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn search_agents(
         &self,
         req: crate::model::SearchAgentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchAgentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchAgentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431,9 +432,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,13 +449,13 @@ impl super::stub::Agents for Agents {
     async fn train_agent(
         &self,
         req: crate::model::TrainAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -514,9 +515,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -531,13 +532,13 @@ impl super::stub::Agents for Agents {
     async fn export_agent(
         &self,
         req: crate::model::ExportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -597,9 +598,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -614,13 +615,13 @@ impl super::stub::Agents for Agents {
     async fn import_agent(
         &self,
         req: crate::model::ImportAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -680,9 +681,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -697,13 +698,13 @@ impl super::stub::Agents for Agents {
     async fn restore_agent(
         &self,
         req: crate::model::RestoreAgentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -763,9 +764,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -780,13 +781,13 @@ impl super::stub::Agents for Agents {
     async fn get_validation_result(
         &self,
         req: crate::model::GetValidationResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ValidationResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ValidationResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -848,9 +849,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -865,13 +866,13 @@ impl super::stub::Agents for Agents {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -901,9 +902,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -918,13 +919,13 @@ impl super::stub::Agents for Agents {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -961,9 +962,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -978,14 +979,13 @@ impl super::stub::Agents for Agents {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1055,9 +1055,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1072,13 +1072,13 @@ impl super::stub::Agents for Agents {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1152,9 +1152,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1169,13 +1169,13 @@ impl super::stub::Agents for Agents {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1249,9 +1249,9 @@ impl super::stub::Agents for Agents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1260,25 +1260,26 @@ impl super::stub::Agents for Agents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1301,7 +1302,7 @@ impl std::fmt::Debug for AnswerRecords {
 
 #[cfg(feature = "answer-records")]
 impl AnswerRecords {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1312,13 +1313,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn list_answer_records(
         &self,
         req: crate::model::ListAnswerRecordsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAnswerRecordsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAnswerRecordsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1384,9 +1385,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1401,13 +1402,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn update_answer_record(
         &self,
         req: crate::model::UpdateAnswerRecordRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnswerRecord>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnswerRecord>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1517,9 +1518,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1534,13 +1535,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1570,9 +1571,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1587,13 +1588,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1630,9 +1631,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1647,14 +1648,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1724,9 +1724,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1741,13 +1741,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1821,9 +1821,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1838,13 +1838,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1918,9 +1918,9 @@ impl super::stub::AnswerRecords for AnswerRecords {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1929,12 +1929,13 @@ impl super::stub::AnswerRecords for AnswerRecords {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1956,7 +1957,7 @@ impl std::fmt::Debug for Contexts {
 
 #[cfg(feature = "contexts")]
 impl Contexts {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1967,13 +1968,13 @@ impl super::stub::Contexts for Contexts {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContextsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContextsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2141,9 +2142,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2158,13 +2159,13 @@ impl super::stub::Contexts for Contexts {
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2340,9 +2341,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2357,13 +2358,13 @@ impl super::stub::Contexts for Contexts {
     async fn create_context(
         &self,
         req: crate::model::CreateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2523,9 +2524,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2540,13 +2541,13 @@ impl super::stub::Contexts for Contexts {
     async fn update_context(
         &self,
         req: crate::model::UpdateContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2794,9 +2795,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2811,13 +2812,13 @@ impl super::stub::Contexts for Contexts {
     async fn delete_context(
         &self,
         req: crate::model::DeleteContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2993,9 +2994,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3004,24 +3005,25 @@ impl super::stub::Contexts for Contexts {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn delete_all_contexts(
         &self,
         req: crate::model::DeleteAllContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3181,9 +3183,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3192,24 +3194,25 @@ impl super::stub::Contexts for Contexts {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3239,9 +3242,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3256,13 +3259,13 @@ impl super::stub::Contexts for Contexts {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3299,9 +3302,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3316,14 +3319,13 @@ impl super::stub::Contexts for Contexts {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3393,9 +3395,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3410,13 +3412,13 @@ impl super::stub::Contexts for Contexts {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3490,9 +3492,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3507,13 +3509,13 @@ impl super::stub::Contexts for Contexts {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3587,9 +3589,9 @@ impl super::stub::Contexts for Contexts {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3598,12 +3600,13 @@ impl super::stub::Contexts for Contexts {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -3625,7 +3628,7 @@ impl std::fmt::Debug for Conversations {
 
 #[cfg(feature = "conversations")]
 impl Conversations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3636,13 +3639,13 @@ impl super::stub::Conversations for Conversations {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3704,9 +3707,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3721,13 +3724,13 @@ impl super::stub::Conversations for Conversations {
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3793,9 +3796,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3810,13 +3813,13 @@ impl super::stub::Conversations for Conversations {
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3890,9 +3893,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3907,13 +3910,13 @@ impl super::stub::Conversations for Conversations {
     async fn complete_conversation(
         &self,
         req: crate::model::CompleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3987,9 +3990,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4004,13 +4007,13 @@ impl super::stub::Conversations for Conversations {
     async fn ingest_context_references(
         &self,
         req: crate::model::IngestContextReferencesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IngestContextReferencesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IngestContextReferencesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4051,9 +4054,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4068,13 +4071,13 @@ impl super::stub::Conversations for Conversations {
     async fn list_messages(
         &self,
         req: crate::model::ListMessagesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMessagesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMessagesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4154,9 +4157,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4171,13 +4174,13 @@ impl super::stub::Conversations for Conversations {
     async fn suggest_conversation_summary(
         &self,
         req: crate::model::SuggestConversationSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestConversationSummaryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestConversationSummaryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4251,9 +4254,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4268,13 +4271,13 @@ impl super::stub::Conversations for Conversations {
     async fn generate_stateless_summary(
         &self,
         req: crate::model::GenerateStatelessSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateStatelessSummaryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateStatelessSummaryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4346,9 +4349,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4363,13 +4366,13 @@ impl super::stub::Conversations for Conversations {
     async fn generate_stateless_suggestion(
         &self,
         req: crate::model::GenerateStatelessSuggestionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateStatelessSuggestionResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateStatelessSuggestionResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4406,9 +4409,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4423,13 +4426,13 @@ impl super::stub::Conversations for Conversations {
     async fn search_knowledge(
         &self,
         req: crate::model::SearchKnowledgeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchKnowledgeResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchKnowledgeResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4559,9 +4562,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4576,13 +4579,13 @@ impl super::stub::Conversations for Conversations {
     async fn generate_suggestions(
         &self,
         req: crate::model::GenerateSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateSuggestionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateSuggestionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4656,9 +4659,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4673,13 +4676,13 @@ impl super::stub::Conversations for Conversations {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4709,9 +4712,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4726,13 +4729,13 @@ impl super::stub::Conversations for Conversations {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4769,9 +4772,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4786,14 +4789,13 @@ impl super::stub::Conversations for Conversations {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4863,9 +4865,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4880,13 +4882,13 @@ impl super::stub::Conversations for Conversations {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4960,9 +4962,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4977,13 +4979,13 @@ impl super::stub::Conversations for Conversations {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5057,9 +5059,9 @@ impl super::stub::Conversations for Conversations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5068,12 +5070,13 @@ impl super::stub::Conversations for Conversations {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -5095,7 +5098,7 @@ impl std::fmt::Debug for ConversationDatasets {
 
 #[cfg(feature = "conversation-datasets")]
 impl ConversationDatasets {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5106,13 +5109,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn create_conversation_dataset(
         &self,
         req: crate::model::CreateConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5149,9 +5152,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5166,13 +5169,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn get_conversation_dataset(
         &self,
         req: crate::model::GetConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationDataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationDataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5246,9 +5249,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5263,13 +5266,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn list_conversation_datasets(
         &self,
         req: crate::model::ListConversationDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationDatasetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationDatasetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5333,9 +5336,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5350,13 +5353,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn delete_conversation_dataset(
         &self,
         req: crate::model::DeleteConversationDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5397,9 +5400,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5414,13 +5417,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn import_conversation_data(
         &self,
         req: crate::model::ImportConversationDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5494,9 +5497,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5511,13 +5514,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5547,9 +5550,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5564,13 +5567,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5607,9 +5610,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5624,14 +5627,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5701,9 +5703,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5718,13 +5720,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5798,9 +5800,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5815,13 +5817,13 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5895,9 +5897,9 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5906,25 +5908,26 @@ impl super::stub::ConversationDatasets for ConversationDatasets {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5947,7 +5950,7 @@ impl std::fmt::Debug for ConversationModels {
 
 #[cfg(feature = "conversation-models")]
 impl ConversationModels {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5958,13 +5961,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn create_conversation_model(
         &self,
         req: crate::model::CreateConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6024,9 +6027,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6041,13 +6044,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn get_conversation_model(
         &self,
         req: crate::model::GetConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationModel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationModel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6121,9 +6124,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6138,13 +6141,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn list_conversation_models(
         &self,
         req: crate::model::ListConversationModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6208,9 +6211,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6225,13 +6228,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn delete_conversation_model(
         &self,
         req: crate::model::DeleteConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6305,9 +6308,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6322,13 +6325,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn deploy_conversation_model(
         &self,
         req: crate::model::DeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6402,9 +6405,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6419,13 +6422,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn undeploy_conversation_model(
         &self,
         req: crate::model::UndeployConversationModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6499,9 +6502,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6516,13 +6519,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn get_conversation_model_evaluation(
         &self,
         req: crate::model::GetConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationModelEvaluation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationModelEvaluation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6604,9 +6607,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6621,14 +6624,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn list_conversation_model_evaluations(
         &self,
         req: crate::model::ListConversationModelEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationModelEvaluationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationModelEvaluationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6706,9 +6708,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6723,13 +6725,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn create_conversation_model_evaluation(
         &self,
         req: crate::model::CreateConversationModelEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6770,9 +6772,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6787,13 +6789,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6823,9 +6825,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6840,13 +6842,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6883,9 +6885,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6900,14 +6902,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6977,9 +6978,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6994,13 +6995,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7074,9 +7075,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7091,13 +7092,13 @@ impl super::stub::ConversationModels for ConversationModels {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7171,9 +7172,9 @@ impl super::stub::ConversationModels for ConversationModels {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7182,25 +7183,26 @@ impl super::stub::ConversationModels for ConversationModels {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -7223,7 +7225,7 @@ impl std::fmt::Debug for ConversationProfiles {
 
 #[cfg(feature = "conversation-profiles")]
 impl ConversationProfiles {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -7234,13 +7236,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn list_conversation_profiles(
         &self,
         req: crate::model::ListConversationProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationProfilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationProfilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7304,9 +7306,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7321,13 +7323,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn get_conversation_profile(
         &self,
         req: crate::model::GetConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7401,9 +7403,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7418,13 +7420,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn create_conversation_profile(
         &self,
         req: crate::model::CreateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7484,9 +7486,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7501,13 +7503,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn update_conversation_profile(
         &self,
         req: crate::model::UpdateConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConversationProfile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConversationProfile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7617,9 +7619,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7634,13 +7636,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn delete_conversation_profile(
         &self,
         req: crate::model::DeleteConversationProfileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7714,9 +7716,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7725,24 +7727,25 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn set_suggestion_feature_config(
         &self,
         req: crate::model::SetSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7824,9 +7827,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7841,13 +7844,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn clear_suggestion_feature_config(
         &self,
         req: crate::model::ClearSuggestionFeatureConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7929,9 +7932,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7946,13 +7949,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7982,9 +7985,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7999,13 +8002,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8042,9 +8045,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8059,14 +8062,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8136,9 +8138,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8153,13 +8155,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8233,9 +8235,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8250,13 +8252,13 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8330,9 +8332,9 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8341,25 +8343,26 @@ impl super::stub::ConversationProfiles for ConversationProfiles {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -8382,7 +8385,7 @@ impl std::fmt::Debug for Documents {
 
 #[cfg(feature = "documents")]
 impl Documents {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8393,13 +8396,13 @@ impl super::stub::Documents for Documents {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDocumentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8515,9 +8518,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8532,13 +8535,13 @@ impl super::stub::Documents for Documents {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8657,9 +8660,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8674,13 +8677,13 @@ impl super::stub::Documents for Documents {
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8787,9 +8790,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8804,13 +8807,13 @@ impl super::stub::Documents for Documents {
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8884,9 +8887,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8901,13 +8904,13 @@ impl super::stub::Documents for Documents {
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9026,9 +9029,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9043,13 +9046,13 @@ impl super::stub::Documents for Documents {
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9222,9 +9225,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9239,13 +9242,13 @@ impl super::stub::Documents for Documents {
     async fn reload_document(
         &self,
         req: crate::model::ReloadDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9364,9 +9367,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9381,13 +9384,13 @@ impl super::stub::Documents for Documents {
     async fn export_document(
         &self,
         req: crate::model::ExportDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9469,9 +9472,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9486,13 +9489,13 @@ impl super::stub::Documents for Documents {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9522,9 +9525,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9539,13 +9542,13 @@ impl super::stub::Documents for Documents {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9582,9 +9585,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9599,14 +9602,13 @@ impl super::stub::Documents for Documents {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9676,9 +9678,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9693,13 +9695,13 @@ impl super::stub::Documents for Documents {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9773,9 +9775,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9790,13 +9792,13 @@ impl super::stub::Documents for Documents {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9870,9 +9872,9 @@ impl super::stub::Documents for Documents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9881,25 +9883,26 @@ impl super::stub::Documents for Documents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -9922,7 +9925,7 @@ impl std::fmt::Debug for EncryptionSpecService {
 
 #[cfg(feature = "encryption-spec-service")]
 impl EncryptionSpecService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -9933,13 +9936,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn get_encryption_spec(
         &self,
         req: crate::model::GetEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptionSpec>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptionSpec>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9978,9 +9981,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9995,13 +9998,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn initialize_encryption_spec(
         &self,
         req: crate::model::InitializeEncryptionSpecRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10046,9 +10049,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10063,13 +10066,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10099,9 +10102,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10116,13 +10119,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10159,9 +10162,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10176,14 +10179,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10253,9 +10255,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10270,13 +10272,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10350,9 +10352,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10367,13 +10369,13 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10447,9 +10449,9 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10458,25 +10460,26 @@ impl super::stub::EncryptionSpecService for EncryptionSpecService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10499,7 +10502,7 @@ impl std::fmt::Debug for EntityTypes {
 
 #[cfg(feature = "entity-types")]
 impl EntityTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -10510,13 +10513,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn list_entity_types(
         &self,
         req: crate::model::ListEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEntityTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEntityTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10592,9 +10595,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10609,13 +10612,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn get_entity_type(
         &self,
         req: crate::model::GetEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10691,9 +10694,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10708,13 +10711,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn create_entity_type(
         &self,
         req: crate::model::CreateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10786,9 +10789,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10803,13 +10806,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn update_entity_type(
         &self,
         req: crate::model::UpdateEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10921,9 +10924,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10938,13 +10941,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn delete_entity_type(
         &self,
         req: crate::model::DeleteEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11018,9 +11021,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11029,24 +11032,25 @@ impl super::stub::EntityTypes for EntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn batch_update_entity_types(
         &self,
         req: crate::model::BatchUpdateEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11116,9 +11120,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11133,13 +11137,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn batch_delete_entity_types(
         &self,
         req: crate::model::BatchDeleteEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11209,9 +11213,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11226,13 +11230,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn batch_create_entities(
         &self,
         req: crate::model::BatchCreateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11306,9 +11310,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11323,13 +11327,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn batch_update_entities(
         &self,
         req: crate::model::BatchUpdateEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11403,9 +11407,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11420,13 +11424,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn batch_delete_entities(
         &self,
         req: crate::model::BatchDeleteEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11500,9 +11504,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11517,13 +11521,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11553,9 +11557,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11570,13 +11574,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11613,9 +11617,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11630,14 +11634,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11707,9 +11710,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11724,13 +11727,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11804,9 +11807,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11821,13 +11824,13 @@ impl super::stub::EntityTypes for EntityTypes {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11901,9 +11904,9 @@ impl super::stub::EntityTypes for EntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11912,25 +11915,26 @@ impl super::stub::EntityTypes for EntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -11953,7 +11957,7 @@ impl std::fmt::Debug for Environments {
 
 #[cfg(feature = "environments")]
 impl Environments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -11964,13 +11968,13 @@ impl super::stub::Environments for Environments {
     async fn list_environments(
         &self,
         req: crate::model::ListEnvironmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnvironmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnvironmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12044,9 +12048,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12061,13 +12065,13 @@ impl super::stub::Environments for Environments {
     async fn get_environment(
         &self,
         req: crate::model::GetEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12141,9 +12145,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12158,13 +12162,13 @@ impl super::stub::Environments for Environments {
     async fn create_environment(
         &self,
         req: crate::model::CreateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12236,9 +12240,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12253,13 +12257,13 @@ impl super::stub::Environments for Environments {
     async fn update_environment(
         &self,
         req: crate::model::UpdateEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Environment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Environment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12377,9 +12381,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12394,13 +12398,13 @@ impl super::stub::Environments for Environments {
     async fn delete_environment(
         &self,
         req: crate::model::DeleteEnvironmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12474,9 +12478,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12485,24 +12489,25 @@ impl super::stub::Environments for Environments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_environment_history(
         &self,
         req: crate::model::GetEnvironmentHistoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EnvironmentHistory>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EnvironmentHistory>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12580,9 +12585,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12597,13 +12602,13 @@ impl super::stub::Environments for Environments {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12633,9 +12638,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12650,13 +12655,13 @@ impl super::stub::Environments for Environments {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12693,9 +12698,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12710,14 +12715,13 @@ impl super::stub::Environments for Environments {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12787,9 +12791,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12804,13 +12808,13 @@ impl super::stub::Environments for Environments {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12884,9 +12888,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12901,13 +12905,13 @@ impl super::stub::Environments for Environments {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12981,9 +12985,9 @@ impl super::stub::Environments for Environments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12992,12 +12996,13 @@ impl super::stub::Environments for Environments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -13019,7 +13024,7 @@ impl std::fmt::Debug for Fulfillments {
 
 #[cfg(feature = "fulfillments")]
 impl Fulfillments {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13030,13 +13035,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn get_fulfillment(
         &self,
         req: crate::model::GetFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Fulfillment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Fulfillment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13106,9 +13111,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13123,13 +13128,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn update_fulfillment(
         &self,
         req: crate::model::UpdateFulfillmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Fulfillment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Fulfillment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13235,9 +13240,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13252,13 +13257,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13288,9 +13293,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13305,13 +13310,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13348,9 +13353,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13365,14 +13370,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13442,9 +13446,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13459,13 +13463,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13539,9 +13543,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13556,13 +13560,13 @@ impl super::stub::Fulfillments for Fulfillments {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13636,9 +13640,9 @@ impl super::stub::Fulfillments for Fulfillments {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13647,12 +13651,13 @@ impl super::stub::Fulfillments for Fulfillments {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -13674,7 +13679,7 @@ impl std::fmt::Debug for Generators {
 
 #[cfg(feature = "generators")]
 impl Generators {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13685,13 +13690,13 @@ impl super::stub::Generators for Generators {
     async fn create_generator(
         &self,
         req: crate::model::CreateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13753,9 +13758,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13770,13 +13775,13 @@ impl super::stub::Generators for Generators {
     async fn get_generator(
         &self,
         req: crate::model::GetGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13817,9 +13822,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13834,13 +13839,13 @@ impl super::stub::Generators for Generators {
     async fn list_generators(
         &self,
         req: crate::model::ListGeneratorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGeneratorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGeneratorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13904,9 +13909,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13921,13 +13926,13 @@ impl super::stub::Generators for Generators {
     async fn delete_generator(
         &self,
         req: crate::model::DeleteGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13968,9 +13973,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13979,24 +13984,25 @@ impl super::stub::Generators for Generators {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_generator(
         &self,
         req: crate::model::UpdateGeneratorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Generator>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Generator>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14055,9 +14061,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14072,13 +14078,13 @@ impl super::stub::Generators for Generators {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14108,9 +14114,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14125,13 +14131,13 @@ impl super::stub::Generators for Generators {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14168,9 +14174,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14185,14 +14191,13 @@ impl super::stub::Generators for Generators {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14262,9 +14267,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14279,13 +14284,13 @@ impl super::stub::Generators for Generators {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14359,9 +14364,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14376,13 +14381,13 @@ impl super::stub::Generators for Generators {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14456,9 +14461,9 @@ impl super::stub::Generators for Generators {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14467,12 +14472,13 @@ impl super::stub::Generators for Generators {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -14494,7 +14500,7 @@ impl std::fmt::Debug for GeneratorEvaluations {
 
 #[cfg(feature = "generator-evaluations")]
 impl GeneratorEvaluations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -14505,13 +14511,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn create_generator_evaluation(
         &self,
         req: crate::model::CreateGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14552,9 +14558,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14569,13 +14575,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn get_generator_evaluation(
         &self,
         req: crate::model::GetGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GeneratorEvaluation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GeneratorEvaluation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14620,9 +14626,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14637,13 +14643,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn list_generator_evaluations(
         &self,
         req: crate::model::ListGeneratorEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGeneratorEvaluationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGeneratorEvaluationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14686,9 +14692,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14703,13 +14709,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn delete_generator_evaluation(
         &self,
         req: crate::model::DeleteGeneratorEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14754,9 +14760,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14765,24 +14771,25 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14812,9 +14819,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14829,13 +14836,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14872,9 +14879,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14889,14 +14896,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14966,9 +14972,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14983,13 +14989,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15063,9 +15069,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15080,13 +15086,13 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15160,9 +15166,9 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15171,25 +15177,26 @@ impl super::stub::GeneratorEvaluations for GeneratorEvaluations {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -15212,7 +15219,7 @@ impl std::fmt::Debug for Intents {
 
 #[cfg(feature = "intents")]
 impl Intents {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -15223,13 +15230,13 @@ impl super::stub::Intents for Intents {
     async fn list_intents(
         &self,
         req: crate::model::ListIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIntentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIntentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15385,9 +15392,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15402,13 +15409,13 @@ impl super::stub::Intents for Intents {
     async fn get_intent(
         &self,
         req: crate::model::GetIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15486,9 +15493,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15503,13 +15510,13 @@ impl super::stub::Intents for Intents {
     async fn create_intent(
         &self,
         req: crate::model::CreateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15583,9 +15590,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15600,13 +15607,13 @@ impl super::stub::Intents for Intents {
     async fn update_intent(
         &self,
         req: crate::model::UpdateIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Intent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Intent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15720,9 +15727,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15737,13 +15744,13 @@ impl super::stub::Intents for Intents {
     async fn delete_intent(
         &self,
         req: crate::model::DeleteIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15817,9 +15824,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15828,24 +15835,25 @@ impl super::stub::Intents for Intents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn batch_update_intents(
         &self,
         req: crate::model::BatchUpdateIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15915,9 +15923,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15932,13 +15940,13 @@ impl super::stub::Intents for Intents {
     async fn batch_delete_intents(
         &self,
         req: crate::model::BatchDeleteIntentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16008,9 +16016,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16025,13 +16033,13 @@ impl super::stub::Intents for Intents {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16061,9 +16069,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16078,13 +16086,13 @@ impl super::stub::Intents for Intents {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16121,9 +16129,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16138,14 +16146,13 @@ impl super::stub::Intents for Intents {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16215,9 +16222,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16232,13 +16239,13 @@ impl super::stub::Intents for Intents {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16312,9 +16319,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16329,13 +16336,13 @@ impl super::stub::Intents for Intents {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16409,9 +16416,9 @@ impl super::stub::Intents for Intents {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16420,25 +16427,26 @@ impl super::stub::Intents for Intents {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -16461,7 +16469,7 @@ impl std::fmt::Debug for KnowledgeBases {
 
 #[cfg(feature = "knowledge-bases")]
 impl KnowledgeBases {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -16472,13 +16480,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn list_knowledge_bases(
         &self,
         req: crate::model::ListKnowledgeBasesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKnowledgeBasesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKnowledgeBasesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16578,9 +16586,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16595,13 +16603,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn get_knowledge_base(
         &self,
         req: crate::model::GetKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KnowledgeBase>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KnowledgeBase>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16708,9 +16716,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16725,13 +16733,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn create_knowledge_base(
         &self,
         req: crate::model::CreateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KnowledgeBase>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KnowledgeBase>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16822,9 +16830,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16839,13 +16847,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn delete_knowledge_base(
         &self,
         req: crate::model::DeleteKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16955,9 +16963,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16966,24 +16974,25 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_knowledge_base(
         &self,
         req: crate::model::UpdateKnowledgeBaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KnowledgeBase>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KnowledgeBase>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17144,9 +17153,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17161,13 +17170,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17197,9 +17206,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17214,13 +17223,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17257,9 +17266,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17274,14 +17283,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17351,9 +17359,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17368,13 +17376,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17448,9 +17456,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17465,13 +17473,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17545,9 +17553,9 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17556,12 +17564,13 @@ impl super::stub::KnowledgeBases for KnowledgeBases {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -17583,7 +17592,7 @@ impl std::fmt::Debug for Participants {
 
 #[cfg(feature = "participants")]
 impl Participants {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -17594,13 +17603,13 @@ impl super::stub::Participants for Participants {
     async fn create_participant(
         &self,
         req: crate::model::CreateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Participant>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Participant>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17674,9 +17683,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17691,13 +17700,13 @@ impl super::stub::Participants for Participants {
     async fn get_participant(
         &self,
         req: crate::model::GetParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Participant>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Participant>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17779,9 +17788,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17796,13 +17805,13 @@ impl super::stub::Participants for Participants {
     async fn list_participants(
         &self,
         req: crate::model::ListParticipantsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListParticipantsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListParticipantsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17880,9 +17889,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17897,13 +17906,13 @@ impl super::stub::Participants for Participants {
     async fn update_participant(
         &self,
         req: crate::model::UpdateParticipantRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Participant>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Participant>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18021,9 +18030,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18038,13 +18047,13 @@ impl super::stub::Participants for Participants {
     async fn analyze_content(
         &self,
         req: crate::model::AnalyzeContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeContentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeContentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18126,9 +18135,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18143,13 +18152,13 @@ impl super::stub::Participants for Participants {
     async fn suggest_articles(
         &self,
         req: crate::model::SuggestArticlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestArticlesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestArticlesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18231,9 +18240,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18248,13 +18257,13 @@ impl super::stub::Participants for Participants {
     async fn suggest_faq_answers(
         &self,
         req: crate::model::SuggestFaqAnswersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestFaqAnswersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestFaqAnswersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18336,9 +18345,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18353,13 +18362,13 @@ impl super::stub::Participants for Participants {
     async fn suggest_smart_replies(
         &self,
         req: crate::model::SuggestSmartRepliesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestSmartRepliesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestSmartRepliesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18441,9 +18450,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18458,13 +18467,13 @@ impl super::stub::Participants for Participants {
     async fn suggest_knowledge_assist(
         &self,
         req: crate::model::SuggestKnowledgeAssistRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SuggestKnowledgeAssistResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SuggestKnowledgeAssistResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18546,9 +18555,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18563,13 +18572,13 @@ impl super::stub::Participants for Participants {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18599,9 +18608,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18616,13 +18625,13 @@ impl super::stub::Participants for Participants {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18659,9 +18668,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18676,14 +18685,13 @@ impl super::stub::Participants for Participants {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18753,9 +18761,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18770,13 +18778,13 @@ impl super::stub::Participants for Participants {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18850,9 +18858,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18867,13 +18875,13 @@ impl super::stub::Participants for Participants {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18947,9 +18955,9 @@ impl super::stub::Participants for Participants {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18958,12 +18966,13 @@ impl super::stub::Participants for Participants {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -18985,7 +18994,7 @@ impl std::fmt::Debug for Sessions {
 
 #[cfg(feature = "sessions")]
 impl Sessions {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18996,13 +19005,13 @@ impl super::stub::Sessions for Sessions {
     async fn detect_intent(
         &self,
         req: crate::model::DetectIntentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DetectIntentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DetectIntentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19162,9 +19171,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19179,13 +19188,13 @@ impl super::stub::Sessions for Sessions {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19215,9 +19224,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19232,13 +19241,13 @@ impl super::stub::Sessions for Sessions {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19275,9 +19284,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19292,14 +19301,13 @@ impl super::stub::Sessions for Sessions {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19369,9 +19377,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19386,13 +19394,13 @@ impl super::stub::Sessions for Sessions {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19466,9 +19474,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19483,13 +19491,13 @@ impl super::stub::Sessions for Sessions {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19563,9 +19571,9 @@ impl super::stub::Sessions for Sessions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19574,12 +19582,13 @@ impl super::stub::Sessions for Sessions {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -19601,7 +19610,7 @@ impl std::fmt::Debug for SessionEntityTypes {
 
 #[cfg(feature = "session-entity-types")]
 impl SessionEntityTypes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -19612,13 +19621,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn list_session_entity_types(
         &self,
         req: crate::model::ListSessionEntityTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionEntityTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionEntityTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19786,9 +19795,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19803,13 +19812,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn get_session_entity_type(
         &self,
         req: crate::model::GetSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -19889,9 +19898,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     "projects/*/locations/*/agent/environments/*/users/*/sessions/*/entityTypes/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19906,13 +19915,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn create_session_entity_type(
         &self,
         req: crate::model::CreateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20072,9 +20081,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20089,13 +20098,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn update_session_entity_type(
         &self,
         req: crate::model::UpdateSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SessionEntityType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SessionEntityType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -20187,9 +20196,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     "projects/*/locations/*/agent/environments/*/users/*/sessions/*/entityTypes/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20204,13 +20213,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn delete_session_entity_type(
         &self,
         req: crate::model::DeleteSessionEntityTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -20290,9 +20299,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     "projects/*/locations/*/agent/environments/*/users/*/sessions/*/entityTypes/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20301,24 +20310,25 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20348,9 +20358,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20365,13 +20375,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20408,9 +20418,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20425,14 +20435,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20502,9 +20511,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20519,13 +20528,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20599,9 +20608,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20616,13 +20625,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20696,9 +20705,9 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20707,12 +20716,13 @@ impl super::stub::SessionEntityTypes for SessionEntityTypes {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -20734,7 +20744,7 @@ impl std::fmt::Debug for SipTrunks {
 
 #[cfg(feature = "sip-trunks")]
 impl SipTrunks {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -20745,13 +20755,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn create_sip_trunk(
         &self,
         req: crate::model::CreateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SipTrunk>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SipTrunk>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20788,9 +20798,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20805,13 +20815,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn delete_sip_trunk(
         &self,
         req: crate::model::DeleteSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20852,9 +20862,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20863,24 +20873,25 @@ impl super::stub::SipTrunks for SipTrunks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_sip_trunks(
         &self,
         req: crate::model::ListSipTrunksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSipTrunksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSipTrunksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20919,9 +20930,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20936,13 +20947,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn get_sip_trunk(
         &self,
         req: crate::model::GetSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SipTrunk>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SipTrunk>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20983,9 +20994,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21000,13 +21011,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn update_sip_trunk(
         &self,
         req: crate::model::UpdateSipTrunkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SipTrunk>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SipTrunk>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21065,9 +21076,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21082,13 +21093,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21118,9 +21129,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21135,13 +21146,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21178,9 +21189,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21195,14 +21206,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21272,9 +21282,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21289,13 +21299,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21369,9 +21379,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21386,13 +21396,13 @@ impl super::stub::SipTrunks for SipTrunks {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21466,9 +21476,9 @@ impl super::stub::SipTrunks for SipTrunks {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21477,12 +21487,13 @@ impl super::stub::SipTrunks for SipTrunks {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -21502,7 +21513,7 @@ impl std::fmt::Debug for Tools {
 
 #[cfg(feature = "tools")]
 impl Tools {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -21513,13 +21524,13 @@ impl super::stub::Tools for Tools {
     async fn create_tool(
         &self,
         req: crate::model::CreateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21557,9 +21568,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21574,13 +21585,13 @@ impl super::stub::Tools for Tools {
     async fn get_tool(
         &self,
         req: crate::model::GetToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21621,9 +21632,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21638,13 +21649,13 @@ impl super::stub::Tools for Tools {
     async fn list_tools(
         &self,
         req: crate::model::ListToolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListToolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListToolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21683,9 +21694,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21700,13 +21711,13 @@ impl super::stub::Tools for Tools {
     async fn delete_tool(
         &self,
         req: crate::model::DeleteToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21747,9 +21758,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21758,24 +21769,25 @@ impl super::stub::Tools for Tools {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_tool(
         &self,
         req: crate::model::UpdateToolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Tool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Tool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21834,9 +21846,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21851,13 +21863,13 @@ impl super::stub::Tools for Tools {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21887,9 +21899,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21904,13 +21916,13 @@ impl super::stub::Tools for Tools {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21947,9 +21959,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21964,14 +21976,13 @@ impl super::stub::Tools for Tools {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22041,9 +22052,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22058,13 +22069,13 @@ impl super::stub::Tools for Tools {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22138,9 +22149,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22155,13 +22166,13 @@ impl super::stub::Tools for Tools {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22235,9 +22246,9 @@ impl super::stub::Tools for Tools {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22246,12 +22257,13 @@ impl super::stub::Tools for Tools {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -22273,7 +22285,7 @@ impl std::fmt::Debug for Versions {
 
 #[cfg(feature = "versions")]
 impl Versions {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -22284,13 +22296,13 @@ impl super::stub::Versions for Versions {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22364,9 +22376,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22381,13 +22393,13 @@ impl super::stub::Versions for Versions {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22461,9 +22473,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22478,13 +22490,13 @@ impl super::stub::Versions for Versions {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22554,9 +22566,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22571,13 +22583,13 @@ impl super::stub::Versions for Versions {
     async fn update_version(
         &self,
         req: crate::model::UpdateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Version>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Version>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22687,9 +22699,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22704,13 +22716,13 @@ impl super::stub::Versions for Versions {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22784,9 +22796,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22795,24 +22807,25 @@ impl super::stub::Versions for Versions {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22842,9 +22855,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22859,13 +22872,13 @@ impl super::stub::Versions for Versions {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22902,9 +22915,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22919,14 +22932,13 @@ impl super::stub::Versions for Versions {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22996,9 +23008,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23013,13 +23025,13 @@ impl super::stub::Versions for Versions {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23093,9 +23105,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23110,13 +23122,13 @@ impl super::stub::Versions for Versions {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23190,9 +23202,9 @@ impl super::stub::Versions for Versions {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23201,11 +23213,12 @@ impl super::stub::Versions for Versions {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/discoveryengine/v1/Cargo.toml b/src/generated/cloud/discoveryengine/v1/Cargo.toml
index 094f11dd19..80a2f8d686 100644
--- a/src/generated/cloud/discoveryengine/v1/Cargo.toml
+++ b/src/generated/cloud/discoveryengine/v1/Cargo.toml
@@ -105,9 +105,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace         = true
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 google-cloud-rpc.workspace         = true
diff --git a/src/generated/cloud/discoveryengine/v1/src/builder.rs b/src/generated/cloud/discoveryengine/v1/src/builder.rs
index 1071db6709..a5ec2d86b6 100644
--- a/src/generated/cloud/discoveryengine/v1/src/builder.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/builder.rs
@@ -22,7 +22,7 @@ pub mod assistant_service {
     /// A builder for [AssistantService][crate::client::AssistantService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::assistant_service::ClientBuilder;
     /// # use client::AssistantService;
@@ -32,19 +32,18 @@ pub mod assistant_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AssistantService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AssistantService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -55,7 +54,7 @@ pub mod assistant_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AssistantService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -68,7 +67,7 @@ pub mod assistant_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -78,8 +77,8 @@ pub mod assistant_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::assistant_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -115,7 +114,7 @@ pub mod assistant_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125,15 +124,15 @@ pub mod assistant_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -142,17 +141,17 @@ pub mod assistant_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -188,8 +187,8 @@ pub mod assistant_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -199,7 +198,7 @@ pub mod assistant_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::assistant_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -230,7 +229,7 @@ pub mod assistant_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -240,7 +239,7 @@ pub mod assistant_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -251,8 +250,8 @@ pub mod assistant_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -262,7 +261,7 @@ pub mod assistant_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::assistant_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -295,7 +294,7 @@ pub mod assistant_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -305,7 +304,7 @@ pub mod assistant_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -316,8 +315,8 @@ pub mod assistant_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -331,7 +330,7 @@ pub mod cmek_config_service {
     /// A builder for [CmekConfigService][crate::client::CmekConfigService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::cmek_config_service::ClientBuilder;
     /// # use client::CmekConfigService;
@@ -341,19 +340,18 @@ pub mod cmek_config_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CmekConfigService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CmekConfigService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -364,7 +362,7 @@ pub mod cmek_config_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CmekConfigService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -377,7 +375,7 @@ pub mod cmek_config_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -387,7 +385,7 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::UpdateCmekConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -419,7 +417,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -434,7 +432,7 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .update_cmek_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_cmek_config`.
@@ -453,7 +451,7 @@ pub mod cmek_config_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -510,8 +508,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCmekConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCmekConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -521,7 +519,7 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::GetCmekConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -549,7 +547,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -559,7 +557,7 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .get_cmek_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCmekConfigRequest::name].
@@ -572,8 +570,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCmekConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCmekConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -583,7 +581,7 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::ListCmekConfigs;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -611,7 +609,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -621,7 +619,7 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .list_cmek_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListCmekConfigsRequest::parent].
@@ -634,8 +632,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCmekConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCmekConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -645,7 +643,7 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::DeleteCmekConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -677,7 +675,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -692,7 +690,7 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .delete_cmek_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_cmek_config`.
@@ -708,7 +706,7 @@ pub mod cmek_config_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -745,8 +743,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCmekConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCmekConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -756,8 +754,8 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -793,7 +791,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -803,15 +801,15 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -820,17 +818,17 @@ pub mod cmek_config_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -866,8 +864,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -877,7 +875,7 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -908,7 +906,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -918,7 +916,7 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -929,8 +927,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -940,7 +938,7 @@ pub mod cmek_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::cmek_config_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -973,7 +971,7 @@ pub mod cmek_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -983,7 +981,7 @@ pub mod cmek_config_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -994,8 +992,8 @@ pub mod cmek_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1009,7 +1007,7 @@ pub mod completion_service {
     /// A builder for [CompletionService][crate::client::CompletionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::completion_service::ClientBuilder;
     /// # use client::CompletionService;
@@ -1019,19 +1017,18 @@ pub mod completion_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CompletionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CompletionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1042,7 +1039,7 @@ pub mod completion_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CompletionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1055,7 +1052,7 @@ pub mod completion_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1065,7 +1062,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::CompleteQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1093,7 +1090,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1103,7 +1100,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .complete_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_store][crate::model::CompleteQueryRequest::data_store].
@@ -1142,8 +1139,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CompleteQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CompleteQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1153,7 +1150,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::ImportSuggestionDenyListEntries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1187,7 +1184,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1202,7 +1199,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .import_suggestion_deny_list_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_suggestion_deny_list_entries`.
@@ -1221,7 +1218,7 @@ pub mod completion_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1304,8 +1301,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportSuggestionDenyListEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportSuggestionDenyListEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1315,7 +1312,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::PurgeSuggestionDenyListEntries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1349,7 +1346,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1364,7 +1361,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .purge_suggestion_deny_list_entries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_suggestion_deny_list_entries`.
@@ -1383,7 +1380,7 @@ pub mod completion_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1420,8 +1417,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeSuggestionDenyListEntries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeSuggestionDenyListEntries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1431,7 +1428,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::ImportCompletionSuggestions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1465,7 +1462,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1480,7 +1477,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .import_completion_suggestions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_completion_suggestions`.
@@ -1499,7 +1496,7 @@ pub mod completion_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1615,8 +1612,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportCompletionSuggestions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportCompletionSuggestions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1626,7 +1623,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::PurgeCompletionSuggestions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1660,7 +1657,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1675,7 +1672,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .purge_completion_suggestions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_completion_suggestions`.
@@ -1694,7 +1691,7 @@ pub mod completion_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1731,8 +1728,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeCompletionSuggestions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeCompletionSuggestions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1742,8 +1739,8 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1779,7 +1776,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1789,15 +1786,15 @@ pub mod completion_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1806,17 +1803,17 @@ pub mod completion_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1852,8 +1849,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1863,7 +1860,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1894,7 +1891,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1904,7 +1901,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1915,8 +1912,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1926,7 +1923,7 @@ pub mod completion_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::completion_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1959,7 +1956,7 @@ pub mod completion_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1969,7 +1966,7 @@ pub mod completion_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1980,8 +1977,8 @@ pub mod completion_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1995,7 +1992,7 @@ pub mod control_service {
     /// A builder for [ControlService][crate::client::ControlService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::control_service::ClientBuilder;
     /// # use client::ControlService;
@@ -2005,19 +2002,18 @@ pub mod control_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ControlService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ControlService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2028,7 +2024,7 @@ pub mod control_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ControlService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2041,7 +2037,7 @@ pub mod control_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2051,7 +2047,7 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::CreateControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2079,7 +2075,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2089,7 +2085,7 @@ pub mod control_service {
             (*self.0.stub)
                 .create_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateControlRequest::parent].
@@ -2132,8 +2128,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2143,7 +2139,7 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::DeleteControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2171,7 +2167,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2181,7 +2177,7 @@ pub mod control_service {
             (*self.0.stub)
                 .delete_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteControlRequest::name].
@@ -2194,8 +2190,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2205,7 +2201,7 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::UpdateControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2233,7 +2229,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2243,7 +2239,7 @@ pub mod control_service {
             (*self.0.stub)
                 .update_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [control][crate::model::UpdateControlRequest::control].
@@ -2288,8 +2284,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2299,7 +2295,7 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::GetControl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2327,7 +2323,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2337,7 +2333,7 @@ pub mod control_service {
             (*self.0.stub)
                 .get_control(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetControlRequest::name].
@@ -2350,8 +2346,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetControl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetControl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2361,8 +2357,8 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::ListControls;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2393,7 +2389,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2403,13 +2399,13 @@ pub mod control_service {
             (*self.0.stub)
                 .list_controls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListControlsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListControlsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2418,15 +2414,17 @@ pub mod control_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListControlsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListControlsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2458,8 +2456,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListControls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListControls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2469,8 +2467,8 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2506,7 +2504,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2516,15 +2514,15 @@ pub mod control_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2533,17 +2531,17 @@ pub mod control_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2579,8 +2577,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2590,7 +2588,7 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2621,7 +2619,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2631,7 +2629,7 @@ pub mod control_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2642,8 +2640,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2653,7 +2651,7 @@ pub mod control_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::control_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2686,7 +2684,7 @@ pub mod control_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2696,7 +2694,7 @@ pub mod control_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2707,8 +2705,8 @@ pub mod control_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2722,7 +2720,7 @@ pub mod conversational_search_service {
     /// A builder for [ConversationalSearchService][crate::client::ConversationalSearchService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::conversational_search_service::ClientBuilder;
     /// # use client::ConversationalSearchService;
@@ -2732,19 +2730,18 @@ pub mod conversational_search_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ConversationalSearchService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ConversationalSearchService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2755,7 +2752,7 @@ pub mod conversational_search_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ConversationalSearchService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2768,7 +2765,7 @@ pub mod conversational_search_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2778,7 +2775,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::ConverseConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2809,7 +2806,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2819,7 +2816,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .converse_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ConverseConversationRequest::name].
@@ -2937,8 +2934,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ConverseConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ConverseConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2948,7 +2945,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::CreateConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2979,7 +2976,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2989,7 +2986,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .create_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateConversationRequest::parent].
@@ -3024,8 +3021,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3035,7 +3032,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::DeleteConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3066,7 +3063,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3076,7 +3073,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .delete_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteConversationRequest::name].
@@ -3089,8 +3086,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3100,7 +3097,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::UpdateConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3131,7 +3128,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3141,7 +3138,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .update_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [conversation][crate::model::UpdateConversationRequest::conversation].
@@ -3186,8 +3183,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3197,7 +3194,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::GetConversation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3225,7 +3222,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3235,7 +3232,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .get_conversation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConversationRequest::name].
@@ -3248,8 +3245,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConversation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConversation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3259,8 +3256,8 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::ListConversations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3294,7 +3291,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3304,14 +3301,16 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .list_conversations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConversationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConversationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3319,15 +3318,17 @@ pub mod conversational_search_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConversationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConversationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3365,8 +3366,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConversations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConversations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3376,7 +3377,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::AnswerQuery;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3404,7 +3405,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3414,7 +3415,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .answer_query(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [serving_config][crate::model::AnswerQueryRequest::serving_config].
@@ -3605,8 +3606,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnswerQuery {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnswerQuery {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3616,7 +3617,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::GetAnswer;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3644,7 +3645,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3654,7 +3655,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .get_answer(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAnswerRequest::name].
@@ -3667,8 +3668,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAnswer {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAnswer {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3678,7 +3679,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::CreateSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3706,7 +3707,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3716,7 +3717,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .create_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSessionRequest::parent].
@@ -3751,8 +3752,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3762,7 +3763,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::DeleteSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3790,7 +3791,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3800,7 +3801,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .delete_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSessionRequest::name].
@@ -3813,8 +3814,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3824,7 +3825,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::UpdateSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3852,7 +3853,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3862,7 +3863,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .update_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session][crate::model::UpdateSessionRequest::session].
@@ -3907,8 +3908,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3918,7 +3919,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::GetSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3946,7 +3947,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3956,7 +3957,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .get_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSessionRequest::name].
@@ -3975,8 +3976,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3986,8 +3987,8 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::ListSessions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4018,7 +4019,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4028,13 +4029,13 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .list_sessions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSessionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSessionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4043,15 +4044,17 @@ pub mod conversational_search_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSessionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSessionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4089,8 +4092,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4100,8 +4103,8 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4137,7 +4140,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4147,15 +4150,15 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4164,17 +4167,17 @@ pub mod conversational_search_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4210,8 +4213,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4221,7 +4224,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4252,7 +4255,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4262,7 +4265,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4273,8 +4276,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4284,7 +4287,7 @@ pub mod conversational_search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::conversational_search_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4317,7 +4320,7 @@ pub mod conversational_search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4327,7 +4330,7 @@ pub mod conversational_search_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4338,8 +4341,8 @@ pub mod conversational_search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4353,7 +4356,7 @@ pub mod data_store_service {
     /// A builder for [DataStoreService][crate::client::DataStoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::data_store_service::ClientBuilder;
     /// # use client::DataStoreService;
@@ -4363,19 +4366,18 @@ pub mod data_store_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataStoreService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataStoreService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4386,7 +4388,7 @@ pub mod data_store_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataStoreService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4399,7 +4401,7 @@ pub mod data_store_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4409,7 +4411,7 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::CreateDataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4438,7 +4440,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4453,7 +4455,7 @@ pub mod data_store_service {
             (*self.0.stub)
                 .create_data_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_data_store`.
@@ -4470,7 +4472,7 @@ pub mod data_store_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4586,8 +4588,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4597,7 +4599,7 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::GetDataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4625,7 +4627,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4635,7 +4637,7 @@ pub mod data_store_service {
             (*self.0.stub)
                 .get_data_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDataStoreRequest::name].
@@ -4648,8 +4650,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4659,8 +4661,8 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::ListDataStores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4691,7 +4693,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4701,14 +4703,16 @@ pub mod data_store_service {
             (*self.0.stub)
                 .list_data_stores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDataStoresResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDataStoresResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4716,15 +4720,17 @@ pub mod data_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDataStoresResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDataStoresResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4756,8 +4762,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDataStores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDataStores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4767,7 +4773,7 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::DeleteDataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4796,7 +4802,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4811,7 +4817,7 @@ pub mod data_store_service {
             (*self.0.stub)
                 .delete_data_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_data_store`.
@@ -4827,7 +4833,7 @@ pub mod data_store_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4864,8 +4870,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4875,7 +4881,7 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::UpdateDataStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4903,7 +4909,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4913,7 +4919,7 @@ pub mod data_store_service {
             (*self.0.stub)
                 .update_data_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_store][crate::model::UpdateDataStoreRequest::data_store].
@@ -4958,8 +4964,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4969,8 +4975,8 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5006,7 +5012,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5016,15 +5022,15 @@ pub mod data_store_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5033,17 +5039,17 @@ pub mod data_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5079,8 +5085,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5090,7 +5096,7 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5121,7 +5127,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5131,7 +5137,7 @@ pub mod data_store_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5142,8 +5148,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5153,7 +5159,7 @@ pub mod data_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::data_store_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5186,7 +5192,7 @@ pub mod data_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5196,7 +5202,7 @@ pub mod data_store_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5207,8 +5213,8 @@ pub mod data_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5222,7 +5228,7 @@ pub mod document_service {
     /// A builder for [DocumentService][crate::client::DocumentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::document_service::ClientBuilder;
     /// # use client::DocumentService;
@@ -5232,19 +5238,18 @@ pub mod document_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DocumentService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DocumentService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5255,7 +5260,7 @@ pub mod document_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DocumentService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5268,7 +5273,7 @@ pub mod document_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5278,7 +5283,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::GetDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5306,7 +5311,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5316,7 +5321,7 @@ pub mod document_service {
             (*self.0.stub)
                 .get_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDocumentRequest::name].
@@ -5329,8 +5334,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5340,8 +5345,8 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::ListDocuments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5372,7 +5377,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5382,13 +5387,13 @@ pub mod document_service {
             (*self.0.stub)
                 .list_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDocumentsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDocumentsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5397,15 +5402,17 @@ pub mod document_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDocumentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDocumentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5431,8 +5438,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5442,7 +5449,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::CreateDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5470,7 +5477,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5480,7 +5487,7 @@ pub mod document_service {
             (*self.0.stub)
                 .create_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDocumentRequest::parent].
@@ -5523,8 +5530,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5534,7 +5541,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::UpdateDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5562,7 +5569,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5572,7 +5579,7 @@ pub mod document_service {
             (*self.0.stub)
                 .update_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::UpdateDocumentRequest::document].
@@ -5623,8 +5630,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5634,7 +5641,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::DeleteDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5662,7 +5669,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5672,7 +5679,7 @@ pub mod document_service {
             (*self.0.stub)
                 .delete_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDocumentRequest::name].
@@ -5685,8 +5692,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5696,7 +5703,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::ImportDocuments;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5725,7 +5732,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5740,7 +5747,7 @@ pub mod document_service {
             (*self.0.stub)
                 .import_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_documents`.
@@ -5759,7 +5766,7 @@ pub mod document_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6008,8 +6015,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6019,7 +6026,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::PurgeDocuments;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6048,7 +6055,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6063,7 +6070,7 @@ pub mod document_service {
             (*self.0.stub)
                 .purge_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_documents`.
@@ -6082,7 +6089,7 @@ pub mod document_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6193,8 +6200,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6204,7 +6211,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::BatchGetDocumentsMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6237,7 +6244,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6247,7 +6254,7 @@ pub mod document_service {
             (*self.0.stub)
                 .batch_get_documents_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchGetDocumentsMetadataRequest::parent].
@@ -6282,8 +6289,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchGetDocumentsMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchGetDocumentsMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6293,8 +6300,8 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6330,7 +6337,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6340,15 +6347,15 @@ pub mod document_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6357,17 +6364,17 @@ pub mod document_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6403,8 +6410,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6414,7 +6421,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6445,7 +6452,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6455,7 +6462,7 @@ pub mod document_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -6466,8 +6473,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6477,7 +6484,7 @@ pub mod document_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::document_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6510,7 +6517,7 @@ pub mod document_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6520,7 +6527,7 @@ pub mod document_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -6531,8 +6538,8 @@ pub mod document_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6546,7 +6553,7 @@ pub mod engine_service {
     /// A builder for [EngineService][crate::client::EngineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::engine_service::ClientBuilder;
     /// # use client::EngineService;
@@ -6556,19 +6563,18 @@ pub mod engine_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EngineService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EngineService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -6579,7 +6585,7 @@ pub mod engine_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EngineService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -6592,7 +6598,7 @@ pub mod engine_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -6602,7 +6608,7 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::CreateEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6631,7 +6637,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6646,7 +6652,7 @@ pub mod engine_service {
             (*self.0.stub)
                 .create_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_engine`.
@@ -6663,7 +6669,7 @@ pub mod engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6730,8 +6736,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6741,7 +6747,7 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::DeleteEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6770,7 +6776,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6785,7 +6791,7 @@ pub mod engine_service {
             (*self.0.stub)
                 .delete_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_engine`.
@@ -6801,7 +6807,7 @@ pub mod engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6838,8 +6844,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6849,7 +6855,7 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::UpdateEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6877,7 +6883,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6887,7 +6893,7 @@ pub mod engine_service {
             (*self.0.stub)
                 .update_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [engine][crate::model::UpdateEngineRequest::engine].
@@ -6932,8 +6938,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6943,7 +6949,7 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::GetEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6971,7 +6977,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6981,7 +6987,7 @@ pub mod engine_service {
             (*self.0.stub)
                 .get_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEngineRequest::name].
@@ -6994,8 +7000,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7005,8 +7011,8 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::ListEngines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7037,7 +7043,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7047,13 +7053,13 @@ pub mod engine_service {
             (*self.0.stub)
                 .list_engines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEnginesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListEnginesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7062,15 +7068,17 @@ pub mod engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEnginesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEnginesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7102,8 +7110,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEngines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEngines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7113,8 +7121,8 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7150,7 +7158,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7160,15 +7168,15 @@ pub mod engine_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7177,17 +7185,17 @@ pub mod engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7223,8 +7231,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7234,7 +7242,7 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7265,7 +7273,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7275,7 +7283,7 @@ pub mod engine_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7286,8 +7294,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7297,7 +7305,7 @@ pub mod engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::engine_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7330,7 +7338,7 @@ pub mod engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7340,7 +7348,7 @@ pub mod engine_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7351,8 +7359,8 @@ pub mod engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7366,7 +7374,7 @@ pub mod grounded_generation_service {
     /// A builder for [GroundedGenerationService][crate::client::GroundedGenerationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::grounded_generation_service::ClientBuilder;
     /// # use client::GroundedGenerationService;
@@ -7376,19 +7384,18 @@ pub mod grounded_generation_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GroundedGenerationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GroundedGenerationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7399,7 +7406,7 @@ pub mod grounded_generation_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GroundedGenerationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7412,7 +7419,7 @@ pub mod grounded_generation_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7422,7 +7429,7 @@ pub mod grounded_generation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::grounded_generation_service::GenerateGroundedContent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7455,7 +7462,7 @@ pub mod grounded_generation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7465,7 +7472,7 @@ pub mod grounded_generation_service {
             (*self.0.stub)
                 .generate_grounded_content(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [location][crate::model::GenerateGroundedContentRequest::location].
@@ -7554,8 +7561,8 @@ pub mod grounded_generation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateGroundedContent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateGroundedContent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7565,7 +7572,7 @@ pub mod grounded_generation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::grounded_generation_service::CheckGrounding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7593,7 +7600,7 @@ pub mod grounded_generation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7603,7 +7610,7 @@ pub mod grounded_generation_service {
             (*self.0.stub)
                 .check_grounding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [grounding_config][crate::model::CheckGroundingRequest::grounding_config].
@@ -7662,8 +7669,8 @@ pub mod grounded_generation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CheckGrounding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CheckGrounding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7673,8 +7680,8 @@ pub mod grounded_generation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::grounded_generation_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7710,7 +7717,7 @@ pub mod grounded_generation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7720,15 +7727,15 @@ pub mod grounded_generation_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7737,17 +7744,17 @@ pub mod grounded_generation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7783,8 +7790,8 @@ pub mod grounded_generation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7794,7 +7801,7 @@ pub mod grounded_generation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::grounded_generation_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7825,7 +7832,7 @@ pub mod grounded_generation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7835,7 +7842,7 @@ pub mod grounded_generation_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7846,8 +7853,8 @@ pub mod grounded_generation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7857,7 +7864,7 @@ pub mod grounded_generation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::grounded_generation_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7890,7 +7897,7 @@ pub mod grounded_generation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7900,7 +7907,7 @@ pub mod grounded_generation_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7911,8 +7918,8 @@ pub mod grounded_generation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7926,7 +7933,7 @@ pub mod identity_mapping_store_service {
     /// A builder for [IdentityMappingStoreService][crate::client::IdentityMappingStoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::identity_mapping_store_service::ClientBuilder;
     /// # use client::IdentityMappingStoreService;
@@ -7936,19 +7943,18 @@ pub mod identity_mapping_store_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::IdentityMappingStoreService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = IdentityMappingStoreService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -7959,7 +7965,7 @@ pub mod identity_mapping_store_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::IdentityMappingStoreService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -7972,7 +7978,7 @@ pub mod identity_mapping_store_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -7982,7 +7988,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::CreateIdentityMappingStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8015,7 +8021,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8025,7 +8031,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .create_identity_mapping_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIdentityMappingStoreRequest::parent].
@@ -8105,8 +8111,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIdentityMappingStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIdentityMappingStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8116,7 +8122,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::GetIdentityMappingStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8149,7 +8155,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8159,7 +8165,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .get_identity_mapping_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIdentityMappingStoreRequest::name].
@@ -8172,8 +8178,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIdentityMappingStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIdentityMappingStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8183,7 +8189,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::DeleteIdentityMappingStore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8217,7 +8223,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8232,7 +8238,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .delete_identity_mapping_store(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_identity_mapping_store`.
@@ -8249,7 +8255,7 @@ pub mod identity_mapping_store_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8286,8 +8292,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIdentityMappingStore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIdentityMappingStore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8297,7 +8303,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::ImportIdentityMappings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8329,7 +8335,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8344,7 +8350,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .import_identity_mappings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_identity_mappings`.
@@ -8363,7 +8369,7 @@ pub mod identity_mapping_store_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8431,8 +8437,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportIdentityMappings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportIdentityMappings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8442,7 +8448,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::PurgeIdentityMappings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8474,7 +8480,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8489,7 +8495,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .purge_identity_mappings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_identity_mappings`.
@@ -8506,7 +8512,7 @@ pub mod identity_mapping_store_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -8598,8 +8604,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeIdentityMappings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeIdentityMappings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8609,8 +8615,8 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::ListIdentityMappings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8644,7 +8650,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8654,14 +8660,16 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .list_identity_mappings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListIdentityMappingsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListIdentityMappingsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -8669,17 +8677,17 @@ pub mod identity_mapping_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListIdentityMappingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8705,8 +8713,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIdentityMappings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIdentityMappings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8716,8 +8724,8 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::ListIdentityMappingStores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8753,7 +8761,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8763,15 +8771,15 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .list_identity_mapping_stores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListIdentityMappingStoresResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8780,17 +8788,17 @@ pub mod identity_mapping_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListIdentityMappingStoresResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8816,8 +8824,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIdentityMappingStores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIdentityMappingStores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8827,8 +8835,8 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8864,7 +8872,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8874,15 +8882,15 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8891,17 +8899,17 @@ pub mod identity_mapping_store_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8937,8 +8945,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8948,7 +8956,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8979,7 +8987,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8989,7 +8997,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9000,8 +9008,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9011,7 +9019,7 @@ pub mod identity_mapping_store_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::identity_mapping_store_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9044,7 +9052,7 @@ pub mod identity_mapping_store_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9054,7 +9062,7 @@ pub mod identity_mapping_store_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9065,8 +9073,8 @@ pub mod identity_mapping_store_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9080,7 +9088,7 @@ pub mod project_service {
     /// A builder for [ProjectService][crate::client::ProjectService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::project_service::ClientBuilder;
     /// # use client::ProjectService;
@@ -9090,19 +9098,18 @@ pub mod project_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ProjectService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ProjectService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -9113,7 +9120,7 @@ pub mod project_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ProjectService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -9126,7 +9133,7 @@ pub mod project_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -9136,7 +9143,7 @@ pub mod project_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::project_service::ProvisionProject;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9168,7 +9175,7 @@ pub mod project_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9183,7 +9190,7 @@ pub mod project_service {
             (*self.0.stub)
                 .provision_project(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `provision_project`.
@@ -9200,7 +9207,7 @@ pub mod project_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9253,8 +9260,8 @@ pub mod project_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ProvisionProject {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ProvisionProject {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9264,8 +9271,8 @@ pub mod project_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::project_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9301,7 +9308,7 @@ pub mod project_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9311,15 +9318,15 @@ pub mod project_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9328,17 +9335,17 @@ pub mod project_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9374,8 +9381,8 @@ pub mod project_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9385,7 +9392,7 @@ pub mod project_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::project_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9416,7 +9423,7 @@ pub mod project_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9426,7 +9433,7 @@ pub mod project_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9437,8 +9444,8 @@ pub mod project_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9448,7 +9455,7 @@ pub mod project_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::project_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9481,7 +9488,7 @@ pub mod project_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9491,7 +9498,7 @@ pub mod project_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9502,8 +9509,8 @@ pub mod project_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9517,7 +9524,7 @@ pub mod rank_service {
     /// A builder for [RankService][crate::client::RankService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::rank_service::ClientBuilder;
     /// # use client::RankService;
@@ -9527,19 +9534,18 @@ pub mod rank_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RankService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RankService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -9550,7 +9556,7 @@ pub mod rank_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RankService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -9563,7 +9569,7 @@ pub mod rank_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -9573,7 +9579,7 @@ pub mod rank_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::rank_service::Rank;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9601,7 +9607,7 @@ pub mod rank_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9611,7 +9617,7 @@ pub mod rank_service {
             (*self.0.stub)
                 .rank(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [ranking_config][crate::model::RankRequest::ranking_config].
@@ -9672,8 +9678,8 @@ pub mod rank_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Rank {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Rank {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9683,8 +9689,8 @@ pub mod rank_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::rank_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9720,7 +9726,7 @@ pub mod rank_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9730,15 +9736,15 @@ pub mod rank_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9747,17 +9753,17 @@ pub mod rank_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9793,8 +9799,8 @@ pub mod rank_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9804,7 +9810,7 @@ pub mod rank_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::rank_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9835,7 +9841,7 @@ pub mod rank_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9845,7 +9851,7 @@ pub mod rank_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9856,8 +9862,8 @@ pub mod rank_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9867,7 +9873,7 @@ pub mod rank_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::rank_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9900,7 +9906,7 @@ pub mod rank_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9910,7 +9916,7 @@ pub mod rank_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -9921,8 +9927,8 @@ pub mod rank_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9936,7 +9942,7 @@ pub mod recommendation_service {
     /// A builder for [RecommendationService][crate::client::RecommendationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::recommendation_service::ClientBuilder;
     /// # use client::RecommendationService;
@@ -9946,19 +9952,18 @@ pub mod recommendation_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::RecommendationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = RecommendationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -9969,7 +9974,7 @@ pub mod recommendation_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::RecommendationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -9982,7 +9987,7 @@ pub mod recommendation_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -9992,7 +9997,7 @@ pub mod recommendation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::recommendation_service::Recommend;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10020,7 +10025,7 @@ pub mod recommendation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10030,7 +10035,7 @@ pub mod recommendation_service {
             (*self.0.stub)
                 .recommend(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [serving_config][crate::model::RecommendRequest::serving_config].
@@ -10105,8 +10110,8 @@ pub mod recommendation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Recommend {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Recommend {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10116,8 +10121,8 @@ pub mod recommendation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::recommendation_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10153,7 +10158,7 @@ pub mod recommendation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10163,15 +10168,15 @@ pub mod recommendation_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10180,17 +10185,17 @@ pub mod recommendation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10226,8 +10231,8 @@ pub mod recommendation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10237,7 +10242,7 @@ pub mod recommendation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::recommendation_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10268,7 +10273,7 @@ pub mod recommendation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10278,7 +10283,7 @@ pub mod recommendation_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -10289,8 +10294,8 @@ pub mod recommendation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10300,7 +10305,7 @@ pub mod recommendation_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::recommendation_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10333,7 +10338,7 @@ pub mod recommendation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10343,7 +10348,7 @@ pub mod recommendation_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -10354,8 +10359,8 @@ pub mod recommendation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10369,7 +10374,7 @@ pub mod schema_service {
     /// A builder for [SchemaService][crate::client::SchemaService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::schema_service::ClientBuilder;
     /// # use client::SchemaService;
@@ -10379,19 +10384,18 @@ pub mod schema_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SchemaService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SchemaService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -10402,7 +10406,7 @@ pub mod schema_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SchemaService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -10415,7 +10419,7 @@ pub mod schema_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -10425,7 +10429,7 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::GetSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10453,7 +10457,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10463,7 +10467,7 @@ pub mod schema_service {
             (*self.0.stub)
                 .get_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaRequest::name].
@@ -10476,8 +10480,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10487,8 +10491,8 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::ListSchemas;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10519,7 +10523,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10529,13 +10533,13 @@ pub mod schema_service {
             (*self.0.stub)
                 .list_schemas(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSchemasResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSchemasResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10544,15 +10548,17 @@ pub mod schema_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSchemasResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSchemasResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10578,8 +10584,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSchemas {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSchemas {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10589,7 +10595,7 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::CreateSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10618,7 +10624,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10633,7 +10639,7 @@ pub mod schema_service {
             (*self.0.stub)
                 .create_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_schema`.
@@ -10650,7 +10656,7 @@ pub mod schema_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10717,8 +10723,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10728,7 +10734,7 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::UpdateSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10757,7 +10763,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10772,7 +10778,7 @@ pub mod schema_service {
             (*self.0.stub)
                 .update_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_schema`.
@@ -10789,7 +10795,7 @@ pub mod schema_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10846,8 +10852,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10857,7 +10863,7 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::DeleteSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10886,7 +10892,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10901,7 +10907,7 @@ pub mod schema_service {
             (*self.0.stub)
                 .delete_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_schema`.
@@ -10917,7 +10923,7 @@ pub mod schema_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10954,8 +10960,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10965,8 +10971,8 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11002,7 +11008,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11012,15 +11018,15 @@ pub mod schema_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11029,17 +11035,17 @@ pub mod schema_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11075,8 +11081,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11086,7 +11092,7 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11117,7 +11123,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11127,7 +11133,7 @@ pub mod schema_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -11138,8 +11144,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11149,7 +11155,7 @@ pub mod schema_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::schema_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11182,7 +11188,7 @@ pub mod schema_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11192,7 +11198,7 @@ pub mod schema_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -11203,8 +11209,8 @@ pub mod schema_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11218,7 +11224,7 @@ pub mod search_service {
     /// A builder for [SearchService][crate::client::SearchService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::search_service::ClientBuilder;
     /// # use client::SearchService;
@@ -11228,19 +11234,18 @@ pub mod search_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SearchService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SearchService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -11251,7 +11256,7 @@ pub mod search_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SearchService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -11264,7 +11269,7 @@ pub mod search_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -11274,8 +11279,8 @@ pub mod search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_service::Search;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11306,7 +11311,7 @@ pub mod search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11316,13 +11321,13 @@ pub mod search_service {
             (*self.0.stub)
                 .search(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11331,15 +11336,15 @@ pub mod search_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::SearchResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11683,8 +11688,8 @@ pub mod search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Search {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Search {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11694,8 +11699,8 @@ pub mod search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_service::SearchLite;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11726,7 +11731,7 @@ pub mod search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11736,13 +11741,13 @@ pub mod search_service {
             (*self.0.stub)
                 .search_lite(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::SearchResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11751,15 +11756,15 @@ pub mod search_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::SearchResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::SearchResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12103,8 +12108,8 @@ pub mod search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchLite {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchLite {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12114,8 +12119,8 @@ pub mod search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12151,7 +12156,7 @@ pub mod search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12161,15 +12166,15 @@ pub mod search_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12178,17 +12183,17 @@ pub mod search_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12224,8 +12229,8 @@ pub mod search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12235,7 +12240,7 @@ pub mod search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12266,7 +12271,7 @@ pub mod search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12276,7 +12281,7 @@ pub mod search_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -12287,8 +12292,8 @@ pub mod search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12298,7 +12303,7 @@ pub mod search_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12331,7 +12336,7 @@ pub mod search_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12341,7 +12346,7 @@ pub mod search_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -12352,8 +12357,8 @@ pub mod search_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12367,7 +12372,7 @@ pub mod search_tuning_service {
     /// A builder for [SearchTuningService][crate::client::SearchTuningService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::search_tuning_service::ClientBuilder;
     /// # use client::SearchTuningService;
@@ -12377,19 +12382,18 @@ pub mod search_tuning_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SearchTuningService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SearchTuningService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -12400,7 +12404,7 @@ pub mod search_tuning_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SearchTuningService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -12413,7 +12417,7 @@ pub mod search_tuning_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -12423,7 +12427,7 @@ pub mod search_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_tuning_service::TrainCustomModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -12455,7 +12459,7 @@ pub mod search_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12470,7 +12474,7 @@ pub mod search_tuning_service {
             (*self.0.stub)
                 .train_custom_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `train_custom_model`.
@@ -12489,7 +12493,7 @@ pub mod search_tuning_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -12587,8 +12591,8 @@ pub mod search_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TrainCustomModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TrainCustomModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12598,7 +12602,7 @@ pub mod search_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_tuning_service::ListCustomModels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12629,7 +12633,7 @@ pub mod search_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12639,7 +12643,7 @@ pub mod search_tuning_service {
             (*self.0.stub)
                 .list_custom_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [data_store][crate::model::ListCustomModelsRequest::data_store].
@@ -12652,8 +12656,8 @@ pub mod search_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCustomModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCustomModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12663,8 +12667,8 @@ pub mod search_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_tuning_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -12700,7 +12704,7 @@ pub mod search_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12710,15 +12714,15 @@ pub mod search_tuning_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -12727,17 +12731,17 @@ pub mod search_tuning_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -12773,8 +12777,8 @@ pub mod search_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12784,7 +12788,7 @@ pub mod search_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_tuning_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12815,7 +12819,7 @@ pub mod search_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12825,7 +12829,7 @@ pub mod search_tuning_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -12836,8 +12840,8 @@ pub mod search_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12847,7 +12851,7 @@ pub mod search_tuning_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::search_tuning_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -12880,7 +12884,7 @@ pub mod search_tuning_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -12890,7 +12894,7 @@ pub mod search_tuning_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -12901,8 +12905,8 @@ pub mod search_tuning_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -12916,7 +12920,7 @@ pub mod serving_config_service {
     /// A builder for [ServingConfigService][crate::client::ServingConfigService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::serving_config_service::ClientBuilder;
     /// # use client::ServingConfigService;
@@ -12926,19 +12930,18 @@ pub mod serving_config_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ServingConfigService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ServingConfigService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -12949,7 +12952,7 @@ pub mod serving_config_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ServingConfigService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -12962,7 +12965,7 @@ pub mod serving_config_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -12972,7 +12975,7 @@ pub mod serving_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::serving_config_service::UpdateServingConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13003,7 +13006,7 @@ pub mod serving_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13013,7 +13016,7 @@ pub mod serving_config_service {
             (*self.0.stub)
                 .update_serving_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [serving_config][crate::model::UpdateServingConfigRequest::serving_config].
@@ -13058,8 +13061,8 @@ pub mod serving_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateServingConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateServingConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13069,8 +13072,8 @@ pub mod serving_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::serving_config_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13106,7 +13109,7 @@ pub mod serving_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13116,15 +13119,15 @@ pub mod serving_config_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13133,17 +13136,17 @@ pub mod serving_config_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13179,8 +13182,8 @@ pub mod serving_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13190,7 +13193,7 @@ pub mod serving_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::serving_config_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13221,7 +13224,7 @@ pub mod serving_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13231,7 +13234,7 @@ pub mod serving_config_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -13242,8 +13245,8 @@ pub mod serving_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13253,7 +13256,7 @@ pub mod serving_config_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::serving_config_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13286,7 +13289,7 @@ pub mod serving_config_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13296,7 +13299,7 @@ pub mod serving_config_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -13307,8 +13310,8 @@ pub mod serving_config_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13322,7 +13325,7 @@ pub mod session_service {
     /// A builder for [SessionService][crate::client::SessionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::session_service::ClientBuilder;
     /// # use client::SessionService;
@@ -13332,19 +13335,18 @@ pub mod session_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SessionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SessionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -13355,7 +13357,7 @@ pub mod session_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SessionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -13368,7 +13370,7 @@ pub mod session_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -13378,7 +13380,7 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::CreateSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13406,7 +13408,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13416,7 +13418,7 @@ pub mod session_service {
             (*self.0.stub)
                 .create_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSessionRequest::parent].
@@ -13451,8 +13453,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13462,7 +13464,7 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::DeleteSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13490,7 +13492,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13500,7 +13502,7 @@ pub mod session_service {
             (*self.0.stub)
                 .delete_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSessionRequest::name].
@@ -13513,8 +13515,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13524,7 +13526,7 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::UpdateSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13552,7 +13554,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13562,7 +13564,7 @@ pub mod session_service {
             (*self.0.stub)
                 .update_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [session][crate::model::UpdateSessionRequest::session].
@@ -13607,8 +13609,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13618,7 +13620,7 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::GetSession;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13646,7 +13648,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13656,7 +13658,7 @@ pub mod session_service {
             (*self.0.stub)
                 .get_session(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSessionRequest::name].
@@ -13675,8 +13677,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSession {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSession {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13686,8 +13688,8 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::ListSessions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13718,7 +13720,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13728,13 +13730,13 @@ pub mod session_service {
             (*self.0.stub)
                 .list_sessions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSessionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSessionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13743,15 +13745,17 @@ pub mod session_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSessionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSessionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13789,8 +13793,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSessions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSessions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13800,8 +13804,8 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -13837,7 +13841,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13847,15 +13851,15 @@ pub mod session_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -13864,17 +13868,17 @@ pub mod session_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -13910,8 +13914,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13921,7 +13925,7 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -13952,7 +13956,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -13962,7 +13966,7 @@ pub mod session_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -13973,8 +13977,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -13984,7 +13988,7 @@ pub mod session_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::session_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14017,7 +14021,7 @@ pub mod session_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14027,7 +14031,7 @@ pub mod session_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -14038,8 +14042,8 @@ pub mod session_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14053,7 +14057,7 @@ pub mod site_search_engine_service {
     /// A builder for [SiteSearchEngineService][crate::client::SiteSearchEngineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::site_search_engine_service::ClientBuilder;
     /// # use client::SiteSearchEngineService;
@@ -14063,19 +14067,18 @@ pub mod site_search_engine_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::SiteSearchEngineService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = SiteSearchEngineService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -14086,7 +14089,7 @@ pub mod site_search_engine_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::SiteSearchEngineService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -14099,7 +14102,7 @@ pub mod site_search_engine_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -14109,7 +14112,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::GetSiteSearchEngine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14140,7 +14143,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14150,7 +14153,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .get_site_search_engine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSiteSearchEngineRequest::name].
@@ -14163,8 +14166,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSiteSearchEngine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSiteSearchEngine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14174,7 +14177,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::CreateTargetSite;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14206,7 +14209,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14221,7 +14224,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .create_target_site(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_target_site`.
@@ -14240,7 +14243,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14299,8 +14302,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTargetSite {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTargetSite {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14310,7 +14313,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::BatchCreateTargetSites;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14342,7 +14345,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14357,7 +14360,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .batch_create_target_sites(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_create_target_sites`.
@@ -14376,7 +14379,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14426,8 +14429,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchCreateTargetSites {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchCreateTargetSites {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14437,7 +14440,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::GetTargetSite;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -14465,7 +14468,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14475,7 +14478,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .get_target_site(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTargetSiteRequest::name].
@@ -14488,8 +14491,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTargetSite {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTargetSite {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14499,7 +14502,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::UpdateTargetSite;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14531,7 +14534,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14546,7 +14549,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .update_target_site(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_target_site`.
@@ -14565,7 +14568,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14616,8 +14619,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTargetSite {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTargetSite {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14627,7 +14630,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::DeleteTargetSite;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14659,7 +14662,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14674,7 +14677,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .delete_target_site(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_target_site`.
@@ -14690,7 +14693,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14727,8 +14730,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTargetSite {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTargetSite {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14738,8 +14741,8 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::ListTargetSites;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -14770,7 +14773,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14780,14 +14783,16 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .list_target_sites(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTargetSitesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTargetSitesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -14795,15 +14800,17 @@ pub mod site_search_engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTargetSitesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTargetSitesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -14829,8 +14836,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTargetSites {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTargetSites {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14840,7 +14847,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::CreateSitemap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -14869,7 +14876,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -14884,7 +14891,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .create_sitemap(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_sitemap`.
@@ -14901,7 +14908,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -14960,8 +14967,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSitemap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSitemap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -14971,7 +14978,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::DeleteSitemap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15000,7 +15007,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15015,7 +15022,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .delete_sitemap(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_sitemap`.
@@ -15031,7 +15038,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15068,8 +15075,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSitemap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSitemap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15079,7 +15086,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::FetchSitemaps;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15107,7 +15114,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15117,7 +15124,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .fetch_sitemaps(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::FetchSitemapsRequest::parent].
@@ -15148,8 +15155,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchSitemaps {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchSitemaps {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15159,7 +15166,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::EnableAdvancedSiteSearch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15193,7 +15200,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15208,7 +15215,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .enable_advanced_site_search(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_advanced_site_search`.
@@ -15227,7 +15234,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15264,8 +15271,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnableAdvancedSiteSearch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnableAdvancedSiteSearch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15275,7 +15282,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::DisableAdvancedSiteSearch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15309,7 +15316,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15324,7 +15331,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .disable_advanced_site_search(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_advanced_site_search`.
@@ -15343,7 +15350,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15380,8 +15387,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisableAdvancedSiteSearch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisableAdvancedSiteSearch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15391,7 +15398,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::RecrawlUris;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15420,7 +15427,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15435,7 +15442,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .recrawl_uris(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `recrawl_uris`.
@@ -15454,7 +15461,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15510,8 +15517,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RecrawlUris {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RecrawlUris {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15521,7 +15528,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::BatchVerifyTargetSites;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -15553,7 +15560,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15568,7 +15575,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .batch_verify_target_sites(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_verify_target_sites`.
@@ -15587,7 +15594,7 @@ pub mod site_search_engine_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -15624,8 +15631,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchVerifyTargetSites {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchVerifyTargetSites {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15635,8 +15642,8 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::FetchDomainVerificationStatus;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15672,7 +15679,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15682,15 +15689,15 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .fetch_domain_verification_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::FetchDomainVerificationStatusResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15699,17 +15706,17 @@ pub mod site_search_engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::FetchDomainVerificationStatusResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15735,8 +15742,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchDomainVerificationStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchDomainVerificationStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15746,8 +15753,8 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -15783,7 +15790,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15793,15 +15800,15 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -15810,17 +15817,17 @@ pub mod site_search_engine_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -15856,8 +15863,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15867,7 +15874,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15898,7 +15905,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15908,7 +15915,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -15919,8 +15926,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15930,7 +15937,7 @@ pub mod site_search_engine_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::site_search_engine_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -15963,7 +15970,7 @@ pub mod site_search_engine_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -15973,7 +15980,7 @@ pub mod site_search_engine_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -15984,8 +15991,8 @@ pub mod site_search_engine_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -15999,7 +16006,7 @@ pub mod user_event_service {
     /// A builder for [UserEventService][crate::client::UserEventService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::user_event_service::ClientBuilder;
     /// # use client::UserEventService;
@@ -16009,19 +16016,18 @@ pub mod user_event_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::UserEventService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = UserEventService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -16032,7 +16038,7 @@ pub mod user_event_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::UserEventService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -16045,7 +16051,7 @@ pub mod user_event_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -16055,7 +16061,7 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::WriteUserEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16083,7 +16089,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16093,7 +16099,7 @@ pub mod user_event_service {
             (*self.0.stub)
                 .write_user_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::WriteUserEventRequest::parent].
@@ -16134,8 +16140,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for WriteUserEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for WriteUserEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16145,7 +16151,7 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::CollectUserEvent;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16176,7 +16182,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16186,7 +16192,7 @@ pub mod user_event_service {
             (*self.0.stub)
                 .collect_user_event(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CollectUserEventRequest::parent].
@@ -16243,8 +16249,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CollectUserEvent {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CollectUserEvent {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16254,7 +16260,7 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::PurgeUserEvents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16283,7 +16289,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16298,7 +16304,7 @@ pub mod user_event_service {
             (*self.0.stub)
                 .purge_user_events(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `purge_user_events`.
@@ -16317,7 +16323,7 @@ pub mod user_event_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16368,8 +16374,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PurgeUserEvents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PurgeUserEvents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16379,7 +16385,7 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::ImportUserEvents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -16411,7 +16417,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16426,7 +16432,7 @@ pub mod user_event_service {
             (*self.0.stub)
                 .import_user_events(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_user_events`.
@@ -16445,7 +16451,7 @@ pub mod user_event_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -16557,8 +16563,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportUserEvents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportUserEvents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16568,8 +16574,8 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16605,7 +16611,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16615,15 +16621,15 @@ pub mod user_event_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -16632,17 +16638,17 @@ pub mod user_event_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16678,8 +16684,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16689,7 +16695,7 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16720,7 +16726,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16730,7 +16736,7 @@ pub mod user_event_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -16741,8 +16747,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16752,7 +16758,7 @@ pub mod user_event_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_event_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -16785,7 +16791,7 @@ pub mod user_event_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16795,7 +16801,7 @@ pub mod user_event_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -16806,8 +16812,8 @@ pub mod user_event_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16821,7 +16827,7 @@ pub mod user_license_service {
     /// A builder for [UserLicenseService][crate::client::UserLicenseService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::*;
     /// # use builder::user_license_service::ClientBuilder;
     /// # use client::UserLicenseService;
@@ -16831,19 +16837,18 @@ pub mod user_license_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::UserLicenseService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = UserLicenseService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -16854,7 +16859,7 @@ pub mod user_license_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::UserLicenseService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -16867,7 +16872,7 @@ pub mod user_license_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -16877,8 +16882,8 @@ pub mod user_license_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_license_service::ListUserLicenses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -16912,7 +16917,7 @@ pub mod user_license_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -16922,14 +16927,16 @@ pub mod user_license_service {
             (*self.0.stub)
                 .list_user_licenses(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListUserLicensesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListUserLicensesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -16937,15 +16944,17 @@ pub mod user_license_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListUserLicensesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListUserLicensesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -16977,8 +16986,8 @@ pub mod user_license_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListUserLicenses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListUserLicenses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -16988,7 +16997,7 @@ pub mod user_license_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_license_service::BatchUpdateUserLicenses;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -17022,7 +17031,7 @@ pub mod user_license_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17037,7 +17046,7 @@ pub mod user_license_service {
             (*self.0.stub)
                 .batch_update_user_licenses(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_update_user_licenses`.
@@ -17056,7 +17065,7 @@ pub mod user_license_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -17130,8 +17139,8 @@ pub mod user_license_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchUpdateUserLicenses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchUpdateUserLicenses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17141,8 +17150,8 @@ pub mod user_license_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_license_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -17178,7 +17187,7 @@ pub mod user_license_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17188,15 +17197,15 @@ pub mod user_license_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -17205,17 +17214,17 @@ pub mod user_license_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -17251,8 +17260,8 @@ pub mod user_license_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17262,7 +17271,7 @@ pub mod user_license_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_license_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17293,7 +17302,7 @@ pub mod user_license_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17303,7 +17312,7 @@ pub mod user_license_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -17314,8 +17323,8 @@ pub mod user_license_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -17325,7 +17334,7 @@ pub mod user_license_service {
     /// # Example
     /// ```
     /// # use google_cloud_discoveryengine_v1::builder::user_license_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_discoveryengine_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -17358,7 +17367,7 @@ pub mod user_license_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -17368,7 +17377,7 @@ pub mod user_license_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -17379,8 +17388,8 @@ pub mod user_license_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/discoveryengine/v1/src/client.rs b/src/generated/cloud/discoveryengine/v1/src/client.rs
index 4442e62935..cbd8ce04ee 100644
--- a/src/generated/cloud/discoveryengine/v1/src/client.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::AssistantService;
 /// let client = AssistantService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -69,15 +69,13 @@ impl AssistantService {
     /// Returns a builder for [AssistantService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::AssistantService;
     /// let client = AssistantService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::assistant_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::assistant_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::assistant_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,14 +93,14 @@ impl AssistantService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AssistantService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AssistantService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -112,13 +110,13 @@ impl AssistantService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AssistantService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AssistantService> {
         super::transport::AssistantService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AssistantService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AssistantService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AssistantService::new)
@@ -150,7 +148,7 @@ impl AssistantService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::CmekConfigService;
 /// let client = CmekConfigService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -199,15 +197,13 @@ impl CmekConfigService {
     /// Returns a builder for [CmekConfigService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::CmekConfigService;
     /// let client = CmekConfigService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cmek_config_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cmek_config_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cmek_config_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -225,14 +221,14 @@ impl CmekConfigService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CmekConfigService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CmekConfigService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -242,13 +238,13 @@ impl CmekConfigService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CmekConfigService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CmekConfigService> {
         super::transport::CmekConfigService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CmekConfigService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CmekConfigService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CmekConfigService::new)
@@ -328,7 +324,7 @@ impl CmekConfigService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::CompletionService;
 /// let client = CompletionService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -377,15 +373,13 @@ impl CompletionService {
     /// Returns a builder for [CompletionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::CompletionService;
     /// let client = CompletionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::completion_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::completion_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::completion_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -403,14 +397,14 @@ impl CompletionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CompletionService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CompletionService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -420,13 +414,13 @@ impl CompletionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CompletionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CompletionService> {
         super::transport::CompletionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CompletionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CompletionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CompletionService::new)
@@ -547,7 +541,7 @@ impl CompletionService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::ControlService;
 /// let client = ControlService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -599,13 +593,13 @@ impl ControlService {
     /// Returns a builder for [ControlService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::ControlService;
     /// let client = ControlService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::control_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::control_service::client::Factory)
+        crate::new_client_builder(super::builder::control_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -623,14 +617,14 @@ impl ControlService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ControlService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ControlService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -639,13 +633,13 @@ impl ControlService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ControlService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ControlService> {
         super::transport::ControlService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ControlService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ControlService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ControlService::new)
@@ -723,7 +717,7 @@ impl ControlService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::ConversationalSearchService;
 /// let client = ConversationalSearchService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -772,15 +766,13 @@ impl ConversationalSearchService {
     /// Returns a builder for [ConversationalSearchService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::ConversationalSearchService;
     /// let client = ConversationalSearchService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::conversational_search_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::conversational_search_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::conversational_search_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -798,14 +790,14 @@ impl ConversationalSearchService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::ConversationalSearchService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -816,13 +808,13 @@ impl ConversationalSearchService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationalSearchService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationalSearchService> {
         super::transport::ConversationalSearchService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ConversationalSearchService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ConversationalSearchService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ConversationalSearchService::new)
@@ -972,7 +964,7 @@ impl ConversationalSearchService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::DataStoreService;
 /// let client = DataStoreService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -1024,15 +1016,13 @@ impl DataStoreService {
     /// Returns a builder for [DataStoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::DataStoreService;
     /// let client = DataStoreService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_store_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_store_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_store_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1050,14 +1040,14 @@ impl DataStoreService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataStoreService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataStoreService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1067,13 +1057,13 @@ impl DataStoreService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataStoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataStoreService> {
         super::transport::DataStoreService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataStoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataStoreService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataStoreService::new)
@@ -1169,7 +1159,7 @@ impl DataStoreService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::DocumentService;
 /// let client = DocumentService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -1221,15 +1211,13 @@ impl DocumentService {
     /// Returns a builder for [DocumentService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::DocumentService;
     /// let client = DocumentService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::document_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::document_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::document_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1247,15 +1235,14 @@ impl DocumentService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DocumentService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DocumentService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1264,13 +1251,13 @@ impl DocumentService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DocumentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DocumentService> {
         super::transport::DocumentService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DocumentService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DocumentService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DocumentService::new)
@@ -1406,7 +1393,7 @@ impl DocumentService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::EngineService;
 /// let client = EngineService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -1458,13 +1445,13 @@ impl EngineService {
     /// Returns a builder for [EngineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::EngineService;
     /// let client = EngineService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::engine_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::engine_service::client::Factory)
+        crate::new_client_builder(super::builder::engine_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1482,14 +1469,14 @@ impl EngineService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EngineService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EngineService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -1498,13 +1485,13 @@ impl EngineService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EngineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EngineService> {
         super::transport::EngineService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EngineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EngineService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EngineService::new)
@@ -1592,7 +1579,7 @@ impl EngineService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::GroundedGenerationService;
 /// let client = GroundedGenerationService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -1641,15 +1628,13 @@ impl GroundedGenerationService {
     /// Returns a builder for [GroundedGenerationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::GroundedGenerationService;
     /// let client = GroundedGenerationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::grounded_generation_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::grounded_generation_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::grounded_generation_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1667,14 +1652,14 @@ impl GroundedGenerationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::GroundedGenerationService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1685,13 +1670,13 @@ impl GroundedGenerationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GroundedGenerationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GroundedGenerationService> {
         super::transport::GroundedGenerationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GroundedGenerationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GroundedGenerationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GroundedGenerationService::new)
@@ -1737,7 +1722,7 @@ impl GroundedGenerationService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::IdentityMappingStoreService;
 /// let client = IdentityMappingStoreService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -1786,15 +1771,13 @@ impl IdentityMappingStoreService {
     /// Returns a builder for [IdentityMappingStoreService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::IdentityMappingStoreService;
     /// let client = IdentityMappingStoreService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::identity_mapping_store_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::identity_mapping_store_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::identity_mapping_store_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1812,14 +1795,14 @@ impl IdentityMappingStoreService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::IdentityMappingStoreService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1830,13 +1813,13 @@ impl IdentityMappingStoreService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IdentityMappingStoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IdentityMappingStoreService> {
         super::transport::IdentityMappingStoreService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IdentityMappingStoreService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IdentityMappingStoreService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::IdentityMappingStoreService::new)
@@ -1966,7 +1949,7 @@ impl IdentityMappingStoreService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::ProjectService;
 /// let client = ProjectService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2018,13 +2001,13 @@ impl ProjectService {
     /// Returns a builder for [ProjectService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::ProjectService;
     /// let client = ProjectService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::project_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::project_service::client::Factory)
+        crate::new_client_builder(super::builder::project_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2042,14 +2025,14 @@ impl ProjectService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ProjectService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ProjectService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2058,13 +2041,13 @@ impl ProjectService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ProjectService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ProjectService> {
         super::transport::ProjectService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ProjectService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ProjectService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ProjectService::new)
@@ -2116,7 +2099,7 @@ impl ProjectService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::RankService;
 /// let client = RankService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2165,13 +2148,13 @@ impl RankService {
     /// Returns a builder for [RankService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::RankService;
     /// let client = RankService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::rank_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::rank_service::client::Factory)
+        crate::new_client_builder(super::builder::rank_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2189,14 +2172,14 @@ impl RankService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RankService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RankService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2205,13 +2188,13 @@ impl RankService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RankService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RankService> {
         super::transport::RankService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RankService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RankService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RankService::new)
@@ -2248,7 +2231,7 @@ impl RankService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::RecommendationService;
 /// let client = RecommendationService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2297,15 +2280,13 @@ impl RecommendationService {
     /// Returns a builder for [RecommendationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::RecommendationService;
     /// let client = RecommendationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::recommendation_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::recommendation_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::recommendation_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2323,14 +2304,14 @@ impl RecommendationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::RecommendationService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::RecommendationService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2340,13 +2321,13 @@ impl RecommendationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RecommendationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RecommendationService> {
         super::transport::RecommendationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::RecommendationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::RecommendationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::RecommendationService::new)
@@ -2383,7 +2364,7 @@ impl RecommendationService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::SchemaService;
 /// let client = SchemaService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2434,13 +2415,13 @@ impl SchemaService {
     /// Returns a builder for [SchemaService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::SchemaService;
     /// let client = SchemaService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::schema_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::schema_service::client::Factory)
+        crate::new_client_builder(super::builder::schema_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2458,14 +2439,14 @@ impl SchemaService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SchemaService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SchemaService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2474,13 +2455,13 @@ impl SchemaService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SchemaService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SchemaService> {
         super::transport::SchemaService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SchemaService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SchemaService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SchemaService::new)
@@ -2577,7 +2558,7 @@ impl SchemaService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::SearchService;
 /// let client = SearchService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2626,13 +2607,13 @@ impl SearchService {
     /// Returns a builder for [SearchService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::SearchService;
     /// let client = SearchService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::search_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::search_service::client::Factory)
+        crate::new_client_builder(super::builder::search_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2650,14 +2631,14 @@ impl SearchService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SearchService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SearchService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -2666,13 +2647,13 @@ impl SearchService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SearchService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SearchService> {
         super::transport::SearchService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SearchService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SearchService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SearchService::new)
@@ -2728,7 +2709,7 @@ impl SearchService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::SearchTuningService;
 /// let client = SearchTuningService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2777,15 +2758,13 @@ impl SearchTuningService {
     /// Returns a builder for [SearchTuningService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::SearchTuningService;
     /// let client = SearchTuningService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::search_tuning_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::search_tuning_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::search_tuning_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2803,14 +2782,14 @@ impl SearchTuningService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SearchTuningService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SearchTuningService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2820,13 +2799,13 @@ impl SearchTuningService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SearchTuningService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SearchTuningService> {
         super::transport::SearchTuningService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SearchTuningService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SearchTuningService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SearchTuningService::new)
@@ -2878,7 +2857,7 @@ impl SearchTuningService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::ServingConfigService;
 /// let client = ServingConfigService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -2930,15 +2909,13 @@ impl ServingConfigService {
     /// Returns a builder for [ServingConfigService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::ServingConfigService;
     /// let client = ServingConfigService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::serving_config_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::serving_config_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::serving_config_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -2956,14 +2933,14 @@ impl ServingConfigService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ServingConfigService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ServingConfigService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -2973,13 +2950,13 @@ impl ServingConfigService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServingConfigService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServingConfigService> {
         super::transport::ServingConfigService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ServingConfigService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ServingConfigService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ServingConfigService::new)
@@ -3020,7 +2997,7 @@ impl ServingConfigService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::SessionService;
 /// let client = SessionService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -3069,13 +3046,13 @@ impl SessionService {
     /// Returns a builder for [SessionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::SessionService;
     /// let client = SessionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::session_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::session_service::client::Factory)
+        crate::new_client_builder(super::builder::session_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3093,14 +3070,14 @@ impl SessionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::SessionService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SessionService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3109,13 +3086,13 @@ impl SessionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionService> {
         super::transport::SessionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SessionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SessionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SessionService::new)
@@ -3191,7 +3168,7 @@ impl SessionService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::SiteSearchEngineService;
 /// let client = SiteSearchEngineService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -3240,15 +3217,13 @@ impl SiteSearchEngineService {
     /// Returns a builder for [SiteSearchEngineService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::SiteSearchEngineService;
     /// let client = SiteSearchEngineService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::site_search_engine_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::site_search_engine_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::site_search_engine_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3266,16 +3241,15 @@ impl SiteSearchEngineService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
-        std::sync::Arc<dyn super::stub::dynamic::SiteSearchEngineService>,
-    > {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::SiteSearchEngineService>>
+    {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -3284,13 +3258,13 @@ impl SiteSearchEngineService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SiteSearchEngineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SiteSearchEngineService> {
         super::transport::SiteSearchEngineService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::SiteSearchEngineService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::SiteSearchEngineService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::SiteSearchEngineService::new)
@@ -3549,7 +3523,7 @@ impl SiteSearchEngineService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::UserEventService;
 /// let client = UserEventService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -3598,15 +3572,13 @@ impl UserEventService {
     /// Returns a builder for [UserEventService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::UserEventService;
     /// let client = UserEventService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::user_event_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::user_event_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::user_event_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3624,14 +3596,14 @@ impl UserEventService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::UserEventService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::UserEventService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3641,13 +3613,13 @@ impl UserEventService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::UserEventService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::UserEventService> {
         super::transport::UserEventService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::UserEventService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::UserEventService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::UserEventService::new)
@@ -3732,7 +3704,7 @@ impl UserEventService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_discoveryengine_v1::client::UserLicenseService;
 /// let client = UserLicenseService::builder().build().await?;
 /// // use `client` to make requests to the Discovery Engine API.
@@ -3781,15 +3753,13 @@ impl UserLicenseService {
     /// Returns a builder for [UserLicenseService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_discoveryengine_v1::client::UserLicenseService;
     /// let client = UserLicenseService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::user_license_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::user_license_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::user_license_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -3807,14 +3777,14 @@ impl UserLicenseService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::UserLicenseService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::UserLicenseService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -3824,13 +3794,13 @@ impl UserLicenseService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::UserLicenseService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::UserLicenseService> {
         super::transport::UserLicenseService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::UserLicenseService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::UserLicenseService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::UserLicenseService::new)
diff --git a/src/generated/cloud/discoveryengine/v1/src/lib.rs b/src/generated/cloud/discoveryengine/v1/src/lib.rs
index d6fa0fb377..6185338df9 100644
--- a/src/generated/cloud/discoveryengine/v1/src/lib.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/lib.rs
@@ -76,8 +76,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -158,3 +158,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/discoveryengine/v1/src/model.rs b/src/generated/cloud/discoveryengine/v1/src/model.rs
index dbf7e51762..27b693fbfb 100644
--- a/src/generated/cloud/discoveryengine/v1/src/model.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate google_cloud_rpc;
@@ -11723,7 +11723,7 @@ impl wkt::message::Message for ListControlsResponse {
 
 #[cfg(feature = "control-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListControlsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListControlsResponse {
     type PageItem = crate::model::Control;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13267,7 +13267,7 @@ impl wkt::message::Message for ListConversationsResponse {
 
 #[cfg(feature = "conversational-search-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConversationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConversationsResponse {
     type PageItem = crate::model::Conversation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17238,7 +17238,7 @@ impl wkt::message::Message for ListSessionsResponse {
 
 #[cfg(any(feature = "conversational-search-service", feature = "session-service",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSessionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSessionsResponse {
     type PageItem = crate::model::Session;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -19540,7 +19540,7 @@ impl wkt::message::Message for ListDataStoresResponse {
 
 #[cfg(feature = "data-store-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDataStoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDataStoresResponse {
     type PageItem = crate::model::DataStore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -21780,7 +21780,7 @@ impl wkt::message::Message for ListDocumentsResponse {
 
 #[cfg(feature = "document-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDocumentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDocumentsResponse {
     type PageItem = crate::model::Document;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -25120,7 +25120,7 @@ impl wkt::message::Message for ListEnginesResponse {
 
 #[cfg(feature = "engine-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEnginesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEnginesResponse {
     type PageItem = crate::model::Engine;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -30140,7 +30140,7 @@ impl wkt::message::Message for ListIdentityMappingsResponse {
 
 #[cfg(feature = "identity-mapping-store-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIdentityMappingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIdentityMappingsResponse {
     type PageItem = crate::model::IdentityMappingEntry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -30300,7 +30300,7 @@ impl wkt::message::Message for ListIdentityMappingStoresResponse {
 
 #[cfg(feature = "identity-mapping-store-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIdentityMappingStoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListIdentityMappingStoresResponse {
     type PageItem = crate::model::IdentityMappingStore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -38343,7 +38343,7 @@ impl wkt::message::Message for ListSchemasResponse {
 
 #[cfg(feature = "schema-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSchemasResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSchemasResponse {
     type PageItem = crate::model::Schema;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -44639,7 +44639,7 @@ impl wkt::message::Message for SearchResponse {
 
 #[cfg(any(feature = "conversational-search-service", feature = "search-service",))]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchResponse {
     type PageItem = crate::model::search_response::SearchResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -50840,7 +50840,7 @@ impl wkt::message::Message for ListTargetSitesResponse {
 
 #[cfg(feature = "site-search-engine-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTargetSitesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTargetSitesResponse {
     type PageItem = crate::model::TargetSite;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -53122,7 +53122,9 @@ impl wkt::message::Message for FetchDomainVerificationStatusResponse {
 
 #[cfg(feature = "site-search-engine-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FetchDomainVerificationStatusResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for FetchDomainVerificationStatusResponse
+{
     type PageItem = crate::model::TargetSite;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -55817,7 +55819,7 @@ impl wkt::message::Message for ListUserLicensesResponse {
 
 #[cfg(feature = "user-license-service")]
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListUserLicensesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListUserLicensesResponse {
     type PageItem = crate::model::UserLicense;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/discoveryengine/v1/src/stub.rs b/src/generated/cloud/discoveryengine/v1/src/stub.rs
index 91df081d58..453c526b96 100644
--- a/src/generated/cloud/discoveryengine/v1/src/stub.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/stub.rs
@@ -44,10 +44,10 @@ pub trait AssistantService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -57,9 +57,9 @@ pub trait AssistantService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -68,8 +68,8 @@ pub trait AssistantService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -92,9 +92,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn update_cmek_config(
         &self,
         _req: crate::model::UpdateCmekConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -103,10 +103,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn get_cmek_config(
         &self,
         _req: crate::model::GetCmekConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CmekConfig>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CmekConfig>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -114,9 +113,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn list_cmek_configs(
         &self,
         _req: crate::model::ListCmekConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCmekConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCmekConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -125,9 +124,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn delete_cmek_config(
         &self,
         _req: crate::model::DeleteCmekConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -136,10 +135,10 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -149,9 +148,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -160,8 +159,8 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -171,9 +170,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -182,9 +181,9 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -206,9 +205,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn complete_query(
         &self,
         _req: crate::model::CompleteQueryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CompleteQueryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CompleteQueryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -217,9 +216,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn import_suggestion_deny_list_entries(
         &self,
         _req: crate::model::ImportSuggestionDenyListEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -228,9 +227,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn purge_suggestion_deny_list_entries(
         &self,
         _req: crate::model::PurgeSuggestionDenyListEntriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -239,9 +238,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn import_completion_suggestions(
         &self,
         _req: crate::model::ImportCompletionSuggestionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -250,9 +249,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn purge_completion_suggestions(
         &self,
         _req: crate::model::PurgeCompletionSuggestionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -261,10 +260,10 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -274,9 +273,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -285,8 +284,8 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -296,9 +295,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -307,9 +306,9 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -331,10 +330,9 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn create_control(
         &self,
         _req: crate::model::CreateControlRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Control>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Control>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -342,8 +340,8 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn delete_control(
         &self,
         _req: crate::model::DeleteControlRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -351,10 +349,9 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn update_control(
         &self,
         _req: crate::model::UpdateControlRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Control>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Control>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -362,10 +359,9 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn get_control(
         &self,
         _req: crate::model::GetControlRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Control>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Control>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -373,9 +369,9 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn list_controls(
         &self,
         _req: crate::model::ListControlsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListControlsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListControlsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -384,10 +380,10 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -397,9 +393,9 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -408,8 +404,8 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -432,9 +428,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn converse_conversation(
         &self,
         _req: crate::model::ConverseConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConverseConversationResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ConverseConversationResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -443,9 +439,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn create_conversation(
         &self,
         _req: crate::model::CreateConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -454,8 +450,8 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn delete_conversation(
         &self,
         _req: crate::model::DeleteConversationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -463,9 +459,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn update_conversation(
         &self,
         _req: crate::model::UpdateConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -474,9 +470,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn get_conversation(
         &self,
         _req: crate::model::GetConversationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Conversation>>,
+        Output = crate::Result<crate::Response<crate::model::Conversation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -485,9 +481,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn list_conversations(
         &self,
         _req: crate::model::ListConversationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConversationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConversationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -496,9 +492,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn answer_query(
         &self,
         _req: crate::model::AnswerQueryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnswerQueryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnswerQueryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -507,10 +503,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn get_answer(
         &self,
         _req: crate::model::GetAnswerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Answer>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Answer>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -518,10 +513,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn create_session(
         &self,
         _req: crate::model::CreateSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -529,8 +523,8 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn delete_session(
         &self,
         _req: crate::model::DeleteSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -538,10 +532,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn update_session(
         &self,
         _req: crate::model::UpdateSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -549,10 +542,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn get_session(
         &self,
         _req: crate::model::GetSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -560,9 +552,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn list_sessions(
         &self,
         _req: crate::model::ListSessionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSessionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -571,10 +563,10 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -584,9 +576,9 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -595,8 +587,8 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -619,9 +611,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn create_data_store(
         &self,
         _req: crate::model::CreateDataStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -630,10 +622,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn get_data_store(
         &self,
         _req: crate::model::GetDataStoreRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataStore>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataStore>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -641,9 +632,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn list_data_stores(
         &self,
         _req: crate::model::ListDataStoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDataStoresResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDataStoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -652,9 +643,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn delete_data_store(
         &self,
         _req: crate::model::DeleteDataStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -663,10 +654,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn update_data_store(
         &self,
         _req: crate::model::UpdateDataStoreRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DataStore>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DataStore>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -674,10 +664,10 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -687,9 +677,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -698,8 +688,8 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -709,9 +699,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -720,9 +710,9 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -744,10 +734,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn get_document(
         &self,
         _req: crate::model::GetDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -755,9 +744,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn list_documents(
         &self,
         _req: crate::model::ListDocumentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDocumentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -766,10 +755,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn create_document(
         &self,
         _req: crate::model::CreateDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -777,10 +765,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn update_document(
         &self,
         _req: crate::model::UpdateDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Document>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Document>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -788,8 +775,8 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn delete_document(
         &self,
         _req: crate::model::DeleteDocumentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -797,9 +784,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn import_documents(
         &self,
         _req: crate::model::ImportDocumentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -808,9 +795,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn purge_documents(
         &self,
         _req: crate::model::PurgeDocumentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -819,11 +806,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn batch_get_documents_metadata(
         &self,
         _req: crate::model::BatchGetDocumentsMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::BatchGetDocumentsMetadataResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::BatchGetDocumentsMetadataResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -832,10 +817,10 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -845,9 +830,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -856,8 +841,8 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -867,9 +852,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -878,9 +863,9 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -902,9 +887,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn create_engine(
         &self,
         _req: crate::model::CreateEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -913,9 +898,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn delete_engine(
         &self,
         _req: crate::model::DeleteEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -924,10 +909,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn update_engine(
         &self,
         _req: crate::model::UpdateEngineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Engine>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Engine>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -935,10 +919,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn get_engine(
         &self,
         _req: crate::model::GetEngineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Engine>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Engine>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -946,9 +929,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn list_engines(
         &self,
         _req: crate::model::ListEnginesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEnginesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEnginesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -957,10 +940,10 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -970,9 +953,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -981,8 +964,8 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -992,9 +975,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1003,9 +986,9 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1027,11 +1010,9 @@ pub trait GroundedGenerationService: std::fmt::Debug + Send + Sync {
     fn generate_grounded_content(
         &self,
         _req: crate::model::GenerateGroundedContentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateGroundedContentResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateGroundedContentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1040,9 +1021,9 @@ pub trait GroundedGenerationService: std::fmt::Debug + Send + Sync {
     fn check_grounding(
         &self,
         _req: crate::model::CheckGroundingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CheckGroundingResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CheckGroundingResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1051,10 +1032,10 @@ pub trait GroundedGenerationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1064,9 +1045,9 @@ pub trait GroundedGenerationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1075,8 +1056,8 @@ pub trait GroundedGenerationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1099,9 +1080,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn create_identity_mapping_store(
         &self,
         _req: crate::model::CreateIdentityMappingStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IdentityMappingStore>>,
+        Output = crate::Result<crate::Response<crate::model::IdentityMappingStore>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1110,9 +1091,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn get_identity_mapping_store(
         &self,
         _req: crate::model::GetIdentityMappingStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IdentityMappingStore>>,
+        Output = crate::Result<crate::Response<crate::model::IdentityMappingStore>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1121,9 +1102,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn delete_identity_mapping_store(
         &self,
         _req: crate::model::DeleteIdentityMappingStoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1132,9 +1113,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn import_identity_mappings(
         &self,
         _req: crate::model::ImportIdentityMappingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1143,9 +1124,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn purge_identity_mappings(
         &self,
         _req: crate::model::PurgeIdentityMappingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1154,9 +1135,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn list_identity_mappings(
         &self,
         _req: crate::model::ListIdentityMappingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListIdentityMappingsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListIdentityMappingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1165,11 +1146,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn list_identity_mapping_stores(
         &self,
         _req: crate::model::ListIdentityMappingStoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListIdentityMappingStoresResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListIdentityMappingStoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1178,10 +1157,10 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1191,9 +1170,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1202,8 +1181,8 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1213,9 +1192,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1224,9 +1203,9 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1248,9 +1227,9 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     fn provision_project(
         &self,
         _req: crate::model::ProvisionProjectRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1259,10 +1238,10 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1272,9 +1251,9 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1283,8 +1262,8 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1294,9 +1273,9 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1305,9 +1284,9 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1329,9 +1308,9 @@ pub trait RankService: std::fmt::Debug + Send + Sync {
     fn rank(
         &self,
         _req: crate::model::RankRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RankResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RankResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1340,10 +1319,10 @@ pub trait RankService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1353,9 +1332,9 @@ pub trait RankService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1364,8 +1343,8 @@ pub trait RankService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1388,9 +1367,9 @@ pub trait RecommendationService: std::fmt::Debug + Send + Sync {
     fn recommend(
         &self,
         _req: crate::model::RecommendRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RecommendResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RecommendResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1399,10 +1378,10 @@ pub trait RecommendationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1412,9 +1391,9 @@ pub trait RecommendationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1423,8 +1402,8 @@ pub trait RecommendationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1447,10 +1426,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn get_schema(
         &self,
         _req: crate::model::GetSchemaRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Schema>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Schema>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1458,9 +1436,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn list_schemas(
         &self,
         _req: crate::model::ListSchemasRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSchemasResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSchemasResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1469,9 +1447,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn create_schema(
         &self,
         _req: crate::model::CreateSchemaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1480,9 +1458,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn update_schema(
         &self,
         _req: crate::model::UpdateSchemaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1491,9 +1469,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn delete_schema(
         &self,
         _req: crate::model::DeleteSchemaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1502,10 +1480,10 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1515,9 +1493,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1526,8 +1504,8 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1537,9 +1515,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1548,9 +1526,9 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1572,9 +1550,9 @@ pub trait SearchService: std::fmt::Debug + Send + Sync {
     fn search(
         &self,
         _req: crate::model::SearchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1583,9 +1561,9 @@ pub trait SearchService: std::fmt::Debug + Send + Sync {
     fn search_lite(
         &self,
         _req: crate::model::SearchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1594,10 +1572,10 @@ pub trait SearchService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1607,9 +1585,9 @@ pub trait SearchService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1618,8 +1596,8 @@ pub trait SearchService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1642,9 +1620,9 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     fn train_custom_model(
         &self,
         _req: crate::model::TrainCustomModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1653,9 +1631,9 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     fn list_custom_models(
         &self,
         _req: crate::model::ListCustomModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCustomModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCustomModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1664,10 +1642,10 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1677,9 +1655,9 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1688,8 +1666,8 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1699,9 +1677,9 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1710,9 +1688,9 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1734,9 +1712,9 @@ pub trait ServingConfigService: std::fmt::Debug + Send + Sync {
     fn update_serving_config(
         &self,
         _req: crate::model::UpdateServingConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServingConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ServingConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1745,10 +1723,10 @@ pub trait ServingConfigService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1758,9 +1736,9 @@ pub trait ServingConfigService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1769,8 +1747,8 @@ pub trait ServingConfigService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1793,10 +1771,9 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn create_session(
         &self,
         _req: crate::model::CreateSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1804,8 +1781,8 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn delete_session(
         &self,
         _req: crate::model::DeleteSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1813,10 +1790,9 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn update_session(
         &self,
         _req: crate::model::UpdateSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1824,10 +1800,9 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn get_session(
         &self,
         _req: crate::model::GetSessionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Session>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Session>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1835,9 +1810,9 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn list_sessions(
         &self,
         _req: crate::model::ListSessionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSessionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1846,10 +1821,10 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1859,9 +1834,9 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1870,8 +1845,8 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -1894,9 +1869,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn get_site_search_engine(
         &self,
         _req: crate::model::GetSiteSearchEngineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SiteSearchEngine>>,
+        Output = crate::Result<crate::Response<crate::model::SiteSearchEngine>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1905,9 +1880,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn create_target_site(
         &self,
         _req: crate::model::CreateTargetSiteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1916,9 +1891,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn batch_create_target_sites(
         &self,
         _req: crate::model::BatchCreateTargetSitesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1927,10 +1902,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn get_target_site(
         &self,
         _req: crate::model::GetTargetSiteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TargetSite>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::TargetSite>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1938,9 +1912,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn update_target_site(
         &self,
         _req: crate::model::UpdateTargetSiteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1949,9 +1923,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn delete_target_site(
         &self,
         _req: crate::model::DeleteTargetSiteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1960,9 +1934,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn list_target_sites(
         &self,
         _req: crate::model::ListTargetSitesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTargetSitesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTargetSitesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1971,9 +1945,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn create_sitemap(
         &self,
         _req: crate::model::CreateSitemapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1982,9 +1956,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn delete_sitemap(
         &self,
         _req: crate::model::DeleteSitemapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1993,9 +1967,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn fetch_sitemaps(
         &self,
         _req: crate::model::FetchSitemapsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchSitemapsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchSitemapsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2004,9 +1978,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn enable_advanced_site_search(
         &self,
         _req: crate::model::EnableAdvancedSiteSearchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2015,9 +1989,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn disable_advanced_site_search(
         &self,
         _req: crate::model::DisableAdvancedSiteSearchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2026,9 +2000,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn recrawl_uris(
         &self,
         _req: crate::model::RecrawlUrisRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2037,9 +2011,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn batch_verify_target_sites(
         &self,
         _req: crate::model::BatchVerifyTargetSitesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2048,10 +2022,10 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn fetch_domain_verification_status(
         &self,
         _req: crate::model::FetchDomainVerificationStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::FetchDomainVerificationStatusResponse>,
+            crate::Response<crate::model::FetchDomainVerificationStatusResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2061,10 +2035,10 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2074,9 +2048,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2085,8 +2059,8 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2096,9 +2070,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2107,9 +2081,9 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2131,10 +2105,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn write_user_event(
         &self,
         _req: crate::model::WriteUserEventRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::UserEvent>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::UserEvent>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2142,9 +2115,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn collect_user_event(
         &self,
         _req: crate::model::CollectUserEventRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2153,9 +2126,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn purge_user_events(
         &self,
         _req: crate::model::PurgeUserEventsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2164,9 +2137,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn import_user_events(
         &self,
         _req: crate::model::ImportUserEventsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2175,10 +2148,10 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2188,9 +2161,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2199,8 +2172,8 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2210,9 +2183,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2221,9 +2194,9 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -2245,9 +2218,9 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     fn list_user_licenses(
         &self,
         _req: crate::model::ListUserLicensesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListUserLicensesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListUserLicensesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2256,9 +2229,9 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     fn batch_update_user_licenses(
         &self,
         _req: crate::model::BatchUpdateUserLicensesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2267,10 +2240,10 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -2280,9 +2253,9 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -2291,8 +2264,8 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -2302,9 +2275,9 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -2313,8 +2286,8 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/discoveryengine/v1/src/stub/dynamic.rs b/src/generated/cloud/discoveryengine/v1/src/stub/dynamic.rs
index 92212ac5b9..118e8669be 100644
--- a/src/generated/cloud/discoveryengine/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/stub/dynamic.rs
@@ -21,22 +21,20 @@ pub trait AssistantService: std::fmt::Debug + Send + Sync {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::AssistantService] also implement [AssistantService].
@@ -47,10 +45,9 @@ impl<T: super::AssistantService> AssistantService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -58,8 +55,8 @@ impl<T: super::AssistantService> AssistantService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -67,8 +64,8 @@ impl<T: super::AssistantService> AssistantService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -80,56 +77,54 @@ pub trait CmekConfigService: std::fmt::Debug + Send + Sync {
     async fn update_cmek_config(
         &self,
         req: crate::model::UpdateCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_cmek_config(
         &self,
         req: crate::model::GetCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CmekConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CmekConfig>>;
 
     async fn list_cmek_configs(
         &self,
         req: crate::model::ListCmekConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCmekConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCmekConfigsResponse>>;
 
     async fn delete_cmek_config(
         &self,
         req: crate::model::DeleteCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CmekConfigService] also implement [CmekConfigService].
@@ -140,8 +135,8 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn update_cmek_config(
         &self,
         req: crate::model::UpdateCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_cmek_config(self, req, options).await
     }
 
@@ -149,8 +144,8 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn get_cmek_config(
         &self,
         req: crate::model::GetCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CmekConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CmekConfig>> {
         T::get_cmek_config(self, req, options).await
     }
 
@@ -158,8 +153,8 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn list_cmek_configs(
         &self,
         req: crate::model::ListCmekConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCmekConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCmekConfigsResponse>> {
         T::list_cmek_configs(self, req, options).await
     }
 
@@ -167,8 +162,8 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn delete_cmek_config(
         &self,
         req: crate::model::DeleteCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_cmek_config(self, req, options).await
     }
 
@@ -176,10 +171,9 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -187,8 +181,8 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -196,22 +190,22 @@ impl<T: super::CmekConfigService> CmekConfigService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -223,62 +217,60 @@ pub trait CompletionService: std::fmt::Debug + Send + Sync {
     async fn complete_query(
         &self,
         req: crate::model::CompleteQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompleteQueryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompleteQueryResponse>>;
 
     async fn import_suggestion_deny_list_entries(
         &self,
         req: crate::model::ImportSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_suggestion_deny_list_entries(
         &self,
         req: crate::model::PurgeSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_completion_suggestions(
         &self,
         req: crate::model::ImportCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_completion_suggestions(
         &self,
         req: crate::model::PurgeCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CompletionService] also implement [CompletionService].
@@ -289,8 +281,8 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn complete_query(
         &self,
         req: crate::model::CompleteQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CompleteQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CompleteQueryResponse>> {
         T::complete_query(self, req, options).await
     }
 
@@ -298,8 +290,8 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn import_suggestion_deny_list_entries(
         &self,
         req: crate::model::ImportSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_suggestion_deny_list_entries(self, req, options).await
     }
 
@@ -307,8 +299,8 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn purge_suggestion_deny_list_entries(
         &self,
         req: crate::model::PurgeSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_suggestion_deny_list_entries(self, req, options).await
     }
 
@@ -316,8 +308,8 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn import_completion_suggestions(
         &self,
         req: crate::model::ImportCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_completion_suggestions(self, req, options).await
     }
 
@@ -325,8 +317,8 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn purge_completion_suggestions(
         &self,
         req: crate::model::PurgeCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_completion_suggestions(self, req, options).await
     }
 
@@ -334,10 +326,9 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -345,8 +336,8 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -354,22 +345,22 @@ impl<T: super::CompletionService> CompletionService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -381,52 +372,50 @@ pub trait ControlService: std::fmt::Debug + Send + Sync {
     async fn create_control(
         &self,
         req: crate::model::CreateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Control>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Control>>;
 
     async fn delete_control(
         &self,
         req: crate::model::DeleteControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_control(
         &self,
         req: crate::model::UpdateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Control>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Control>>;
 
     async fn get_control(
         &self,
         req: crate::model::GetControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Control>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Control>>;
 
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListControlsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListControlsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ControlService] also implement [ControlService].
@@ -437,8 +426,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn create_control(
         &self,
         req: crate::model::CreateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Control>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Control>> {
         T::create_control(self, req, options).await
     }
 
@@ -446,8 +435,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn delete_control(
         &self,
         req: crate::model::DeleteControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_control(self, req, options).await
     }
 
@@ -455,8 +444,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn update_control(
         &self,
         req: crate::model::UpdateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Control>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Control>> {
         T::update_control(self, req, options).await
     }
 
@@ -464,8 +453,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn get_control(
         &self,
         req: crate::model::GetControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Control>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Control>> {
         T::get_control(self, req, options).await
     }
 
@@ -473,8 +462,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListControlsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListControlsResponse>> {
         T::list_controls(self, req, options).await
     }
 
@@ -482,10 +471,9 @@ impl<T: super::ControlService> ControlService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -493,8 +481,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -502,8 +490,8 @@ impl<T: super::ControlService> ControlService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -515,100 +503,98 @@ pub trait ConversationalSearchService: std::fmt::Debug + Send + Sync {
     async fn converse_conversation(
         &self,
         req: crate::model::ConverseConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConverseConversationResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConverseConversationResponse>>;
 
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>>;
 
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationsResponse>>;
 
     async fn answer_query(
         &self,
         req: crate::model::AnswerQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnswerQueryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnswerQueryResponse>>;
 
     async fn get_answer(
         &self,
         req: crate::model::GetAnswerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Answer>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Answer>>;
 
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ConversationalSearchService] also implement [ConversationalSearchService].
@@ -619,8 +605,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn converse_conversation(
         &self,
         req: crate::model::ConverseConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConverseConversationResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConverseConversationResponse>> {
         T::converse_conversation(self, req, options).await
     }
 
@@ -628,8 +614,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::create_conversation(self, req, options).await
     }
 
@@ -637,8 +623,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_conversation(self, req, options).await
     }
 
@@ -646,8 +632,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::update_conversation(self, req, options).await
     }
 
@@ -655,8 +641,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Conversation>> {
         T::get_conversation(self, req, options).await
     }
 
@@ -664,8 +650,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConversationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConversationsResponse>> {
         T::list_conversations(self, req, options).await
     }
 
@@ -673,8 +659,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn answer_query(
         &self,
         req: crate::model::AnswerQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnswerQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnswerQueryResponse>> {
         T::answer_query(self, req, options).await
     }
 
@@ -682,8 +668,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn get_answer(
         &self,
         req: crate::model::GetAnswerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Answer>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Answer>> {
         T::get_answer(self, req, options).await
     }
 
@@ -691,8 +677,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::create_session(self, req, options).await
     }
 
@@ -700,8 +686,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_session(self, req, options).await
     }
 
@@ -709,8 +695,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::update_session(self, req, options).await
     }
 
@@ -718,8 +704,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::get_session(self, req, options).await
     }
 
@@ -727,8 +713,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>> {
         T::list_sessions(self, req, options).await
     }
 
@@ -736,10 +722,9 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -747,8 +732,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -756,8 +741,8 @@ impl<T: super::ConversationalSearchService> ConversationalSearchService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -769,62 +754,60 @@ pub trait DataStoreService: std::fmt::Debug + Send + Sync {
     async fn create_data_store(
         &self,
         req: crate::model::CreateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_data_store(
         &self,
         req: crate::model::GetDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataStore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataStore>>;
 
     async fn list_data_stores(
         &self,
         req: crate::model::ListDataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataStoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataStoresResponse>>;
 
     async fn delete_data_store(
         &self,
         req: crate::model::DeleteDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_data_store(
         &self,
         req: crate::model::UpdateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataStore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataStore>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataStoreService] also implement [DataStoreService].
@@ -835,8 +818,8 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn create_data_store(
         &self,
         req: crate::model::CreateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_data_store(self, req, options).await
     }
 
@@ -844,8 +827,8 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn get_data_store(
         &self,
         req: crate::model::GetDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataStore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataStore>> {
         T::get_data_store(self, req, options).await
     }
 
@@ -853,8 +836,8 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn list_data_stores(
         &self,
         req: crate::model::ListDataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDataStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDataStoresResponse>> {
         T::list_data_stores(self, req, options).await
     }
 
@@ -862,8 +845,8 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn delete_data_store(
         &self,
         req: crate::model::DeleteDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_data_store(self, req, options).await
     }
 
@@ -871,8 +854,8 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn update_data_store(
         &self,
         req: crate::model::UpdateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DataStore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DataStore>> {
         T::update_data_store(self, req, options).await
     }
 
@@ -880,10 +863,9 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -891,8 +873,8 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -900,22 +882,22 @@ impl<T: super::DataStoreService> DataStoreService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -927,80 +909,78 @@ pub trait DocumentService: std::fmt::Debug + Send + Sync {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDocumentsResponse>>;
 
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>>;
 
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_documents(
         &self,
         req: crate::model::PurgeDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_get_documents_metadata(
         &self,
         req: crate::model::BatchGetDocumentsMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetDocumentsMetadataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetDocumentsMetadataResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DocumentService] also implement [DocumentService].
@@ -1011,8 +991,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::get_document(self, req, options).await
     }
 
@@ -1020,8 +1000,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDocumentsResponse>> {
         T::list_documents(self, req, options).await
     }
 
@@ -1029,8 +1009,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::create_document(self, req, options).await
     }
 
@@ -1038,8 +1018,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Document>> {
         T::update_document(self, req, options).await
     }
 
@@ -1047,8 +1027,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_document(self, req, options).await
     }
 
@@ -1056,8 +1036,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_documents(self, req, options).await
     }
 
@@ -1065,8 +1045,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn purge_documents(
         &self,
         req: crate::model::PurgeDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_documents(self, req, options).await
     }
 
@@ -1074,9 +1054,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn batch_get_documents_metadata(
         &self,
         req: crate::model::BatchGetDocumentsMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchGetDocumentsMetadataResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchGetDocumentsMetadataResponse>> {
         T::batch_get_documents_metadata(self, req, options).await
     }
 
@@ -1084,10 +1063,9 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1095,8 +1073,8 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1104,22 +1082,22 @@ impl<T: super::DocumentService> DocumentService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1131,62 +1109,60 @@ pub trait EngineService: std::fmt::Debug + Send + Sync {
     async fn create_engine(
         &self,
         req: crate::model::CreateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_engine(
         &self,
         req: crate::model::DeleteEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_engine(
         &self,
         req: crate::model::UpdateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Engine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Engine>>;
 
     async fn get_engine(
         &self,
         req: crate::model::GetEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Engine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Engine>>;
 
     async fn list_engines(
         &self,
         req: crate::model::ListEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnginesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnginesResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EngineService] also implement [EngineService].
@@ -1197,8 +1173,8 @@ impl<T: super::EngineService> EngineService for T {
     async fn create_engine(
         &self,
         req: crate::model::CreateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_engine(self, req, options).await
     }
 
@@ -1206,8 +1182,8 @@ impl<T: super::EngineService> EngineService for T {
     async fn delete_engine(
         &self,
         req: crate::model::DeleteEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_engine(self, req, options).await
     }
 
@@ -1215,8 +1191,8 @@ impl<T: super::EngineService> EngineService for T {
     async fn update_engine(
         &self,
         req: crate::model::UpdateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Engine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Engine>> {
         T::update_engine(self, req, options).await
     }
 
@@ -1224,8 +1200,8 @@ impl<T: super::EngineService> EngineService for T {
     async fn get_engine(
         &self,
         req: crate::model::GetEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Engine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Engine>> {
         T::get_engine(self, req, options).await
     }
 
@@ -1233,8 +1209,8 @@ impl<T: super::EngineService> EngineService for T {
     async fn list_engines(
         &self,
         req: crate::model::ListEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnginesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnginesResponse>> {
         T::list_engines(self, req, options).await
     }
 
@@ -1242,10 +1218,9 @@ impl<T: super::EngineService> EngineService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1253,8 +1228,8 @@ impl<T: super::EngineService> EngineService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1262,22 +1237,22 @@ impl<T: super::EngineService> EngineService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1289,34 +1264,32 @@ pub trait GroundedGenerationService: std::fmt::Debug + Send + Sync {
     async fn generate_grounded_content(
         &self,
         req: crate::model::GenerateGroundedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateGroundedContentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateGroundedContentResponse>>;
 
     async fn check_grounding(
         &self,
         req: crate::model::CheckGroundingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckGroundingResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckGroundingResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::GroundedGenerationService] also implement [GroundedGenerationService].
@@ -1327,8 +1300,8 @@ impl<T: super::GroundedGenerationService> GroundedGenerationService for T {
     async fn generate_grounded_content(
         &self,
         req: crate::model::GenerateGroundedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateGroundedContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateGroundedContentResponse>> {
         T::generate_grounded_content(self, req, options).await
     }
 
@@ -1336,8 +1309,8 @@ impl<T: super::GroundedGenerationService> GroundedGenerationService for T {
     async fn check_grounding(
         &self,
         req: crate::model::CheckGroundingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckGroundingResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckGroundingResponse>> {
         T::check_grounding(self, req, options).await
     }
 
@@ -1345,10 +1318,9 @@ impl<T: super::GroundedGenerationService> GroundedGenerationService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1356,8 +1328,8 @@ impl<T: super::GroundedGenerationService> GroundedGenerationService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1365,8 +1337,8 @@ impl<T: super::GroundedGenerationService> GroundedGenerationService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1378,74 +1350,72 @@ pub trait IdentityMappingStoreService: std::fmt::Debug + Send + Sync {
     async fn create_identity_mapping_store(
         &self,
         req: crate::model::CreateIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityMappingStore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityMappingStore>>;
 
     async fn get_identity_mapping_store(
         &self,
         req: crate::model::GetIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityMappingStore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityMappingStore>>;
 
     async fn delete_identity_mapping_store(
         &self,
         req: crate::model::DeleteIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_identity_mappings(
         &self,
         req: crate::model::ImportIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn purge_identity_mappings(
         &self,
         req: crate::model::PurgeIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_identity_mappings(
         &self,
         req: crate::model::ListIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIdentityMappingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIdentityMappingsResponse>>;
 
     async fn list_identity_mapping_stores(
         &self,
         req: crate::model::ListIdentityMappingStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIdentityMappingStoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIdentityMappingStoresResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::IdentityMappingStoreService] also implement [IdentityMappingStoreService].
@@ -1456,8 +1426,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn create_identity_mapping_store(
         &self,
         req: crate::model::CreateIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityMappingStore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityMappingStore>> {
         T::create_identity_mapping_store(self, req, options).await
     }
 
@@ -1465,8 +1435,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn get_identity_mapping_store(
         &self,
         req: crate::model::GetIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityMappingStore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityMappingStore>> {
         T::get_identity_mapping_store(self, req, options).await
     }
 
@@ -1474,8 +1444,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn delete_identity_mapping_store(
         &self,
         req: crate::model::DeleteIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_identity_mapping_store(self, req, options).await
     }
 
@@ -1483,8 +1453,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn import_identity_mappings(
         &self,
         req: crate::model::ImportIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_identity_mappings(self, req, options).await
     }
 
@@ -1492,8 +1462,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn purge_identity_mappings(
         &self,
         req: crate::model::PurgeIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_identity_mappings(self, req, options).await
     }
 
@@ -1501,8 +1471,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn list_identity_mappings(
         &self,
         req: crate::model::ListIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIdentityMappingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIdentityMappingsResponse>> {
         T::list_identity_mappings(self, req, options).await
     }
 
@@ -1510,9 +1480,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn list_identity_mapping_stores(
         &self,
         req: crate::model::ListIdentityMappingStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIdentityMappingStoresResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIdentityMappingStoresResponse>> {
         T::list_identity_mapping_stores(self, req, options).await
     }
 
@@ -1520,10 +1489,9 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1531,8 +1499,8 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1540,22 +1508,22 @@ impl<T: super::IdentityMappingStoreService> IdentityMappingStoreService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1567,38 +1535,36 @@ pub trait ProjectService: std::fmt::Debug + Send + Sync {
     async fn provision_project(
         &self,
         req: crate::model::ProvisionProjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ProjectService] also implement [ProjectService].
@@ -1609,8 +1575,8 @@ impl<T: super::ProjectService> ProjectService for T {
     async fn provision_project(
         &self,
         req: crate::model::ProvisionProjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::provision_project(self, req, options).await
     }
 
@@ -1618,10 +1584,9 @@ impl<T: super::ProjectService> ProjectService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1629,8 +1594,8 @@ impl<T: super::ProjectService> ProjectService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1638,22 +1603,22 @@ impl<T: super::ProjectService> ProjectService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1665,28 +1630,26 @@ pub trait RankService: std::fmt::Debug + Send + Sync {
     async fn rank(
         &self,
         req: crate::model::RankRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RankResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RankResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::RankService] also implement [RankService].
@@ -1697,8 +1660,8 @@ impl<T: super::RankService> RankService for T {
     async fn rank(
         &self,
         req: crate::model::RankRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RankResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RankResponse>> {
         T::rank(self, req, options).await
     }
 
@@ -1706,10 +1669,9 @@ impl<T: super::RankService> RankService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1717,8 +1679,8 @@ impl<T: super::RankService> RankService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1726,8 +1688,8 @@ impl<T: super::RankService> RankService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1739,28 +1701,26 @@ pub trait RecommendationService: std::fmt::Debug + Send + Sync {
     async fn recommend(
         &self,
         req: crate::model::RecommendRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RecommendResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RecommendResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::RecommendationService] also implement [RecommendationService].
@@ -1771,8 +1731,8 @@ impl<T: super::RecommendationService> RecommendationService for T {
     async fn recommend(
         &self,
         req: crate::model::RecommendRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RecommendResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RecommendResponse>> {
         T::recommend(self, req, options).await
     }
 
@@ -1780,10 +1740,9 @@ impl<T: super::RecommendationService> RecommendationService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1791,8 +1750,8 @@ impl<T: super::RecommendationService> RecommendationService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1800,8 +1759,8 @@ impl<T: super::RecommendationService> RecommendationService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -1813,62 +1772,60 @@ pub trait SchemaService: std::fmt::Debug + Send + Sync {
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schema>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schema>>;
 
     async fn list_schemas(
         &self,
         req: crate::model::ListSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchemasResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchemasResponse>>;
 
     async fn create_schema(
         &self,
         req: crate::model::CreateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_schema(
         &self,
         req: crate::model::UpdateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_schema(
         &self,
         req: crate::model::DeleteSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SchemaService] also implement [SchemaService].
@@ -1879,8 +1836,8 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schema>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schema>> {
         T::get_schema(self, req, options).await
     }
 
@@ -1888,8 +1845,8 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn list_schemas(
         &self,
         req: crate::model::ListSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchemasResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchemasResponse>> {
         T::list_schemas(self, req, options).await
     }
 
@@ -1897,8 +1854,8 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn create_schema(
         &self,
         req: crate::model::CreateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_schema(self, req, options).await
     }
 
@@ -1906,8 +1863,8 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn update_schema(
         &self,
         req: crate::model::UpdateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_schema(self, req, options).await
     }
 
@@ -1915,8 +1872,8 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn delete_schema(
         &self,
         req: crate::model::DeleteSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_schema(self, req, options).await
     }
 
@@ -1924,10 +1881,9 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1935,8 +1891,8 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1944,22 +1900,22 @@ impl<T: super::SchemaService> SchemaService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1971,34 +1927,32 @@ pub trait SearchService: std::fmt::Debug + Send + Sync {
     async fn search(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchResponse>>;
 
     async fn search_lite(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SearchService] also implement [SearchService].
@@ -2009,8 +1963,8 @@ impl<T: super::SearchService> SearchService for T {
     async fn search(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchResponse>> {
         T::search(self, req, options).await
     }
 
@@ -2018,8 +1972,8 @@ impl<T: super::SearchService> SearchService for T {
     async fn search_lite(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchResponse>> {
         T::search_lite(self, req, options).await
     }
 
@@ -2027,10 +1981,9 @@ impl<T: super::SearchService> SearchService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2038,8 +1991,8 @@ impl<T: super::SearchService> SearchService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2047,8 +2000,8 @@ impl<T: super::SearchService> SearchService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2060,44 +2013,42 @@ pub trait SearchTuningService: std::fmt::Debug + Send + Sync {
     async fn train_custom_model(
         &self,
         req: crate::model::TrainCustomModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_custom_models(
         &self,
         req: crate::model::ListCustomModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomModelsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SearchTuningService] also implement [SearchTuningService].
@@ -2108,8 +2059,8 @@ impl<T: super::SearchTuningService> SearchTuningService for T {
     async fn train_custom_model(
         &self,
         req: crate::model::TrainCustomModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::train_custom_model(self, req, options).await
     }
 
@@ -2117,8 +2068,8 @@ impl<T: super::SearchTuningService> SearchTuningService for T {
     async fn list_custom_models(
         &self,
         req: crate::model::ListCustomModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCustomModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCustomModelsResponse>> {
         T::list_custom_models(self, req, options).await
     }
 
@@ -2126,10 +2077,9 @@ impl<T: super::SearchTuningService> SearchTuningService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2137,8 +2087,8 @@ impl<T: super::SearchTuningService> SearchTuningService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2146,22 +2096,22 @@ impl<T: super::SearchTuningService> SearchTuningService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2173,28 +2123,26 @@ pub trait ServingConfigService: std::fmt::Debug + Send + Sync {
     async fn update_serving_config(
         &self,
         req: crate::model::UpdateServingConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServingConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServingConfig>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ServingConfigService] also implement [ServingConfigService].
@@ -2205,8 +2153,8 @@ impl<T: super::ServingConfigService> ServingConfigService for T {
     async fn update_serving_config(
         &self,
         req: crate::model::UpdateServingConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServingConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServingConfig>> {
         T::update_serving_config(self, req, options).await
     }
 
@@ -2214,10 +2162,9 @@ impl<T: super::ServingConfigService> ServingConfigService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2225,8 +2172,8 @@ impl<T: super::ServingConfigService> ServingConfigService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2234,8 +2181,8 @@ impl<T: super::ServingConfigService> ServingConfigService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2247,52 +2194,50 @@ pub trait SessionService: std::fmt::Debug + Send + Sync {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>>;
 
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::SessionService] also implement [SessionService].
@@ -2303,8 +2248,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::create_session(self, req, options).await
     }
 
@@ -2312,8 +2257,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_session(self, req, options).await
     }
 
@@ -2321,8 +2266,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::update_session(self, req, options).await
     }
 
@@ -2330,8 +2275,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Session>> {
         T::get_session(self, req, options).await
     }
 
@@ -2339,8 +2284,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSessionsResponse>> {
         T::list_sessions(self, req, options).await
     }
 
@@ -2348,10 +2293,9 @@ impl<T: super::SessionService> SessionService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2359,8 +2303,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2368,8 +2312,8 @@ impl<T: super::SessionService> SessionService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
@@ -2381,122 +2325,120 @@ pub trait SiteSearchEngineService: std::fmt::Debug + Send + Sync {
     async fn get_site_search_engine(
         &self,
         req: crate::model::GetSiteSearchEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SiteSearchEngine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SiteSearchEngine>>;
 
     async fn create_target_site(
         &self,
         req: crate::model::CreateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_create_target_sites(
         &self,
         req: crate::model::BatchCreateTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_target_site(
         &self,
         req: crate::model::GetTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetSite>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetSite>>;
 
     async fn update_target_site(
         &self,
         req: crate::model::UpdateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_target_site(
         &self,
         req: crate::model::DeleteTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_target_sites(
         &self,
         req: crate::model::ListTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTargetSitesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTargetSitesResponse>>;
 
     async fn create_sitemap(
         &self,
         req: crate::model::CreateSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_sitemap(
         &self,
         req: crate::model::DeleteSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn fetch_sitemaps(
         &self,
         req: crate::model::FetchSitemapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchSitemapsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchSitemapsResponse>>;
 
     async fn enable_advanced_site_search(
         &self,
         req: crate::model::EnableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn disable_advanced_site_search(
         &self,
         req: crate::model::DisableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn recrawl_uris(
         &self,
         req: crate::model::RecrawlUrisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn batch_verify_target_sites(
         &self,
         req: crate::model::BatchVerifyTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn fetch_domain_verification_status(
         &self,
         req: crate::model::FetchDomainVerificationStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchDomainVerificationStatusResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchDomainVerificationStatusResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::SiteSearchEngineService] also implement [SiteSearchEngineService].
@@ -2507,8 +2449,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn get_site_search_engine(
         &self,
         req: crate::model::GetSiteSearchEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SiteSearchEngine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SiteSearchEngine>> {
         T::get_site_search_engine(self, req, options).await
     }
 
@@ -2516,8 +2458,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn create_target_site(
         &self,
         req: crate::model::CreateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_target_site(self, req, options).await
     }
 
@@ -2525,8 +2467,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn batch_create_target_sites(
         &self,
         req: crate::model::BatchCreateTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_create_target_sites(self, req, options).await
     }
 
@@ -2534,8 +2476,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn get_target_site(
         &self,
         req: crate::model::GetTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TargetSite>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TargetSite>> {
         T::get_target_site(self, req, options).await
     }
 
@@ -2543,8 +2485,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn update_target_site(
         &self,
         req: crate::model::UpdateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_target_site(self, req, options).await
     }
 
@@ -2552,8 +2494,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn delete_target_site(
         &self,
         req: crate::model::DeleteTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_target_site(self, req, options).await
     }
 
@@ -2561,8 +2503,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn list_target_sites(
         &self,
         req: crate::model::ListTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTargetSitesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTargetSitesResponse>> {
         T::list_target_sites(self, req, options).await
     }
 
@@ -2570,8 +2512,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn create_sitemap(
         &self,
         req: crate::model::CreateSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_sitemap(self, req, options).await
     }
 
@@ -2579,8 +2521,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn delete_sitemap(
         &self,
         req: crate::model::DeleteSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_sitemap(self, req, options).await
     }
 
@@ -2588,8 +2530,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn fetch_sitemaps(
         &self,
         req: crate::model::FetchSitemapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchSitemapsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchSitemapsResponse>> {
         T::fetch_sitemaps(self, req, options).await
     }
 
@@ -2597,8 +2539,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn enable_advanced_site_search(
         &self,
         req: crate::model::EnableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::enable_advanced_site_search(self, req, options).await
     }
 
@@ -2606,8 +2548,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn disable_advanced_site_search(
         &self,
         req: crate::model::DisableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::disable_advanced_site_search(self, req, options).await
     }
 
@@ -2615,8 +2557,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn recrawl_uris(
         &self,
         req: crate::model::RecrawlUrisRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::recrawl_uris(self, req, options).await
     }
 
@@ -2624,8 +2566,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn batch_verify_target_sites(
         &self,
         req: crate::model::BatchVerifyTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_verify_target_sites(self, req, options).await
     }
 
@@ -2633,9 +2575,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn fetch_domain_verification_status(
         &self,
         req: crate::model::FetchDomainVerificationStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchDomainVerificationStatusResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchDomainVerificationStatusResponse>> {
         T::fetch_domain_verification_status(self, req, options).await
     }
 
@@ -2643,10 +2584,9 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2654,8 +2594,8 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2663,22 +2603,22 @@ impl<T: super::SiteSearchEngineService> SiteSearchEngineService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2690,56 +2630,54 @@ pub trait UserEventService: std::fmt::Debug + Send + Sync {
     async fn write_user_event(
         &self,
         req: crate::model::WriteUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UserEvent>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UserEvent>>;
 
     async fn collect_user_event(
         &self,
         req: crate::model::CollectUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn purge_user_events(
         &self,
         req: crate::model::PurgeUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_user_events(
         &self,
         req: crate::model::ImportUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::UserEventService] also implement [UserEventService].
@@ -2750,8 +2688,8 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn write_user_event(
         &self,
         req: crate::model::WriteUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::UserEvent>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::UserEvent>> {
         T::write_user_event(self, req, options).await
     }
 
@@ -2759,8 +2697,8 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn collect_user_event(
         &self,
         req: crate::model::CollectUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::collect_user_event(self, req, options).await
     }
 
@@ -2768,8 +2706,8 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn purge_user_events(
         &self,
         req: crate::model::PurgeUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::purge_user_events(self, req, options).await
     }
 
@@ -2777,8 +2715,8 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn import_user_events(
         &self,
         req: crate::model::ImportUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_user_events(self, req, options).await
     }
 
@@ -2786,10 +2724,9 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2797,8 +2734,8 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2806,22 +2743,22 @@ impl<T: super::UserEventService> UserEventService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -2833,44 +2770,42 @@ pub trait UserLicenseService: std::fmt::Debug + Send + Sync {
     async fn list_user_licenses(
         &self,
         req: crate::model::ListUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListUserLicensesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListUserLicensesResponse>>;
 
     async fn batch_update_user_licenses(
         &self,
         req: crate::model::BatchUpdateUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::UserLicenseService] also implement [UserLicenseService].
@@ -2881,8 +2816,8 @@ impl<T: super::UserLicenseService> UserLicenseService for T {
     async fn list_user_licenses(
         &self,
         req: crate::model::ListUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListUserLicensesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListUserLicensesResponse>> {
         T::list_user_licenses(self, req, options).await
     }
 
@@ -2890,8 +2825,8 @@ impl<T: super::UserLicenseService> UserLicenseService for T {
     async fn batch_update_user_licenses(
         &self,
         req: crate::model::BatchUpdateUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_update_user_licenses(self, req, options).await
     }
 
@@ -2899,10 +2834,9 @@ impl<T: super::UserLicenseService> UserLicenseService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -2910,8 +2844,8 @@ impl<T: super::UserLicenseService> UserLicenseService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -2919,22 +2853,22 @@ impl<T: super::UserLicenseService> UserLicenseService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/discoveryengine/v1/src/tracing.rs b/src/generated/cloud/discoveryengine/v1/src/tracing.rs
index d38fa3be03..6d553c2746 100644
--- a/src/generated/cloud/discoveryengine/v1/src/tracing.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/tracing.rs
@@ -67,9 +67,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -77,8 +76,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -86,8 +85,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -121,8 +120,8 @@ where
     async fn update_cmek_config(
         &self,
         req: crate::model::UpdateCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_cmek_config(req, options).await
     }
 
@@ -130,8 +129,8 @@ where
     async fn get_cmek_config(
         &self,
         req: crate::model::GetCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CmekConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CmekConfig>> {
         self.inner.get_cmek_config(req, options).await
     }
 
@@ -139,8 +138,8 @@ where
     async fn list_cmek_configs(
         &self,
         req: crate::model::ListCmekConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCmekConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCmekConfigsResponse>> {
         self.inner.list_cmek_configs(req, options).await
     }
 
@@ -148,8 +147,8 @@ where
     async fn delete_cmek_config(
         &self,
         req: crate::model::DeleteCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_cmek_config(req, options).await
     }
 
@@ -157,9 +156,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -167,8 +165,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -176,22 +174,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -225,8 +223,8 @@ where
     async fn complete_query(
         &self,
         req: crate::model::CompleteQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompleteQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompleteQueryResponse>> {
         self.inner.complete_query(req, options).await
     }
 
@@ -234,8 +232,8 @@ where
     async fn import_suggestion_deny_list_entries(
         &self,
         req: crate::model::ImportSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .import_suggestion_deny_list_entries(req, options)
             .await
@@ -245,8 +243,8 @@ where
     async fn purge_suggestion_deny_list_entries(
         &self,
         req: crate::model::PurgeSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .purge_suggestion_deny_list_entries(req, options)
             .await
@@ -256,8 +254,8 @@ where
     async fn import_completion_suggestions(
         &self,
         req: crate::model::ImportCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_completion_suggestions(req, options).await
     }
 
@@ -265,8 +263,8 @@ where
     async fn purge_completion_suggestions(
         &self,
         req: crate::model::PurgeCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_completion_suggestions(req, options).await
     }
 
@@ -274,9 +272,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -284,8 +281,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -293,22 +290,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -342,8 +339,8 @@ where
     async fn create_control(
         &self,
         req: crate::model::CreateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Control>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Control>> {
         self.inner.create_control(req, options).await
     }
 
@@ -351,8 +348,8 @@ where
     async fn delete_control(
         &self,
         req: crate::model::DeleteControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_control(req, options).await
     }
 
@@ -360,8 +357,8 @@ where
     async fn update_control(
         &self,
         req: crate::model::UpdateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Control>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Control>> {
         self.inner.update_control(req, options).await
     }
 
@@ -369,8 +366,8 @@ where
     async fn get_control(
         &self,
         req: crate::model::GetControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Control>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Control>> {
         self.inner.get_control(req, options).await
     }
 
@@ -378,8 +375,8 @@ where
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListControlsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListControlsResponse>> {
         self.inner.list_controls(req, options).await
     }
 
@@ -387,9 +384,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -397,8 +393,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -406,8 +402,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -441,8 +437,8 @@ where
     async fn converse_conversation(
         &self,
         req: crate::model::ConverseConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConverseConversationResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConverseConversationResponse>> {
         self.inner.converse_conversation(req, options).await
     }
 
@@ -450,8 +446,8 @@ where
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.create_conversation(req, options).await
     }
 
@@ -459,8 +455,8 @@ where
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_conversation(req, options).await
     }
 
@@ -468,8 +464,8 @@ where
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.update_conversation(req, options).await
     }
 
@@ -477,8 +473,8 @@ where
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         self.inner.get_conversation(req, options).await
     }
 
@@ -486,8 +482,8 @@ where
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationsResponse>> {
         self.inner.list_conversations(req, options).await
     }
 
@@ -495,8 +491,8 @@ where
     async fn answer_query(
         &self,
         req: crate::model::AnswerQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnswerQueryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnswerQueryResponse>> {
         self.inner.answer_query(req, options).await
     }
 
@@ -504,8 +500,8 @@ where
     async fn get_answer(
         &self,
         req: crate::model::GetAnswerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Answer>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Answer>> {
         self.inner.get_answer(req, options).await
     }
 
@@ -513,8 +509,8 @@ where
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.create_session(req, options).await
     }
 
@@ -522,8 +518,8 @@ where
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_session(req, options).await
     }
 
@@ -531,8 +527,8 @@ where
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.update_session(req, options).await
     }
 
@@ -540,8 +536,8 @@ where
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.get_session(req, options).await
     }
 
@@ -549,8 +545,8 @@ where
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         self.inner.list_sessions(req, options).await
     }
 
@@ -558,9 +554,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -568,8 +563,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -577,8 +572,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -612,8 +607,8 @@ where
     async fn create_data_store(
         &self,
         req: crate::model::CreateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_data_store(req, options).await
     }
 
@@ -621,8 +616,8 @@ where
     async fn get_data_store(
         &self,
         req: crate::model::GetDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataStore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataStore>> {
         self.inner.get_data_store(req, options).await
     }
 
@@ -630,8 +625,8 @@ where
     async fn list_data_stores(
         &self,
         req: crate::model::ListDataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataStoresResponse>> {
         self.inner.list_data_stores(req, options).await
     }
 
@@ -639,8 +634,8 @@ where
     async fn delete_data_store(
         &self,
         req: crate::model::DeleteDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_data_store(req, options).await
     }
 
@@ -648,8 +643,8 @@ where
     async fn update_data_store(
         &self,
         req: crate::model::UpdateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataStore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataStore>> {
         self.inner.update_data_store(req, options).await
     }
 
@@ -657,9 +652,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -667,8 +661,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -676,22 +670,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -725,8 +719,8 @@ where
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.get_document(req, options).await
     }
 
@@ -734,8 +728,8 @@ where
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDocumentsResponse>> {
         self.inner.list_documents(req, options).await
     }
 
@@ -743,8 +737,8 @@ where
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.create_document(req, options).await
     }
 
@@ -752,8 +746,8 @@ where
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         self.inner.update_document(req, options).await
     }
 
@@ -761,8 +755,8 @@ where
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_document(req, options).await
     }
 
@@ -770,8 +764,8 @@ where
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_documents(req, options).await
     }
 
@@ -779,8 +773,8 @@ where
     async fn purge_documents(
         &self,
         req: crate::model::PurgeDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_documents(req, options).await
     }
 
@@ -788,8 +782,8 @@ where
     async fn batch_get_documents_metadata(
         &self,
         req: crate::model::BatchGetDocumentsMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetDocumentsMetadataResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetDocumentsMetadataResponse>> {
         self.inner.batch_get_documents_metadata(req, options).await
     }
 
@@ -797,9 +791,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -807,8 +800,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -816,22 +809,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -865,8 +858,8 @@ where
     async fn create_engine(
         &self,
         req: crate::model::CreateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_engine(req, options).await
     }
 
@@ -874,8 +867,8 @@ where
     async fn delete_engine(
         &self,
         req: crate::model::DeleteEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_engine(req, options).await
     }
 
@@ -883,8 +876,8 @@ where
     async fn update_engine(
         &self,
         req: crate::model::UpdateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Engine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Engine>> {
         self.inner.update_engine(req, options).await
     }
 
@@ -892,8 +885,8 @@ where
     async fn get_engine(
         &self,
         req: crate::model::GetEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Engine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Engine>> {
         self.inner.get_engine(req, options).await
     }
 
@@ -901,8 +894,8 @@ where
     async fn list_engines(
         &self,
         req: crate::model::ListEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnginesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnginesResponse>> {
         self.inner.list_engines(req, options).await
     }
 
@@ -910,9 +903,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -920,8 +912,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -929,22 +921,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -978,8 +970,8 @@ where
     async fn generate_grounded_content(
         &self,
         req: crate::model::GenerateGroundedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateGroundedContentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateGroundedContentResponse>> {
         self.inner.generate_grounded_content(req, options).await
     }
 
@@ -987,8 +979,8 @@ where
     async fn check_grounding(
         &self,
         req: crate::model::CheckGroundingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckGroundingResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckGroundingResponse>> {
         self.inner.check_grounding(req, options).await
     }
 
@@ -996,9 +988,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1006,8 +997,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1015,8 +1006,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1050,8 +1041,8 @@ where
     async fn create_identity_mapping_store(
         &self,
         req: crate::model::CreateIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityMappingStore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityMappingStore>> {
         self.inner.create_identity_mapping_store(req, options).await
     }
 
@@ -1059,8 +1050,8 @@ where
     async fn get_identity_mapping_store(
         &self,
         req: crate::model::GetIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityMappingStore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityMappingStore>> {
         self.inner.get_identity_mapping_store(req, options).await
     }
 
@@ -1068,8 +1059,8 @@ where
     async fn delete_identity_mapping_store(
         &self,
         req: crate::model::DeleteIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_identity_mapping_store(req, options).await
     }
 
@@ -1077,8 +1068,8 @@ where
     async fn import_identity_mappings(
         &self,
         req: crate::model::ImportIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_identity_mappings(req, options).await
     }
 
@@ -1086,8 +1077,8 @@ where
     async fn purge_identity_mappings(
         &self,
         req: crate::model::PurgeIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_identity_mappings(req, options).await
     }
 
@@ -1095,8 +1086,8 @@ where
     async fn list_identity_mappings(
         &self,
         req: crate::model::ListIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIdentityMappingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIdentityMappingsResponse>> {
         self.inner.list_identity_mappings(req, options).await
     }
 
@@ -1104,8 +1095,8 @@ where
     async fn list_identity_mapping_stores(
         &self,
         req: crate::model::ListIdentityMappingStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIdentityMappingStoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIdentityMappingStoresResponse>> {
         self.inner.list_identity_mapping_stores(req, options).await
     }
 
@@ -1113,9 +1104,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1123,8 +1113,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1132,22 +1122,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1181,8 +1171,8 @@ where
     async fn provision_project(
         &self,
         req: crate::model::ProvisionProjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.provision_project(req, options).await
     }
 
@@ -1190,9 +1180,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1200,8 +1189,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1209,22 +1198,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1258,8 +1247,8 @@ where
     async fn rank(
         &self,
         req: crate::model::RankRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RankResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RankResponse>> {
         self.inner.rank(req, options).await
     }
 
@@ -1267,9 +1256,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1277,8 +1265,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1286,8 +1274,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1321,8 +1309,8 @@ where
     async fn recommend(
         &self,
         req: crate::model::RecommendRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RecommendResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RecommendResponse>> {
         self.inner.recommend(req, options).await
     }
 
@@ -1330,9 +1318,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1340,8 +1327,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1349,8 +1336,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1384,8 +1371,8 @@ where
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schema>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schema>> {
         self.inner.get_schema(req, options).await
     }
 
@@ -1393,8 +1380,8 @@ where
     async fn list_schemas(
         &self,
         req: crate::model::ListSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchemasResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchemasResponse>> {
         self.inner.list_schemas(req, options).await
     }
 
@@ -1402,8 +1389,8 @@ where
     async fn create_schema(
         &self,
         req: crate::model::CreateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_schema(req, options).await
     }
 
@@ -1411,8 +1398,8 @@ where
     async fn update_schema(
         &self,
         req: crate::model::UpdateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_schema(req, options).await
     }
 
@@ -1420,8 +1407,8 @@ where
     async fn delete_schema(
         &self,
         req: crate::model::DeleteSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_schema(req, options).await
     }
 
@@ -1429,9 +1416,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1439,8 +1425,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1448,22 +1434,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1497,8 +1483,8 @@ where
     async fn search(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchResponse>> {
         self.inner.search(req, options).await
     }
 
@@ -1506,8 +1492,8 @@ where
     async fn search_lite(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchResponse>> {
         self.inner.search_lite(req, options).await
     }
 
@@ -1515,9 +1501,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1525,8 +1510,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1534,8 +1519,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1569,8 +1554,8 @@ where
     async fn train_custom_model(
         &self,
         req: crate::model::TrainCustomModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.train_custom_model(req, options).await
     }
 
@@ -1578,8 +1563,8 @@ where
     async fn list_custom_models(
         &self,
         req: crate::model::ListCustomModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomModelsResponse>> {
         self.inner.list_custom_models(req, options).await
     }
 
@@ -1587,9 +1572,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1597,8 +1581,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1606,22 +1590,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1655,8 +1639,8 @@ where
     async fn update_serving_config(
         &self,
         req: crate::model::UpdateServingConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServingConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServingConfig>> {
         self.inner.update_serving_config(req, options).await
     }
 
@@ -1664,9 +1648,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1674,8 +1657,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1683,8 +1666,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1718,8 +1701,8 @@ where
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.create_session(req, options).await
     }
 
@@ -1727,8 +1710,8 @@ where
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_session(req, options).await
     }
 
@@ -1736,8 +1719,8 @@ where
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.update_session(req, options).await
     }
 
@@ -1745,8 +1728,8 @@ where
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         self.inner.get_session(req, options).await
     }
 
@@ -1754,8 +1737,8 @@ where
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         self.inner.list_sessions(req, options).await
     }
 
@@ -1763,9 +1746,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1773,8 +1755,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1782,8 +1764,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
@@ -1817,8 +1799,8 @@ where
     async fn get_site_search_engine(
         &self,
         req: crate::model::GetSiteSearchEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SiteSearchEngine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SiteSearchEngine>> {
         self.inner.get_site_search_engine(req, options).await
     }
 
@@ -1826,8 +1808,8 @@ where
     async fn create_target_site(
         &self,
         req: crate::model::CreateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_target_site(req, options).await
     }
 
@@ -1835,8 +1817,8 @@ where
     async fn batch_create_target_sites(
         &self,
         req: crate::model::BatchCreateTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_create_target_sites(req, options).await
     }
 
@@ -1844,8 +1826,8 @@ where
     async fn get_target_site(
         &self,
         req: crate::model::GetTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetSite>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetSite>> {
         self.inner.get_target_site(req, options).await
     }
 
@@ -1853,8 +1835,8 @@ where
     async fn update_target_site(
         &self,
         req: crate::model::UpdateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_target_site(req, options).await
     }
 
@@ -1862,8 +1844,8 @@ where
     async fn delete_target_site(
         &self,
         req: crate::model::DeleteTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_target_site(req, options).await
     }
 
@@ -1871,8 +1853,8 @@ where
     async fn list_target_sites(
         &self,
         req: crate::model::ListTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTargetSitesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTargetSitesResponse>> {
         self.inner.list_target_sites(req, options).await
     }
 
@@ -1880,8 +1862,8 @@ where
     async fn create_sitemap(
         &self,
         req: crate::model::CreateSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_sitemap(req, options).await
     }
 
@@ -1889,8 +1871,8 @@ where
     async fn delete_sitemap(
         &self,
         req: crate::model::DeleteSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_sitemap(req, options).await
     }
 
@@ -1898,8 +1880,8 @@ where
     async fn fetch_sitemaps(
         &self,
         req: crate::model::FetchSitemapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchSitemapsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchSitemapsResponse>> {
         self.inner.fetch_sitemaps(req, options).await
     }
 
@@ -1907,8 +1889,8 @@ where
     async fn enable_advanced_site_search(
         &self,
         req: crate::model::EnableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.enable_advanced_site_search(req, options).await
     }
 
@@ -1916,8 +1898,8 @@ where
     async fn disable_advanced_site_search(
         &self,
         req: crate::model::DisableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.disable_advanced_site_search(req, options).await
     }
 
@@ -1925,8 +1907,8 @@ where
     async fn recrawl_uris(
         &self,
         req: crate::model::RecrawlUrisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.recrawl_uris(req, options).await
     }
 
@@ -1934,8 +1916,8 @@ where
     async fn batch_verify_target_sites(
         &self,
         req: crate::model::BatchVerifyTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_verify_target_sites(req, options).await
     }
 
@@ -1943,8 +1925,8 @@ where
     async fn fetch_domain_verification_status(
         &self,
         req: crate::model::FetchDomainVerificationStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchDomainVerificationStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchDomainVerificationStatusResponse>> {
         self.inner
             .fetch_domain_verification_status(req, options)
             .await
@@ -1954,9 +1936,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1964,8 +1945,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1973,22 +1954,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2022,8 +2003,8 @@ where
     async fn write_user_event(
         &self,
         req: crate::model::WriteUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UserEvent>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UserEvent>> {
         self.inner.write_user_event(req, options).await
     }
 
@@ -2031,8 +2012,8 @@ where
     async fn collect_user_event(
         &self,
         req: crate::model::CollectUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.collect_user_event(req, options).await
     }
 
@@ -2040,8 +2021,8 @@ where
     async fn purge_user_events(
         &self,
         req: crate::model::PurgeUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.purge_user_events(req, options).await
     }
 
@@ -2049,8 +2030,8 @@ where
     async fn import_user_events(
         &self,
         req: crate::model::ImportUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_user_events(req, options).await
     }
 
@@ -2058,9 +2039,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2068,8 +2048,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2077,22 +2057,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2126,8 +2106,8 @@ where
     async fn list_user_licenses(
         &self,
         req: crate::model::ListUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListUserLicensesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListUserLicensesResponse>> {
         self.inner.list_user_licenses(req, options).await
     }
 
@@ -2135,8 +2115,8 @@ where
     async fn batch_update_user_licenses(
         &self,
         req: crate::model::BatchUpdateUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_update_user_licenses(req, options).await
     }
 
@@ -2144,9 +2124,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -2154,8 +2133,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -2163,22 +2142,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/discoveryengine/v1/src/transport.rs b/src/generated/cloud/discoveryengine/v1/src/transport.rs
index 69f782b3ad..21414d0e3f 100644
--- a/src/generated/cloud/discoveryengine/v1/src/transport.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/transport.rs
@@ -14,6 +14,8 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
+#[allow(unused_imports)]
+use crate::Error;
 #[cfg(any(
     feature = "assistant-service",
     feature = "cmek-config-service",
@@ -38,8 +40,6 @@
     feature = "user-license-service",
 ))]
 use crate::Result;
-#[allow(unused_imports)]
-use gax::error::Error;
 
 /// Implements [AssistantService](super::stub::AssistantService) using a [gaxi::http::ReqwestClient].
 #[cfg(feature = "assistant-service")]
@@ -59,7 +59,7 @@ impl std::fmt::Debug for AssistantService {
 
 #[cfg(feature = "assistant-service")]
 impl AssistantService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -70,14 +70,13 @@ impl super::stub::AssistantService for AssistantService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -449,9 +448,9 @@ impl super::stub::AssistantService for AssistantService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -466,13 +465,13 @@ impl super::stub::AssistantService for AssistantService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -780,9 +779,9 @@ impl super::stub::AssistantService for AssistantService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -797,13 +796,13 @@ impl super::stub::AssistantService for AssistantService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -979,9 +978,9 @@ impl super::stub::AssistantService for AssistantService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -990,12 +989,13 @@ impl super::stub::AssistantService for AssistantService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -1017,7 +1017,7 @@ impl std::fmt::Debug for CmekConfigService {
 
 #[cfg(feature = "cmek-config-service")]
 impl CmekConfigService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1028,13 +1028,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn update_cmek_config(
         &self,
         req: crate::model::UpdateCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1124,9 +1124,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1141,13 +1141,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn get_cmek_config(
         &self,
         req: crate::model::GetCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CmekConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CmekConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1223,9 +1223,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1240,13 +1240,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn list_cmek_configs(
         &self,
         req: crate::model::ListCmekConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCmekConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCmekConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1283,9 +1283,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1300,13 +1300,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn delete_cmek_config(
         &self,
         req: crate::model::DeleteCmekConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1347,9 +1347,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1364,14 +1364,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -1743,9 +1742,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1760,13 +1759,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -2074,9 +2073,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2091,13 +2090,13 @@ impl super::stub::CmekConfigService for CmekConfigService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2273,9 +2272,9 @@ impl super::stub::CmekConfigService for CmekConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2284,25 +2283,26 @@ impl super::stub::CmekConfigService for CmekConfigService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2325,7 +2325,7 @@ impl std::fmt::Debug for CompletionService {
 
 #[cfg(feature = "completion-service")]
 impl CompletionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2336,13 +2336,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn complete_query(
         &self,
         req: crate::model::CompleteQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CompleteQueryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CompleteQueryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2434,9 +2434,9 @@ impl super::stub::CompletionService for CompletionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2451,13 +2451,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn import_suggestion_deny_list_entries(
         &self,
         req: crate::model::ImportSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2539,9 +2539,9 @@ impl super::stub::CompletionService for CompletionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2556,13 +2556,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn purge_suggestion_deny_list_entries(
         &self,
         req: crate::model::PurgeSuggestionDenyListEntriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2644,9 +2644,9 @@ impl super::stub::CompletionService for CompletionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2661,13 +2661,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn import_completion_suggestions(
         &self,
         req: crate::model::ImportCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2749,9 +2749,9 @@ impl super::stub::CompletionService for CompletionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2766,13 +2766,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn purge_completion_suggestions(
         &self,
         req: crate::model::PurgeCompletionSuggestionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2854,9 +2854,9 @@ impl super::stub::CompletionService for CompletionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2871,14 +2871,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -3250,9 +3249,9 @@ impl super::stub::CompletionService for CompletionService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3267,13 +3266,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -3581,9 +3580,9 @@ impl super::stub::CompletionService for CompletionService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3598,13 +3597,13 @@ impl super::stub::CompletionService for CompletionService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3780,9 +3779,9 @@ impl super::stub::CompletionService for CompletionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3791,25 +3790,26 @@ impl super::stub::CompletionService for CompletionService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -3832,7 +3832,7 @@ impl std::fmt::Debug for ControlService {
 
 #[cfg(feature = "control-service")]
 impl ControlService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3843,13 +3843,13 @@ impl super::stub::ControlService for ControlService {
     async fn create_control(
         &self,
         req: crate::model::CreateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Control>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Control>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3975,9 +3975,9 @@ impl super::stub::ControlService for ControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3992,13 +3992,13 @@ impl super::stub::ControlService for ControlService {
     async fn delete_control(
         &self,
         req: crate::model::DeleteControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4133,9 +4133,9 @@ impl super::stub::ControlService for ControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4144,24 +4144,25 @@ impl super::stub::ControlService for ControlService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_control(
         &self,
         req: crate::model::UpdateControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Control>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Control>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4350,9 +4351,9 @@ impl super::stub::ControlService for ControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4367,13 +4368,13 @@ impl super::stub::ControlService for ControlService {
     async fn get_control(
         &self,
         req: crate::model::GetControlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Control>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Control>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4508,9 +4509,9 @@ impl super::stub::ControlService for ControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4525,13 +4526,13 @@ impl super::stub::ControlService for ControlService {
     async fn list_controls(
         &self,
         req: crate::model::ListControlsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListControlsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListControlsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4663,9 +4664,9 @@ impl super::stub::ControlService for ControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4680,14 +4681,13 @@ impl super::stub::ControlService for ControlService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -5059,9 +5059,9 @@ impl super::stub::ControlService for ControlService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5076,13 +5076,13 @@ impl super::stub::ControlService for ControlService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -5390,9 +5390,9 @@ impl super::stub::ControlService for ControlService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5407,13 +5407,13 @@ impl super::stub::ControlService for ControlService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5589,9 +5589,9 @@ impl super::stub::ControlService for ControlService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5600,12 +5600,13 @@ impl super::stub::ControlService for ControlService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -5627,7 +5628,7 @@ impl std::fmt::Debug for ConversationalSearchService {
 
 #[cfg(feature = "conversational-search-service")]
 impl ConversationalSearchService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5638,13 +5639,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn converse_conversation(
         &self,
         req: crate::model::ConverseConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConverseConversationResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConverseConversationResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5779,9 +5780,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5796,13 +5797,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn create_conversation(
         &self,
         req: crate::model::CreateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5925,9 +5926,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5942,13 +5943,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn delete_conversation(
         &self,
         req: crate::model::DeleteConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6083,9 +6084,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6094,24 +6095,25 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_conversation(
         &self,
         req: crate::model::UpdateConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6300,9 +6302,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6317,13 +6319,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn get_conversation(
         &self,
         req: crate::model::GetConversationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Conversation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Conversation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6458,9 +6460,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6475,13 +6477,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn list_conversations(
         &self,
         req: crate::model::ListConversationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConversationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConversationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6616,9 +6618,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6633,13 +6635,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn answer_query(
         &self,
         req: crate::model::AnswerQueryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnswerQueryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnswerQueryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6774,9 +6776,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6791,13 +6793,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn get_answer(
         &self,
         req: crate::model::GetAnswerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Answer>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Answer>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6944,9 +6946,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6961,13 +6963,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7090,9 +7092,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7107,13 +7109,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7248,9 +7250,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7259,24 +7261,25 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7465,9 +7468,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7482,13 +7485,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7629,9 +7632,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7646,13 +7649,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7787,9 +7790,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7804,14 +7807,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -8183,9 +8185,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8200,13 +8202,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -8514,9 +8516,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8531,13 +8533,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8713,9 +8715,9 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8724,12 +8726,13 @@ impl super::stub::ConversationalSearchService for ConversationalSearchService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -8751,7 +8754,7 @@ impl std::fmt::Debug for DataStoreService {
 
 #[cfg(feature = "data-store-service")]
 impl DataStoreService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -8762,13 +8765,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn create_data_store(
         &self,
         req: crate::model::CreateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8870,9 +8873,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8887,13 +8890,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn get_data_store(
         &self,
         req: crate::model::GetDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataStore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataStore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8975,9 +8978,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8992,13 +8995,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn list_data_stores(
         &self,
         req: crate::model::ListDataStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDataStoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDataStoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9078,9 +9081,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9095,13 +9098,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn delete_data_store(
         &self,
         req: crate::model::DeleteDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9183,9 +9186,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9200,13 +9203,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn update_data_store(
         &self,
         req: crate::model::UpdateDataStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DataStore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DataStore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -9324,9 +9327,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9341,14 +9344,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -9720,9 +9722,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -9737,13 +9739,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -10051,9 +10053,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10068,13 +10070,13 @@ impl super::stub::DataStoreService for DataStoreService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10250,9 +10252,9 @@ impl super::stub::DataStoreService for DataStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10261,25 +10263,26 @@ impl super::stub::DataStoreService for DataStoreService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -10302,7 +10305,7 @@ impl std::fmt::Debug for DocumentService {
 
 #[cfg(feature = "document-service")]
 impl DocumentService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -10313,13 +10316,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn get_document(
         &self,
         req: crate::model::GetDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10417,9 +10420,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10434,13 +10437,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn list_documents(
         &self,
         req: crate::model::ListDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDocumentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDocumentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10534,9 +10537,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10551,13 +10554,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn create_document(
         &self,
         req: crate::model::CreateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10649,9 +10652,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10666,13 +10669,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn update_document(
         &self,
         req: crate::model::UpdateDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Document>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Document>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10808,9 +10811,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10825,13 +10828,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn delete_document(
         &self,
         req: crate::model::DeleteDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -10929,9 +10932,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -10940,24 +10943,25 @@ impl super::stub::DocumentService for DocumentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn import_documents(
         &self,
         req: crate::model::ImportDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11047,9 +11051,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11064,13 +11068,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn purge_documents(
         &self,
         req: crate::model::PurgeDocumentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11160,9 +11164,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11177,13 +11181,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn batch_get_documents_metadata(
         &self,
         req: crate::model::BatchGetDocumentsMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchGetDocumentsMetadataResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchGetDocumentsMetadataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -11297,9 +11301,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11314,14 +11318,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -11693,9 +11696,9 @@ impl super::stub::DocumentService for DocumentService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -11710,13 +11713,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -12024,9 +12027,9 @@ impl super::stub::DocumentService for DocumentService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12041,13 +12044,13 @@ impl super::stub::DocumentService for DocumentService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12223,9 +12226,9 @@ impl super::stub::DocumentService for DocumentService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12234,25 +12237,26 @@ impl super::stub::DocumentService for DocumentService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -12275,7 +12279,7 @@ impl std::fmt::Debug for EngineService {
 
 #[cfg(feature = "engine-service")]
 impl EngineService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -12286,13 +12290,13 @@ impl super::stub::EngineService for EngineService {
     async fn create_engine(
         &self,
         req: crate::model::CreateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12334,9 +12338,9 @@ impl super::stub::EngineService for EngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12351,13 +12355,13 @@ impl super::stub::EngineService for EngineService {
     async fn delete_engine(
         &self,
         req: crate::model::DeleteEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12402,9 +12406,9 @@ impl super::stub::EngineService for EngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12419,13 +12423,13 @@ impl super::stub::EngineService for EngineService {
     async fn update_engine(
         &self,
         req: crate::model::UpdateEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Engine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Engine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12488,9 +12492,9 @@ impl super::stub::EngineService for EngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12505,13 +12509,13 @@ impl super::stub::EngineService for EngineService {
     async fn get_engine(
         &self,
         req: crate::model::GetEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Engine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Engine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12556,9 +12560,9 @@ impl super::stub::EngineService for EngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12573,13 +12577,13 @@ impl super::stub::EngineService for EngineService {
     async fn list_engines(
         &self,
         req: crate::model::ListEnginesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnginesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnginesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -12623,9 +12627,9 @@ impl super::stub::EngineService for EngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -12640,14 +12644,13 @@ impl super::stub::EngineService for EngineService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -13019,9 +13022,9 @@ impl super::stub::EngineService for EngineService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13036,13 +13039,13 @@ impl super::stub::EngineService for EngineService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -13350,9 +13353,9 @@ impl super::stub::EngineService for EngineService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13367,13 +13370,13 @@ impl super::stub::EngineService for EngineService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13549,9 +13552,9 @@ impl super::stub::EngineService for EngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13560,25 +13563,26 @@ impl super::stub::EngineService for EngineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -13601,7 +13605,7 @@ impl std::fmt::Debug for GroundedGenerationService {
 
 #[cfg(feature = "grounded-generation-service")]
 impl GroundedGenerationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -13612,13 +13616,13 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
     async fn generate_grounded_content(
         &self,
         req: crate::model::GenerateGroundedContentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateGroundedContentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateGroundedContentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13655,9 +13659,9 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13672,13 +13676,13 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
     async fn check_grounding(
         &self,
         req: crate::model::CheckGroundingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckGroundingResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckGroundingResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -13719,9 +13723,9 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -13736,14 +13740,13 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -14115,9 +14118,9 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14132,13 +14135,13 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -14446,9 +14449,9 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14463,13 +14466,13 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14645,9 +14648,9 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14656,12 +14659,13 @@ impl super::stub::GroundedGenerationService for GroundedGenerationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -14683,7 +14687,7 @@ impl std::fmt::Debug for IdentityMappingStoreService {
 
 #[cfg(feature = "identity-mapping-store-service")]
 impl IdentityMappingStoreService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -14694,13 +14698,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn create_identity_mapping_store(
         &self,
         req: crate::model::CreateIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityMappingStore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityMappingStore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14746,9 +14750,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14763,13 +14767,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn get_identity_mapping_store(
         &self,
         req: crate::model::GetIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityMappingStore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityMappingStore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14810,9 +14814,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14827,13 +14831,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn delete_identity_mapping_store(
         &self,
         req: crate::model::DeleteIdentityMappingStoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14874,9 +14878,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14891,13 +14895,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn import_identity_mappings(
         &self,
         req: crate::model::ImportIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -14942,9 +14946,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -14959,13 +14963,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn purge_identity_mappings(
         &self,
         req: crate::model::PurgeIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15010,9 +15014,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15027,13 +15031,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn list_identity_mappings(
         &self,
         req: crate::model::ListIdentityMappingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIdentityMappingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIdentityMappingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15080,9 +15084,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15097,13 +15101,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn list_identity_mapping_stores(
         &self,
         req: crate::model::ListIdentityMappingStoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIdentityMappingStoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIdentityMappingStoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -15142,9 +15146,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15159,14 +15163,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -15538,9 +15541,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15555,13 +15558,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -15869,9 +15872,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -15886,13 +15889,13 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16068,9 +16071,9 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16079,25 +16082,26 @@ impl super::stub::IdentityMappingStoreService for IdentityMappingStoreService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -16120,7 +16124,7 @@ impl std::fmt::Debug for ProjectService {
 
 #[cfg(feature = "project-service")]
 impl ProjectService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -16131,13 +16135,13 @@ impl super::stub::ProjectService for ProjectService {
     async fn provision_project(
         &self,
         req: crate::model::ProvisionProjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -16164,9 +16168,9 @@ impl super::stub::ProjectService for ProjectService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16181,14 +16185,13 @@ impl super::stub::ProjectService for ProjectService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -16560,9 +16563,9 @@ impl super::stub::ProjectService for ProjectService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16577,13 +16580,13 @@ impl super::stub::ProjectService for ProjectService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -16891,9 +16894,9 @@ impl super::stub::ProjectService for ProjectService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -16908,13 +16911,13 @@ impl super::stub::ProjectService for ProjectService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17090,9 +17093,9 @@ impl super::stub::ProjectService for ProjectService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17101,25 +17104,26 @@ impl super::stub::ProjectService for ProjectService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -17142,7 +17146,7 @@ impl std::fmt::Debug for RankService {
 
 #[cfg(feature = "rank-service")]
 impl RankService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -17153,13 +17157,13 @@ impl super::stub::RankService for RankService {
     async fn rank(
         &self,
         req: crate::model::RankRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RankResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RankResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -17200,9 +17204,9 @@ impl super::stub::RankService for RankService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17217,14 +17221,13 @@ impl super::stub::RankService for RankService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -17596,9 +17599,9 @@ impl super::stub::RankService for RankService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17613,13 +17616,13 @@ impl super::stub::RankService for RankService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -17927,9 +17930,9 @@ impl super::stub::RankService for RankService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -17944,13 +17947,13 @@ impl super::stub::RankService for RankService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18126,9 +18129,9 @@ impl super::stub::RankService for RankService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18137,12 +18140,13 @@ impl super::stub::RankService for RankService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -18164,7 +18168,7 @@ impl std::fmt::Debug for RecommendationService {
 
 #[cfg(feature = "recommendation-service")]
 impl RecommendationService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -18175,13 +18179,13 @@ impl super::stub::RecommendationService for RecommendationService {
     async fn recommend(
         &self,
         req: crate::model::RecommendRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RecommendResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RecommendResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -18316,9 +18320,9 @@ impl super::stub::RecommendationService for RecommendationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18333,14 +18337,13 @@ impl super::stub::RecommendationService for RecommendationService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -18712,9 +18715,9 @@ impl super::stub::RecommendationService for RecommendationService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -18729,13 +18732,13 @@ impl super::stub::RecommendationService for RecommendationService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -19043,9 +19046,9 @@ impl super::stub::RecommendationService for RecommendationService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19060,13 +19063,13 @@ impl super::stub::RecommendationService for RecommendationService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19242,9 +19245,9 @@ impl super::stub::RecommendationService for RecommendationService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19253,12 +19256,13 @@ impl super::stub::RecommendationService for RecommendationService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -19280,7 +19284,7 @@ impl std::fmt::Debug for SchemaService {
 
 #[cfg(feature = "schema-service")]
 impl SchemaService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -19291,13 +19295,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schema>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schema>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19387,9 +19391,9 @@ impl super::stub::SchemaService for SchemaService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19404,13 +19408,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn list_schemas(
         &self,
         req: crate::model::ListSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchemasResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchemasResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19496,9 +19500,9 @@ impl super::stub::SchemaService for SchemaService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19513,13 +19517,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn create_schema(
         &self,
         req: crate::model::CreateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19603,9 +19607,9 @@ impl super::stub::SchemaService for SchemaService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19620,13 +19624,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn update_schema(
         &self,
         req: crate::model::UpdateSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19730,9 +19734,9 @@ impl super::stub::SchemaService for SchemaService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19747,13 +19751,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn delete_schema(
         &self,
         req: crate::model::DeleteSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -19843,9 +19847,9 @@ impl super::stub::SchemaService for SchemaService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -19860,14 +19864,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -20239,9 +20242,9 @@ impl super::stub::SchemaService for SchemaService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20256,13 +20259,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -20570,9 +20573,9 @@ impl super::stub::SchemaService for SchemaService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20587,13 +20590,13 @@ impl super::stub::SchemaService for SchemaService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20769,9 +20772,9 @@ impl super::stub::SchemaService for SchemaService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20780,25 +20783,26 @@ impl super::stub::SchemaService for SchemaService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -20821,7 +20825,7 @@ impl std::fmt::Debug for SearchService {
 
 #[cfg(feature = "search-service")]
 impl SearchService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -20832,13 +20836,13 @@ impl super::stub::SearchService for SearchService {
     async fn search(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -20973,9 +20977,9 @@ impl super::stub::SearchService for SearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -20990,13 +20994,13 @@ impl super::stub::SearchService for SearchService {
     async fn search_lite(
         &self,
         req: crate::model::SearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -21131,9 +21135,9 @@ impl super::stub::SearchService for SearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21148,14 +21152,13 @@ impl super::stub::SearchService for SearchService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -21527,9 +21530,9 @@ impl super::stub::SearchService for SearchService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21544,13 +21547,13 @@ impl super::stub::SearchService for SearchService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -21858,9 +21861,9 @@ impl super::stub::SearchService for SearchService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -21875,13 +21878,13 @@ impl super::stub::SearchService for SearchService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22057,9 +22060,9 @@ impl super::stub::SearchService for SearchService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22068,12 +22071,13 @@ impl super::stub::SearchService for SearchService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -22095,7 +22099,7 @@ impl std::fmt::Debug for SearchTuningService {
 
 #[cfg(feature = "search-tuning-service")]
 impl SearchTuningService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -22106,13 +22110,13 @@ impl super::stub::SearchTuningService for SearchTuningService {
     async fn train_custom_model(
         &self,
         req: crate::model::TrainCustomModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22157,9 +22161,9 @@ impl super::stub::SearchTuningService for SearchTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22174,13 +22178,13 @@ impl super::stub::SearchTuningService for SearchTuningService {
     async fn list_custom_models(
         &self,
         req: crate::model::ListCustomModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCustomModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCustomModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -22225,9 +22229,9 @@ impl super::stub::SearchTuningService for SearchTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22242,14 +22246,13 @@ impl super::stub::SearchTuningService for SearchTuningService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -22621,9 +22624,9 @@ impl super::stub::SearchTuningService for SearchTuningService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22638,13 +22641,13 @@ impl super::stub::SearchTuningService for SearchTuningService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -22952,9 +22955,9 @@ impl super::stub::SearchTuningService for SearchTuningService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -22969,13 +22972,13 @@ impl super::stub::SearchTuningService for SearchTuningService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23151,9 +23154,9 @@ impl super::stub::SearchTuningService for SearchTuningService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23162,25 +23165,26 @@ impl super::stub::SearchTuningService for SearchTuningService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -23203,7 +23207,7 @@ impl std::fmt::Debug for ServingConfigService {
 
 #[cfg(feature = "serving-config-service")]
 impl ServingConfigService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -23214,13 +23218,13 @@ impl super::stub::ServingConfigService for ServingConfigService {
     async fn update_serving_config(
         &self,
         req: crate::model::UpdateServingConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServingConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServingConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -23409,9 +23413,9 @@ impl super::stub::ServingConfigService for ServingConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23426,14 +23430,13 @@ impl super::stub::ServingConfigService for ServingConfigService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -23805,9 +23808,9 @@ impl super::stub::ServingConfigService for ServingConfigService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -23822,13 +23825,13 @@ impl super::stub::ServingConfigService for ServingConfigService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -24136,9 +24139,9 @@ impl super::stub::ServingConfigService for ServingConfigService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24153,13 +24156,13 @@ impl super::stub::ServingConfigService for ServingConfigService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24335,9 +24338,9 @@ impl super::stub::ServingConfigService for ServingConfigService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24346,12 +24349,13 @@ impl super::stub::ServingConfigService for ServingConfigService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -24373,7 +24377,7 @@ impl std::fmt::Debug for SessionService {
 
 #[cfg(feature = "session-service")]
 impl SessionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -24384,13 +24388,13 @@ impl super::stub::SessionService for SessionService {
     async fn create_session(
         &self,
         req: crate::model::CreateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24513,9 +24517,9 @@ impl super::stub::SessionService for SessionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24530,13 +24534,13 @@ impl super::stub::SessionService for SessionService {
     async fn delete_session(
         &self,
         req: crate::model::DeleteSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24671,9 +24675,9 @@ impl super::stub::SessionService for SessionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24682,24 +24686,25 @@ impl super::stub::SessionService for SessionService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_session(
         &self,
         req: crate::model::UpdateSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -24888,9 +24893,9 @@ impl super::stub::SessionService for SessionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -24905,13 +24910,13 @@ impl super::stub::SessionService for SessionService {
     async fn get_session(
         &self,
         req: crate::model::GetSessionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Session>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Session>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25052,9 +25057,9 @@ impl super::stub::SessionService for SessionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25069,13 +25074,13 @@ impl super::stub::SessionService for SessionService {
     async fn list_sessions(
         &self,
         req: crate::model::ListSessionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSessionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSessionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -25210,9 +25215,9 @@ impl super::stub::SessionService for SessionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25227,14 +25232,13 @@ impl super::stub::SessionService for SessionService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -25606,9 +25610,9 @@ impl super::stub::SessionService for SessionService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25623,13 +25627,13 @@ impl super::stub::SessionService for SessionService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -25937,9 +25941,9 @@ impl super::stub::SessionService for SessionService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -25954,13 +25958,13 @@ impl super::stub::SessionService for SessionService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26136,9 +26140,9 @@ impl super::stub::SessionService for SessionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26147,12 +26151,13 @@ impl super::stub::SessionService for SessionService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
 
@@ -26174,7 +26179,7 @@ impl std::fmt::Debug for SiteSearchEngineService {
 
 #[cfg(feature = "site-search-engine-service")]
 impl SiteSearchEngineService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -26185,13 +26190,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn get_site_search_engine(
         &self,
         req: crate::model::GetSiteSearchEngineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SiteSearchEngine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SiteSearchEngine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26277,9 +26282,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26294,13 +26299,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn create_target_site(
         &self,
         req: crate::model::CreateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26386,9 +26391,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26403,13 +26408,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn batch_create_target_sites(
         &self,
         req: crate::model::BatchCreateTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26495,9 +26500,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26512,13 +26517,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn get_target_site(
         &self,
         req: crate::model::GetTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TargetSite>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TargetSite>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -26560,9 +26565,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     "projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26577,13 +26582,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn update_target_site(
         &self,
         req: crate::model::UpdateTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -26625,9 +26630,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     "projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26642,13 +26647,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn delete_target_site(
         &self,
         req: crate::model::DeleteTargetSiteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -26690,9 +26695,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     "projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26707,13 +26712,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn list_target_sites(
         &self,
         req: crate::model::ListTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTargetSitesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTargetSitesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26803,9 +26808,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26820,13 +26825,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn create_sitemap(
         &self,
         req: crate::model::CreateSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -26912,9 +26917,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26929,13 +26934,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn delete_sitemap(
         &self,
         req: crate::model::DeleteSitemapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -26977,9 +26982,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     "projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/sitemaps/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -26994,13 +26999,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn fetch_sitemaps(
         &self,
         req: crate::model::FetchSitemapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchSitemapsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchSitemapsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27110,9 +27115,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27127,13 +27132,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn enable_advanced_site_search(
         &self,
         req: crate::model::EnableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27227,9 +27232,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27244,13 +27249,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn disable_advanced_site_search(
         &self,
         req: crate::model::DisableAdvancedSiteSearchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27344,9 +27349,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27361,13 +27366,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn recrawl_uris(
         &self,
         req: crate::model::RecrawlUrisRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27461,9 +27466,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27478,13 +27483,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn batch_verify_target_sites(
         &self,
         req: crate::model::BatchVerifyTargetSitesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27531,9 +27536,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27548,13 +27553,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn fetch_domain_verification_status(
         &self,
         req: crate::model::FetchDomainVerificationStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchDomainVerificationStatusResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchDomainVerificationStatusResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -27607,9 +27612,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -27624,14 +27629,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -28003,9 +28007,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28020,13 +28024,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -28334,9 +28338,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28351,13 +28355,13 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28533,9 +28537,9 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28544,25 +28548,26 @@ impl super::stub::SiteSearchEngineService for SiteSearchEngineService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -28585,7 +28590,7 @@ impl std::fmt::Debug for UserEventService {
 
 #[cfg(feature = "user-event-service")]
 impl UserEventService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -28596,13 +28601,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn write_user_event(
         &self,
         req: crate::model::WriteUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::UserEvent>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::UserEvent>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28720,9 +28725,9 @@ impl super::stub::UserEventService for UserEventService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28737,13 +28742,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn collect_user_event(
         &self,
         req: crate::model::CollectUserEventRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28885,9 +28890,9 @@ impl super::stub::UserEventService for UserEventService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -28902,13 +28907,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn purge_user_events(
         &self,
         req: crate::model::PurgeUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -28990,9 +28995,9 @@ impl super::stub::UserEventService for UserEventService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29007,13 +29012,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn import_user_events(
         &self,
         req: crate::model::ImportUserEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -29128,9 +29133,9 @@ impl super::stub::UserEventService for UserEventService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29145,14 +29150,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -29524,9 +29528,9 @@ impl super::stub::UserEventService for UserEventService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29541,13 +29545,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -29855,9 +29859,9 @@ impl super::stub::UserEventService for UserEventService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -29872,13 +29876,13 @@ impl super::stub::UserEventService for UserEventService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30054,9 +30058,9 @@ impl super::stub::UserEventService for UserEventService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30065,25 +30069,26 @@ impl super::stub::UserEventService for UserEventService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -30106,7 +30111,7 @@ impl std::fmt::Debug for UserLicenseService {
 
 #[cfg(feature = "user-license-service")]
 impl UserLicenseService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -30117,13 +30122,13 @@ impl super::stub::UserLicenseService for UserLicenseService {
     async fn list_user_licenses(
         &self,
         req: crate::model::ListUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListUserLicensesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListUserLicensesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30167,9 +30172,9 @@ impl super::stub::UserLicenseService for UserLicenseService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30184,13 +30189,13 @@ impl super::stub::UserLicenseService for UserLicenseService {
     async fn batch_update_user_licenses(
         &self,
         req: crate::model::BatchUpdateUserLicensesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -30231,9 +30236,9 @@ impl super::stub::UserLicenseService for UserLicenseService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30248,14 +30253,13 @@ impl super::stub::UserLicenseService for UserLicenseService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -30627,9 +30631,9 @@ impl super::stub::UserLicenseService for UserLicenseService {
                     "projects/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30644,13 +30648,13 @@ impl super::stub::UserLicenseService for UserLicenseService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -30958,9 +30962,9 @@ impl super::stub::UserLicenseService for UserLicenseService {
                     "projects/*/operations/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -30975,13 +30979,13 @@ impl super::stub::UserLicenseService for UserLicenseService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -31157,9 +31161,9 @@ impl super::stub::UserLicenseService for UserLicenseService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -31168,25 +31172,26 @@ impl super::stub::UserLicenseService for UserLicenseService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/dns/v1/Cargo.toml b/src/generated/cloud/dns/v1/Cargo.toml
index 4085797c2b..d3c6f8211a 100644
--- a/src/generated/cloud/dns/v1/Cargo.toml
+++ b/src/generated/cloud/dns/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace      = true
 bytes.workspace            = true
-gax.workspace              = true
 gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
 google-cloud-lro.workspace = true
 lazy_static.workspace      = true
 serde.workspace            = true
diff --git a/src/generated/cloud/dns/v1/src/builder.rs b/src/generated/cloud/dns/v1/src/builder.rs
index 938a731c93..af3ce20b17 100644
--- a/src/generated/cloud/dns/v1/src/builder.rs
+++ b/src/generated/cloud/dns/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod changes {
     /// A builder for [Changes][crate::client::Changes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::changes::ClientBuilder;
     /// # use client::Changes;
@@ -30,19 +30,18 @@ pub mod changes {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Changes;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Changes;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod changes {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Changes>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod changes {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod changes {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::changes::Create;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100,7 +99,7 @@ pub mod changes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110,7 +109,7 @@ pub mod changes {
             (*self.0.stub)
                 .create(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::changes::CreateRequest::client_operation_id].
@@ -163,8 +162,8 @@ pub mod changes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Create {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Create {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -174,7 +173,7 @@ pub mod changes {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::changes::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -200,7 +199,7 @@ pub mod changes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -210,7 +209,7 @@ pub mod changes {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [change_id][crate::model::changes::GetRequest::change_id].
@@ -251,8 +250,8 @@ pub mod changes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -262,8 +261,8 @@ pub mod changes {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::changes::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -292,7 +291,7 @@ pub mod changes {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -302,13 +301,13 @@ pub mod changes {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ChangesListResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ChangesListResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -317,15 +316,17 @@ pub mod changes {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ChangesListResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ChangesListResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -415,8 +416,8 @@ pub mod changes {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -428,7 +429,7 @@ pub mod dns_keys {
     /// A builder for [DnsKeys][crate::client::DnsKeys].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::dns_keys::ClientBuilder;
     /// # use client::DnsKeys;
@@ -438,19 +439,18 @@ pub mod dns_keys {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DnsKeys;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DnsKeys;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -461,7 +461,7 @@ pub mod dns_keys {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DnsKeys>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -472,7 +472,7 @@ pub mod dns_keys {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -482,7 +482,7 @@ pub mod dns_keys {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::dns_keys::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -508,7 +508,7 @@ pub mod dns_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -518,7 +518,7 @@ pub mod dns_keys {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::dns_keys::GetRequest::client_operation_id].
@@ -577,8 +577,8 @@ pub mod dns_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -588,8 +588,8 @@ pub mod dns_keys {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::dns_keys::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -618,7 +618,7 @@ pub mod dns_keys {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -628,13 +628,13 @@ pub mod dns_keys {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::DnsKeysListResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::DnsKeysListResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -643,15 +643,17 @@ pub mod dns_keys {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::DnsKeysListResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::DnsKeysListResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -723,8 +725,8 @@ pub mod dns_keys {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -736,7 +738,7 @@ pub mod managed_zone_operations {
     /// A builder for [ManagedZoneOperations][crate::client::ManagedZoneOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::managed_zone_operations::ClientBuilder;
     /// # use client::ManagedZoneOperations;
@@ -746,19 +748,18 @@ pub mod managed_zone_operations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ManagedZoneOperations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ManagedZoneOperations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -769,7 +770,7 @@ pub mod managed_zone_operations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ManagedZoneOperations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -782,7 +783,7 @@ pub mod managed_zone_operations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -792,7 +793,7 @@ pub mod managed_zone_operations {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zone_operations::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -823,7 +824,7 @@ pub mod managed_zone_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -833,7 +834,7 @@ pub mod managed_zone_operations {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::managed_zone_operations::GetRequest::client_operation_id].
@@ -874,8 +875,8 @@ pub mod managed_zone_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -885,8 +886,8 @@ pub mod managed_zone_operations {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zone_operations::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -920,7 +921,7 @@ pub mod managed_zone_operations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -930,15 +931,15 @@ pub mod managed_zone_operations {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ManagedZoneOperationsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -947,17 +948,17 @@ pub mod managed_zone_operations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ManagedZoneOperationsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1029,8 +1030,8 @@ pub mod managed_zone_operations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1042,7 +1043,7 @@ pub mod managed_zones {
     /// A builder for [ManagedZones][crate::client::ManagedZones].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::managed_zones::ClientBuilder;
     /// # use client::ManagedZones;
@@ -1052,19 +1053,18 @@ pub mod managed_zones {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ManagedZones;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ManagedZones;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1075,7 +1075,7 @@ pub mod managed_zones {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ManagedZones>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1088,7 +1088,7 @@ pub mod managed_zones {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1098,7 +1098,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::Create;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1129,7 +1129,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1139,7 +1139,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .create(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::managed_zones::CreateRequest::client_operation_id].
@@ -1186,8 +1186,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Create {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Create {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1197,7 +1197,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1228,7 +1228,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1238,7 +1238,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::managed_zones::DeleteRequest::client_operation_id].
@@ -1273,8 +1273,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1284,7 +1284,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1315,7 +1315,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1325,7 +1325,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::managed_zones::GetRequest::client_operation_id].
@@ -1360,8 +1360,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1371,7 +1371,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1402,7 +1402,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1412,7 +1412,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][crate::model::managed_zones::GetIamPolicyRequest::resource].
@@ -1441,8 +1441,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1452,8 +1452,8 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1487,7 +1487,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1497,14 +1497,16 @@ pub mod managed_zones {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ManagedZonesListResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ManagedZonesListResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -1512,15 +1514,17 @@ pub mod managed_zones {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ManagedZonesListResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ManagedZonesListResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1586,8 +1590,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1597,7 +1601,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1628,7 +1632,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1638,7 +1642,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `patch`.
@@ -1651,7 +1655,7 @@ pub mod managed_zones {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let managed_zone = self.0.request.managed_zone.clone();
             let query = move |name| {
@@ -1730,8 +1734,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1741,7 +1745,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1772,7 +1776,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1782,7 +1786,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][crate::model::managed_zones::SetIamPolicyRequest::resource].
@@ -1811,8 +1815,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1822,7 +1826,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1855,7 +1859,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1865,7 +1869,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][crate::model::managed_zones::TestIamPermissionsRequest::resource].
@@ -1894,8 +1898,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1905,7 +1909,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1936,7 +1940,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1946,7 +1950,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update`.
@@ -1959,7 +1963,7 @@ pub mod managed_zones {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let project = self.0.request.project.clone();
             let managed_zone = self.0.request.managed_zone.clone();
             let query = move |name| {
@@ -2038,8 +2042,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2049,7 +2053,7 @@ pub mod managed_zones {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::managed_zones::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2080,7 +2084,7 @@ pub mod managed_zones {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2090,7 +2094,7 @@ pub mod managed_zones {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::managed_zone_operations::GetRequest::client_operation_id].
@@ -2131,8 +2135,8 @@ pub mod managed_zones {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2144,7 +2148,7 @@ pub mod policies {
     /// A builder for [Policies][crate::client::Policies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::policies::ClientBuilder;
     /// # use client::Policies;
@@ -2154,19 +2158,18 @@ pub mod policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Policies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Policies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2177,7 +2180,7 @@ pub mod policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Policies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2188,7 +2191,7 @@ pub mod policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2198,7 +2201,7 @@ pub mod policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::policies::Create;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2227,7 +2230,7 @@ pub mod policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2237,7 +2240,7 @@ pub mod policies {
             (*self.0.stub)
                 .create(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::policies::CreateRequest::client_operation_id].
@@ -2284,8 +2287,8 @@ pub mod policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Create {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Create {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2295,7 +2298,7 @@ pub mod policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2324,7 +2327,7 @@ pub mod policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2334,7 +2337,7 @@ pub mod policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::policies::DeleteRequest::client_operation_id].
@@ -2369,8 +2372,8 @@ pub mod policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2380,7 +2383,7 @@ pub mod policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2406,7 +2409,7 @@ pub mod policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2416,7 +2419,7 @@ pub mod policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::policies::GetRequest::client_operation_id].
@@ -2451,8 +2454,8 @@ pub mod policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2462,8 +2465,8 @@ pub mod policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2492,7 +2495,7 @@ pub mod policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2502,13 +2505,13 @@ pub mod policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::PoliciesListResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::PoliciesListResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -2517,15 +2520,17 @@ pub mod policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::PoliciesListResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::PoliciesListResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2573,8 +2578,8 @@ pub mod policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2584,7 +2589,7 @@ pub mod policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2610,7 +2615,7 @@ pub mod policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2620,7 +2625,7 @@ pub mod policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::policies::PatchRequest::client_operation_id].
@@ -2673,8 +2678,8 @@ pub mod policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2684,7 +2689,7 @@ pub mod policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::policies::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2713,7 +2718,7 @@ pub mod policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2723,7 +2728,7 @@ pub mod policies {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::policies::UpdateRequest::client_operation_id].
@@ -2776,8 +2781,8 @@ pub mod policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2789,7 +2794,7 @@ pub mod projects {
     /// A builder for [Projects][crate::client::Projects].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::projects::ClientBuilder;
     /// # use client::Projects;
@@ -2799,19 +2804,18 @@ pub mod projects {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Projects;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Projects;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2822,7 +2826,7 @@ pub mod projects {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Projects>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2833,7 +2837,7 @@ pub mod projects {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2843,7 +2847,7 @@ pub mod projects {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::projects::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2869,7 +2873,7 @@ pub mod projects {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2879,7 +2883,7 @@ pub mod projects {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::projects::GetRequest::client_operation_id].
@@ -2908,8 +2912,8 @@ pub mod projects {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2921,7 +2925,7 @@ pub mod resource_record_sets {
     /// A builder for [ResourceRecordSets][crate::client::ResourceRecordSets].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::resource_record_sets::ClientBuilder;
     /// # use client::ResourceRecordSets;
@@ -2931,19 +2935,18 @@ pub mod resource_record_sets {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ResourceRecordSets;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ResourceRecordSets;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2954,7 +2957,7 @@ pub mod resource_record_sets {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ResourceRecordSets>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2967,7 +2970,7 @@ pub mod resource_record_sets {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2977,7 +2980,7 @@ pub mod resource_record_sets {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::resource_record_sets::Create;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3008,7 +3011,7 @@ pub mod resource_record_sets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3018,7 +3021,7 @@ pub mod resource_record_sets {
             (*self.0.stub)
                 .create(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::resource_record_sets::CreateRequest::client_operation_id].
@@ -3071,8 +3074,8 @@ pub mod resource_record_sets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Create {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Create {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3082,7 +3085,7 @@ pub mod resource_record_sets {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::resource_record_sets::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3113,7 +3116,7 @@ pub mod resource_record_sets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3123,7 +3126,7 @@ pub mod resource_record_sets {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::resource_record_sets::DeleteRequest::client_operation_id].
@@ -3170,8 +3173,8 @@ pub mod resource_record_sets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3181,7 +3184,7 @@ pub mod resource_record_sets {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::resource_record_sets::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3212,7 +3215,7 @@ pub mod resource_record_sets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3222,7 +3225,7 @@ pub mod resource_record_sets {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::resource_record_sets::GetRequest::client_operation_id].
@@ -3269,8 +3272,8 @@ pub mod resource_record_sets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3280,8 +3283,8 @@ pub mod resource_record_sets {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::resource_record_sets::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3315,7 +3318,7 @@ pub mod resource_record_sets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3325,15 +3328,15 @@ pub mod resource_record_sets {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ResourceRecordSetsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -3342,17 +3345,17 @@ pub mod resource_record_sets {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ResourceRecordSetsListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3442,8 +3445,8 @@ pub mod resource_record_sets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3453,7 +3456,7 @@ pub mod resource_record_sets {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::resource_record_sets::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3484,7 +3487,7 @@ pub mod resource_record_sets {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3494,7 +3497,7 @@ pub mod resource_record_sets {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::resource_record_sets::PatchRequest::client_operation_id].
@@ -3559,8 +3562,8 @@ pub mod resource_record_sets {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3572,7 +3575,7 @@ pub mod response_policies {
     /// A builder for [ResponsePolicies][crate::client::ResponsePolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::response_policies::ClientBuilder;
     /// # use client::ResponsePolicies;
@@ -3582,19 +3585,18 @@ pub mod response_policies {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ResponsePolicies;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ResponsePolicies;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3605,7 +3607,7 @@ pub mod response_policies {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ResponsePolicies>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3618,7 +3620,7 @@ pub mod response_policies {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3628,7 +3630,7 @@ pub mod response_policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policies::Create;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3659,7 +3661,7 @@ pub mod response_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3669,7 +3671,7 @@ pub mod response_policies {
             (*self.0.stub)
                 .create(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policies::CreateRequest::client_operation_id].
@@ -3716,8 +3718,8 @@ pub mod response_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Create {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Create {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3727,7 +3729,7 @@ pub mod response_policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policies::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3758,7 +3760,7 @@ pub mod response_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3768,7 +3770,7 @@ pub mod response_policies {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policies::DeleteRequest::client_operation_id].
@@ -3803,8 +3805,8 @@ pub mod response_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3814,7 +3816,7 @@ pub mod response_policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policies::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3845,7 +3847,7 @@ pub mod response_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3855,7 +3857,7 @@ pub mod response_policies {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policies::GetRequest::client_operation_id].
@@ -3890,8 +3892,8 @@ pub mod response_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3901,8 +3903,8 @@ pub mod response_policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policies::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3936,7 +3938,7 @@ pub mod response_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3946,14 +3948,16 @@ pub mod response_policies {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ResponsePoliciesListResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ResponsePoliciesListResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
             let execute = move |token: String| {
@@ -3961,17 +3965,17 @@ pub mod response_policies {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ResponsePoliciesListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4019,8 +4023,8 @@ pub mod response_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4030,7 +4034,7 @@ pub mod response_policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policies::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4061,7 +4065,7 @@ pub mod response_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4071,7 +4075,7 @@ pub mod response_policies {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policies::PatchRequest::client_operation_id].
@@ -4124,8 +4128,8 @@ pub mod response_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4135,7 +4139,7 @@ pub mod response_policies {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policies::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4166,7 +4170,7 @@ pub mod response_policies {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4176,7 +4180,7 @@ pub mod response_policies {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policies::UpdateRequest::client_operation_id].
@@ -4229,8 +4233,8 @@ pub mod response_policies {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4242,7 +4246,7 @@ pub mod response_policy_rules {
     /// A builder for [ResponsePolicyRules][crate::client::ResponsePolicyRules].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::*;
     /// # use builder::response_policy_rules::ClientBuilder;
     /// # use client::ResponsePolicyRules;
@@ -4252,19 +4256,18 @@ pub mod response_policy_rules {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ResponsePolicyRules;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ResponsePolicyRules;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4275,7 +4278,7 @@ pub mod response_policy_rules {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ResponsePolicyRules>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4288,7 +4291,7 @@ pub mod response_policy_rules {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4298,7 +4301,7 @@ pub mod response_policy_rules {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policy_rules::Create;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4329,7 +4332,7 @@ pub mod response_policy_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4339,7 +4342,7 @@ pub mod response_policy_rules {
             (*self.0.stub)
                 .create(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policy_rules::CreateRequest::client_operation_id].
@@ -4392,8 +4395,8 @@ pub mod response_policy_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Create {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Create {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4403,7 +4406,7 @@ pub mod response_policy_rules {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policy_rules::Delete;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4434,7 +4437,7 @@ pub mod response_policy_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4444,7 +4447,7 @@ pub mod response_policy_rules {
             (*self.0.stub)
                 .delete(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policy_rules::DeleteRequest::client_operation_id].
@@ -4485,8 +4488,8 @@ pub mod response_policy_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Delete {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Delete {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4496,7 +4499,7 @@ pub mod response_policy_rules {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policy_rules::Get;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4527,7 +4530,7 @@ pub mod response_policy_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4537,7 +4540,7 @@ pub mod response_policy_rules {
             (*self.0.stub)
                 .get(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policy_rules::GetRequest::client_operation_id].
@@ -4578,8 +4581,8 @@ pub mod response_policy_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Get {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Get {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4589,8 +4592,8 @@ pub mod response_policy_rules {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policy_rules::List;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4624,7 +4627,7 @@ pub mod response_policy_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4634,15 +4637,15 @@ pub mod response_policy_rules {
             (*self.0.stub)
                 .list(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ResponsePolicyRulesListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -4651,17 +4654,17 @@ pub mod response_policy_rules {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ResponsePolicyRulesListResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4715,8 +4718,8 @@ pub mod response_policy_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for List {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for List {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4726,7 +4729,7 @@ pub mod response_policy_rules {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policy_rules::Patch;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4757,7 +4760,7 @@ pub mod response_policy_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4767,7 +4770,7 @@ pub mod response_policy_rules {
             (*self.0.stub)
                 .patch(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policy_rules::PatchRequest::client_operation_id].
@@ -4826,8 +4829,8 @@ pub mod response_policy_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Patch {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Patch {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4837,7 +4840,7 @@ pub mod response_policy_rules {
     /// # Example
     /// ```
     /// # use google_cloud_dns_v1::builder::response_policy_rules::Update;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_dns_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4868,7 +4871,7 @@ pub mod response_policy_rules {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4878,7 +4881,7 @@ pub mod response_policy_rules {
             (*self.0.stub)
                 .update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [client_operation_id][crate::model::response_policy_rules::UpdateRequest::client_operation_id].
@@ -4937,8 +4940,8 @@ pub mod response_policy_rules {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Update {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Update {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/dns/v1/src/client.rs b/src/generated/cloud/dns/v1/src/client.rs
index 40fda25a18..76c55ba6e3 100644
--- a/src/generated/cloud/dns/v1/src/client.rs
+++ b/src/generated/cloud/dns/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::Changes;
 /// let client = Changes::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -66,13 +66,13 @@ impl Changes {
     /// Returns a builder for [Changes].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::Changes;
     /// let client = Changes::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::changes::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::changes::client::Factory)
+        crate::new_client_builder(super::builder::changes::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Changes {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Changes>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Changes>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Changes {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Changes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Changes> {
         super::transport::Changes::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Changes> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Changes> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Changes::new)
@@ -138,7 +138,7 @@ impl Changes {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::DnsKeys;
 /// let client = DnsKeys::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -184,13 +184,13 @@ impl DnsKeys {
     /// Returns a builder for [DnsKeys].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::DnsKeys;
     /// let client = DnsKeys::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dns_keys::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::dns_keys::client::Factory)
+        crate::new_client_builder(super::builder::dns_keys::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -208,14 +208,14 @@ impl DnsKeys {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DnsKeys>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DnsKeys>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -224,13 +224,13 @@ impl DnsKeys {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DnsKeys> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DnsKeys> {
         super::transport::DnsKeys::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DnsKeys> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DnsKeys> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DnsKeys::new)
@@ -251,7 +251,7 @@ impl DnsKeys {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::ManagedZoneOperations;
 /// let client = ManagedZoneOperations::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -297,15 +297,13 @@ impl ManagedZoneOperations {
     /// Returns a builder for [ManagedZoneOperations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::ManagedZoneOperations;
     /// let client = ManagedZoneOperations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::managed_zone_operations::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::managed_zone_operations::client::Factory,
-        )
+        crate::new_client_builder(super::builder::managed_zone_operations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -323,14 +321,14 @@ impl ManagedZoneOperations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ManagedZoneOperations>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ManagedZoneOperations>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -340,13 +338,13 @@ impl ManagedZoneOperations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedZoneOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedZoneOperations> {
         super::transport::ManagedZoneOperations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedZoneOperations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedZoneOperations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ManagedZoneOperations::new)
@@ -367,7 +365,7 @@ impl ManagedZoneOperations {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::ManagedZones;
 /// let client = ManagedZones::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -413,13 +411,13 @@ impl ManagedZones {
     /// Returns a builder for [ManagedZones].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::ManagedZones;
     /// let client = ManagedZones::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::managed_zones::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::managed_zones::client::Factory)
+        crate::new_client_builder(super::builder::managed_zones::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -437,14 +435,14 @@ impl ManagedZones {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ManagedZones>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ManagedZones>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -453,13 +451,13 @@ impl ManagedZones {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedZones> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedZones> {
         super::transport::ManagedZones::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedZones> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedZones> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ManagedZones::new)
@@ -520,7 +518,7 @@ impl ManagedZones {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::Policies;
 /// let client = Policies::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -566,13 +564,13 @@ impl Policies {
     /// Returns a builder for [Policies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::Policies;
     /// let client = Policies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::policies::client::Factory)
+        crate::new_client_builder(super::builder::policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -590,14 +588,14 @@ impl Policies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Policies>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Policies>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -606,13 +604,13 @@ impl Policies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Policies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Policies> {
         super::transport::Policies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Policies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Policies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Policies::new)
@@ -653,7 +651,7 @@ impl Policies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::Projects;
 /// let client = Projects::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -699,13 +697,13 @@ impl Projects {
     /// Returns a builder for [Projects].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::Projects;
     /// let client = Projects::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::projects::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::projects::client::Factory)
+        crate::new_client_builder(super::builder::projects::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -723,14 +721,14 @@ impl Projects {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Projects>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Projects>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -739,13 +737,13 @@ impl Projects {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Projects> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Projects> {
         super::transport::Projects::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Projects> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Projects> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Projects::new)
@@ -761,7 +759,7 @@ impl Projects {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::ResourceRecordSets;
 /// let client = ResourceRecordSets::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -807,15 +805,13 @@ impl ResourceRecordSets {
     /// Returns a builder for [ResourceRecordSets].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::ResourceRecordSets;
     /// let client = ResourceRecordSets::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::resource_record_sets::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::resource_record_sets::client::Factory,
-        )
+        crate::new_client_builder(super::builder::resource_record_sets::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -833,14 +829,14 @@ impl ResourceRecordSets {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ResourceRecordSets>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ResourceRecordSets>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -850,13 +846,13 @@ impl ResourceRecordSets {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResourceRecordSets> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResourceRecordSets> {
         super::transport::ResourceRecordSets::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResourceRecordSets> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResourceRecordSets> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ResourceRecordSets::new)
@@ -892,7 +888,7 @@ impl ResourceRecordSets {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::ResponsePolicies;
 /// let client = ResponsePolicies::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -938,15 +934,13 @@ impl ResponsePolicies {
     /// Returns a builder for [ResponsePolicies].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::ResponsePolicies;
     /// let client = ResponsePolicies::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::response_policies::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::response_policies::client::Factory,
-        )
+        crate::new_client_builder(super::builder::response_policies::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -964,14 +958,14 @@ impl ResponsePolicies {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ResponsePolicies>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ResponsePolicies>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -981,13 +975,13 @@ impl ResponsePolicies {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResponsePolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResponsePolicies> {
         super::transport::ResponsePolicies::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResponsePolicies> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResponsePolicies> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ResponsePolicies::new)
@@ -1028,7 +1022,7 @@ impl ResponsePolicies {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_dns_v1::client::ResponsePolicyRules;
 /// let client = ResponsePolicyRules::builder().build().await?;
 /// // use `client` to make requests to the Cloud DNS API.
@@ -1074,15 +1068,13 @@ impl ResponsePolicyRules {
     /// Returns a builder for [ResponsePolicyRules].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_dns_v1::client::ResponsePolicyRules;
     /// let client = ResponsePolicyRules::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::response_policy_rules::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::response_policy_rules::client::Factory,
-        )
+        crate::new_client_builder(super::builder::response_policy_rules::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1100,14 +1092,14 @@ impl ResponsePolicyRules {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ResponsePolicyRules>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ResponsePolicyRules>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1117,13 +1109,13 @@ impl ResponsePolicyRules {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResponsePolicyRules> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResponsePolicyRules> {
         super::transport::ResponsePolicyRules::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ResponsePolicyRules> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ResponsePolicyRules> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ResponsePolicyRules::new)
diff --git a/src/generated/cloud/dns/v1/src/lib.rs b/src/generated/cloud/dns/v1/src/lib.rs
index e547ea1661..3f40466ee7 100644
--- a/src/generated/cloud/dns/v1/src/lib.rs
+++ b/src/generated/cloud/dns/v1/src/lib.rs
@@ -54,8 +54,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -91,4 +91,13 @@ pub(crate) mod info {
     }
 }
 
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
+
 pub mod operation;
diff --git a/src/generated/cloud/dns/v1/src/model.rs b/src/generated/cloud/dns/v1/src/model.rs
index 599783cd32..648b4bb4d4 100644
--- a/src/generated/cloud/dns/v1/src/model.rs
+++ b/src/generated/cloud/dns/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_lro;
 extern crate lazy_static;
 extern crate serde;
@@ -515,7 +515,7 @@ impl wkt::message::Message for ChangesListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ChangesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ChangesListResponse {
     type PageItem = crate::model::Change;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1957,7 +1957,7 @@ impl wkt::message::Message for DnsKeysListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for DnsKeysListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for DnsKeysListResponse {
     type PageItem = crate::model::DnsKey;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4684,7 +4684,7 @@ impl wkt::message::Message for ManagedZoneOperationsListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ManagedZoneOperationsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ManagedZoneOperationsListResponse {
     type PageItem = crate::model::Operation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5544,7 +5544,7 @@ impl wkt::message::Message for ManagedZonesListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ManagedZonesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ManagedZonesListResponse {
     type PageItem = crate::model::ManagedZone;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6274,7 +6274,7 @@ impl wkt::message::Message for PoliciesListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for PoliciesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for PoliciesListResponse {
     type PageItem = crate::model::Policy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10275,7 +10275,7 @@ impl wkt::message::Message for ResourceRecordSetsListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ResourceRecordSetsListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ResourceRecordSetsListResponse {
     type PageItem = crate::model::ResourceRecordSet;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10366,7 +10366,7 @@ impl wkt::message::Message for ResponsePoliciesListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ResponsePoliciesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ResponsePoliciesListResponse {
     type PageItem = crate::model::ResponsePolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11326,7 +11326,7 @@ impl wkt::message::Message for ResponsePolicyRulesListResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ResponsePolicyRulesListResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ResponsePolicyRulesListResponse {
     type PageItem = crate::model::ResponsePolicyRule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/dns/v1/src/stub.rs b/src/generated/cloud/dns/v1/src/stub.rs
index 473e856a9a..91323cd8ad 100644
--- a/src/generated/cloud/dns/v1/src/stub.rs
+++ b/src/generated/cloud/dns/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait Changes: std::fmt::Debug + Send + Sync {
     fn create(
         &self,
         _req: crate::model::changes::CreateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Change>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Change>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait Changes: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::changes::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Change>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Change>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +62,9 @@ pub trait Changes: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::changes::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ChangesListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ChangesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,10 +86,9 @@ pub trait DnsKeys: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::dns_keys::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DnsKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::DnsKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -99,9 +96,9 @@ pub trait DnsKeys: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::dns_keys::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DnsKeysListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DnsKeysListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,10 +120,9 @@ pub trait ManagedZoneOperations: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::managed_zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -134,11 +130,9 @@ pub trait ManagedZoneOperations: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::managed_zone_operations::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ManagedZoneOperationsListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ManagedZoneOperationsListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -160,10 +154,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn create(
         &self,
         _req: crate::model::managed_zones::CreateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ManagedZone>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ManagedZone>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -171,8 +164,8 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::managed_zones::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -180,10 +173,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::managed_zones::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ManagedZone>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ManagedZone>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -191,9 +183,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: crate::model::managed_zones::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GoogleIamV1Policy>>,
+        Output = crate::Result<crate::Response<crate::model::GoogleIamV1Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -202,9 +194,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::managed_zones::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ManagedZonesListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ManagedZonesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -213,10 +205,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::managed_zones::PatchRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -224,9 +215,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: crate::model::managed_zones::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GoogleIamV1Policy>>,
+        Output = crate::Result<crate::Response<crate::model::GoogleIamV1Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -235,10 +226,10 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: crate::model::managed_zones::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>,
+            crate::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -248,10 +239,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::managed_zones::UpdateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -259,10 +249,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: crate::model::managed_zone_operations::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Operation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Operation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -272,9 +261,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -283,9 +272,9 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -305,10 +294,9 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     fn create(
         &self,
         _req: crate::model::policies::CreateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -316,8 +304,8 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -325,10 +313,9 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::policies::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Policy>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Policy>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -336,9 +323,9 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PoliciesListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PoliciesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -347,9 +334,9 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::policies::PatchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PoliciesPatchResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PoliciesPatchResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -358,9 +345,9 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::policies::UpdateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PoliciesUpdateResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PoliciesUpdateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -382,10 +369,9 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::projects::GetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Project>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Project>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
@@ -406,9 +392,9 @@ pub trait ResourceRecordSets: std::fmt::Debug + Send + Sync {
     fn create(
         &self,
         _req: crate::model::resource_record_sets::CreateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceRecordSet>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceRecordSet>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -417,11 +403,9 @@ pub trait ResourceRecordSets: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::resource_record_sets::DeleteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResourceRecordSetsDeleteResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResourceRecordSetsDeleteResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -430,9 +414,9 @@ pub trait ResourceRecordSets: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::resource_record_sets::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceRecordSet>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceRecordSet>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -441,11 +425,9 @@ pub trait ResourceRecordSets: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::resource_record_sets::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResourceRecordSetsListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResourceRecordSetsListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -454,9 +436,9 @@ pub trait ResourceRecordSets: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::resource_record_sets::PatchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceRecordSet>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceRecordSet>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -478,9 +460,9 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     fn create(
         &self,
         _req: crate::model::response_policies::CreateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResponsePolicy>>,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -489,8 +471,8 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::response_policies::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -498,9 +480,9 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::response_policies::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResponsePolicy>>,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -509,9 +491,9 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::response_policies::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResponsePoliciesListResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ResponsePoliciesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -520,11 +502,9 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::response_policies::PatchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResponsePoliciesPatchResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResponsePoliciesPatchResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -533,11 +513,9 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::response_policies::UpdateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResponsePoliciesUpdateResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResponsePoliciesUpdateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -559,9 +537,9 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     fn create(
         &self,
         _req: crate::model::response_policy_rules::CreateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResponsePolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -570,8 +548,8 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     fn delete(
         &self,
         _req: crate::model::response_policy_rules::DeleteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -579,9 +557,9 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     fn get(
         &self,
         _req: crate::model::response_policy_rules::GetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResponsePolicyRule>>,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicyRule>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -590,11 +568,9 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     fn list(
         &self,
         _req: crate::model::response_policy_rules::ListRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResponsePolicyRulesListResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicyRulesListResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -603,11 +579,9 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     fn patch(
         &self,
         _req: crate::model::response_policy_rules::PatchRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResponsePolicyRulesPatchResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicyRulesPatchResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -616,11 +590,9 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     fn update(
         &self,
         _req: crate::model::response_policy_rules::UpdateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ResponsePolicyRulesUpdateResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ResponsePolicyRulesUpdateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/dns/v1/src/stub/dynamic.rs b/src/generated/cloud/dns/v1/src/stub/dynamic.rs
index cfb2506ba2..f742870e03 100644
--- a/src/generated/cloud/dns/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/dns/v1/src/stub/dynamic.rs
@@ -20,20 +20,20 @@ pub trait Changes: std::fmt::Debug + Send + Sync {
     async fn create(
         &self,
         req: crate::model::changes::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Change>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Change>>;
 
     async fn get(
         &self,
         req: crate::model::changes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Change>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Change>>;
 
     async fn list(
         &self,
         req: crate::model::changes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ChangesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ChangesListResponse>>;
 }
 
 /// All implementations of [super::Changes] also implement [Changes].
@@ -43,8 +43,8 @@ impl<T: super::Changes> Changes for T {
     async fn create(
         &self,
         req: crate::model::changes::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Change>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Change>> {
         T::create(self, req, options).await
     }
 
@@ -52,8 +52,8 @@ impl<T: super::Changes> Changes for T {
     async fn get(
         &self,
         req: crate::model::changes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Change>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Change>> {
         T::get(self, req, options).await
     }
 
@@ -61,8 +61,8 @@ impl<T: super::Changes> Changes for T {
     async fn list(
         &self,
         req: crate::model::changes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ChangesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ChangesListResponse>> {
         T::list(self, req, options).await
     }
 }
@@ -73,14 +73,14 @@ pub trait DnsKeys: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::dns_keys::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DnsKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DnsKey>>;
 
     async fn list(
         &self,
         req: crate::model::dns_keys::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DnsKeysListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DnsKeysListResponse>>;
 }
 
 /// All implementations of [super::DnsKeys] also implement [DnsKeys].
@@ -90,8 +90,8 @@ impl<T: super::DnsKeys> DnsKeys for T {
     async fn get(
         &self,
         req: crate::model::dns_keys::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DnsKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DnsKey>> {
         T::get(self, req, options).await
     }
 
@@ -99,8 +99,8 @@ impl<T: super::DnsKeys> DnsKeys for T {
     async fn list(
         &self,
         req: crate::model::dns_keys::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DnsKeysListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DnsKeysListResponse>> {
         T::list(self, req, options).await
     }
 }
@@ -111,14 +111,14 @@ pub trait ManagedZoneOperations: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn list(
         &self,
         req: crate::model::managed_zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZoneOperationsListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZoneOperationsListResponse>>;
 }
 
 /// All implementations of [super::ManagedZoneOperations] also implement [ManagedZoneOperations].
@@ -128,8 +128,8 @@ impl<T: super::ManagedZoneOperations> ManagedZoneOperations for T {
     async fn get(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get(self, req, options).await
     }
 
@@ -137,9 +137,8 @@ impl<T: super::ManagedZoneOperations> ManagedZoneOperations for T {
     async fn list(
         &self,
         req: crate::model::managed_zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZoneOperationsListResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZoneOperationsListResponse>> {
         T::list(self, req, options).await
     }
 }
@@ -150,72 +149,72 @@ pub trait ManagedZones: std::fmt::Debug + Send + Sync {
     async fn create(
         &self,
         req: crate::model::managed_zones::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZone>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZone>>;
 
     async fn delete(
         &self,
         req: crate::model::managed_zones::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::managed_zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZone>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZone>>;
 
     async fn get_iam_policy(
         &self,
         req: crate::model::managed_zones::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleIamV1Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleIamV1Policy>>;
 
     async fn list(
         &self,
         req: crate::model::managed_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZonesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZonesListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::managed_zones::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn set_iam_policy(
         &self,
         req: crate::model::managed_zones::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleIamV1Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleIamV1Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: crate::model::managed_zones::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>>;
 
     async fn update(
         &self,
         req: crate::model::managed_zones::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     async fn get_operation(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ManagedZones] also implement [ManagedZones].
@@ -225,8 +224,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn create(
         &self,
         req: crate::model::managed_zones::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZone>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZone>> {
         T::create(self, req, options).await
     }
 
@@ -234,8 +233,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn delete(
         &self,
         req: crate::model::managed_zones::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -243,8 +242,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn get(
         &self,
         req: crate::model::managed_zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZone>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZone>> {
         T::get(self, req, options).await
     }
 
@@ -252,8 +251,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn get_iam_policy(
         &self,
         req: crate::model::managed_zones::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleIamV1Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleIamV1Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -261,8 +260,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn list(
         &self,
         req: crate::model::managed_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ManagedZonesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ManagedZonesListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -270,8 +269,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn patch(
         &self,
         req: crate::model::managed_zones::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::patch(self, req, options).await
     }
 
@@ -279,8 +278,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn set_iam_policy(
         &self,
         req: crate::model::managed_zones::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleIamV1Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleIamV1Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -288,9 +287,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn test_iam_permissions(
         &self,
         req: crate::model::managed_zones::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>> {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn update(
         &self,
         req: crate::model::managed_zones::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::update(self, req, options).await
     }
 
@@ -307,22 +305,22 @@ impl<T: super::ManagedZones> ManagedZones for T {
     async fn get_operation(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -333,38 +331,38 @@ pub trait Policies: std::fmt::Debug + Send + Sync {
     async fn create(
         &self,
         req: crate::model::policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn delete(
         &self,
         req: crate::model::policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>>;
 
     async fn list(
         &self,
         req: crate::model::policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PoliciesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PoliciesListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PoliciesPatchResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PoliciesPatchResponse>>;
 
     async fn update(
         &self,
         req: crate::model::policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PoliciesUpdateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PoliciesUpdateResponse>>;
 }
 
 /// All implementations of [super::Policies] also implement [Policies].
@@ -374,8 +372,8 @@ impl<T: super::Policies> Policies for T {
     async fn create(
         &self,
         req: crate::model::policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::create(self, req, options).await
     }
 
@@ -383,8 +381,8 @@ impl<T: super::Policies> Policies for T {
     async fn delete(
         &self,
         req: crate::model::policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -392,8 +390,8 @@ impl<T: super::Policies> Policies for T {
     async fn get(
         &self,
         req: crate::model::policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Policy>> {
         T::get(self, req, options).await
     }
 
@@ -401,8 +399,8 @@ impl<T: super::Policies> Policies for T {
     async fn list(
         &self,
         req: crate::model::policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PoliciesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PoliciesListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -410,8 +408,8 @@ impl<T: super::Policies> Policies for T {
     async fn patch(
         &self,
         req: crate::model::policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PoliciesPatchResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PoliciesPatchResponse>> {
         T::patch(self, req, options).await
     }
 
@@ -419,8 +417,8 @@ impl<T: super::Policies> Policies for T {
     async fn update(
         &self,
         req: crate::model::policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PoliciesUpdateResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PoliciesUpdateResponse>> {
         T::update(self, req, options).await
     }
 }
@@ -431,8 +429,8 @@ pub trait Projects: std::fmt::Debug + Send + Sync {
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Project>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Project>>;
 }
 
 /// All implementations of [super::Projects] also implement [Projects].
@@ -442,8 +440,8 @@ impl<T: super::Projects> Projects for T {
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Project>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Project>> {
         T::get(self, req, options).await
     }
 }
@@ -454,32 +452,32 @@ pub trait ResourceRecordSets: std::fmt::Debug + Send + Sync {
     async fn create(
         &self,
         req: crate::model::resource_record_sets::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSet>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSet>>;
 
     async fn delete(
         &self,
         req: crate::model::resource_record_sets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSetsDeleteResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSetsDeleteResponse>>;
 
     async fn get(
         &self,
         req: crate::model::resource_record_sets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSet>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSet>>;
 
     async fn list(
         &self,
         req: crate::model::resource_record_sets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSetsListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSetsListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::resource_record_sets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSet>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSet>>;
 }
 
 /// All implementations of [super::ResourceRecordSets] also implement [ResourceRecordSets].
@@ -489,8 +487,8 @@ impl<T: super::ResourceRecordSets> ResourceRecordSets for T {
     async fn create(
         &self,
         req: crate::model::resource_record_sets::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSet>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSet>> {
         T::create(self, req, options).await
     }
 
@@ -498,9 +496,8 @@ impl<T: super::ResourceRecordSets> ResourceRecordSets for T {
     async fn delete(
         &self,
         req: crate::model::resource_record_sets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSetsDeleteResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSetsDeleteResponse>> {
         T::delete(self, req, options).await
     }
 
@@ -508,8 +505,8 @@ impl<T: super::ResourceRecordSets> ResourceRecordSets for T {
     async fn get(
         &self,
         req: crate::model::resource_record_sets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSet>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSet>> {
         T::get(self, req, options).await
     }
 
@@ -517,8 +514,8 @@ impl<T: super::ResourceRecordSets> ResourceRecordSets for T {
     async fn list(
         &self,
         req: crate::model::resource_record_sets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSetsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSetsListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -526,8 +523,8 @@ impl<T: super::ResourceRecordSets> ResourceRecordSets for T {
     async fn patch(
         &self,
         req: crate::model::resource_record_sets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceRecordSet>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceRecordSet>> {
         T::patch(self, req, options).await
     }
 }
@@ -538,38 +535,38 @@ pub trait ResponsePolicies: std::fmt::Debug + Send + Sync {
     async fn create(
         &self,
         req: crate::model::response_policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicy>>;
 
     async fn delete(
         &self,
         req: crate::model::response_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::response_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicy>>;
 
     async fn list(
         &self,
         req: crate::model::response_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePoliciesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePoliciesListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::response_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePoliciesPatchResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePoliciesPatchResponse>>;
 
     async fn update(
         &self,
         req: crate::model::response_policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePoliciesUpdateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePoliciesUpdateResponse>>;
 }
 
 /// All implementations of [super::ResponsePolicies] also implement [ResponsePolicies].
@@ -579,8 +576,8 @@ impl<T: super::ResponsePolicies> ResponsePolicies for T {
     async fn create(
         &self,
         req: crate::model::response_policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicy>> {
         T::create(self, req, options).await
     }
 
@@ -588,8 +585,8 @@ impl<T: super::ResponsePolicies> ResponsePolicies for T {
     async fn delete(
         &self,
         req: crate::model::response_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -597,8 +594,8 @@ impl<T: super::ResponsePolicies> ResponsePolicies for T {
     async fn get(
         &self,
         req: crate::model::response_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicy>> {
         T::get(self, req, options).await
     }
 
@@ -606,8 +603,8 @@ impl<T: super::ResponsePolicies> ResponsePolicies for T {
     async fn list(
         &self,
         req: crate::model::response_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePoliciesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePoliciesListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -615,8 +612,8 @@ impl<T: super::ResponsePolicies> ResponsePolicies for T {
     async fn patch(
         &self,
         req: crate::model::response_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePoliciesPatchResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePoliciesPatchResponse>> {
         T::patch(self, req, options).await
     }
 
@@ -624,8 +621,8 @@ impl<T: super::ResponsePolicies> ResponsePolicies for T {
     async fn update(
         &self,
         req: crate::model::response_policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePoliciesUpdateResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePoliciesUpdateResponse>> {
         T::update(self, req, options).await
     }
 }
@@ -636,38 +633,38 @@ pub trait ResponsePolicyRules: std::fmt::Debug + Send + Sync {
     async fn create(
         &self,
         req: crate::model::response_policy_rules::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRule>>;
 
     async fn delete(
         &self,
         req: crate::model::response_policy_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get(
         &self,
         req: crate::model::response_policy_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRule>>;
 
     async fn list(
         &self,
         req: crate::model::response_policy_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRulesListResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRulesListResponse>>;
 
     async fn patch(
         &self,
         req: crate::model::response_policy_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRulesPatchResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRulesPatchResponse>>;
 
     async fn update(
         &self,
         req: crate::model::response_policy_rules::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRulesUpdateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRulesUpdateResponse>>;
 }
 
 /// All implementations of [super::ResponsePolicyRules] also implement [ResponsePolicyRules].
@@ -677,8 +674,8 @@ impl<T: super::ResponsePolicyRules> ResponsePolicyRules for T {
     async fn create(
         &self,
         req: crate::model::response_policy_rules::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRule>> {
         T::create(self, req, options).await
     }
 
@@ -686,8 +683,8 @@ impl<T: super::ResponsePolicyRules> ResponsePolicyRules for T {
     async fn delete(
         &self,
         req: crate::model::response_policy_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete(self, req, options).await
     }
 
@@ -695,8 +692,8 @@ impl<T: super::ResponsePolicyRules> ResponsePolicyRules for T {
     async fn get(
         &self,
         req: crate::model::response_policy_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRule>> {
         T::get(self, req, options).await
     }
 
@@ -704,8 +701,8 @@ impl<T: super::ResponsePolicyRules> ResponsePolicyRules for T {
     async fn list(
         &self,
         req: crate::model::response_policy_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRulesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRulesListResponse>> {
         T::list(self, req, options).await
     }
 
@@ -713,9 +710,8 @@ impl<T: super::ResponsePolicyRules> ResponsePolicyRules for T {
     async fn patch(
         &self,
         req: crate::model::response_policy_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRulesPatchResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRulesPatchResponse>> {
         T::patch(self, req, options).await
     }
 
@@ -723,9 +719,8 @@ impl<T: super::ResponsePolicyRules> ResponsePolicyRules for T {
     async fn update(
         &self,
         req: crate::model::response_policy_rules::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResponsePolicyRulesUpdateResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResponsePolicyRulesUpdateResponse>> {
         T::update(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/dns/v1/src/tracing.rs b/src/generated/cloud/dns/v1/src/tracing.rs
index 7dfd112e3e..59320edd21 100644
--- a/src/generated/cloud/dns/v1/src/tracing.rs
+++ b/src/generated/cloud/dns/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create(
         &self,
         req: crate::model::changes::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Change>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Change>> {
         self.inner.create(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get(
         &self,
         req: crate::model::changes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Change>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Change>> {
         self.inner.get(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list(
         &self,
         req: crate::model::changes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ChangesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ChangesListResponse>> {
         self.inner.list(req, options).await
     }
 }
@@ -91,8 +91,8 @@ where
     async fn get(
         &self,
         req: crate::model::dns_keys::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DnsKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DnsKey>> {
         self.inner.get(req, options).await
     }
 
@@ -100,8 +100,8 @@ where
     async fn list(
         &self,
         req: crate::model::dns_keys::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DnsKeysListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DnsKeysListResponse>> {
         self.inner.list(req, options).await
     }
 }
@@ -132,8 +132,8 @@ where
     async fn get(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get(req, options).await
     }
 
@@ -141,8 +141,8 @@ where
     async fn list(
         &self,
         req: crate::model::managed_zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZoneOperationsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZoneOperationsListResponse>> {
         self.inner.list(req, options).await
     }
 }
@@ -173,8 +173,8 @@ where
     async fn create(
         &self,
         req: crate::model::managed_zones::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZone>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZone>> {
         self.inner.create(req, options).await
     }
 
@@ -182,8 +182,8 @@ where
     async fn delete(
         &self,
         req: crate::model::managed_zones::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -191,8 +191,8 @@ where
     async fn get(
         &self,
         req: crate::model::managed_zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZone>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZone>> {
         self.inner.get(req, options).await
     }
 
@@ -200,8 +200,8 @@ where
     async fn get_iam_policy(
         &self,
         req: crate::model::managed_zones::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleIamV1Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleIamV1Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -209,8 +209,8 @@ where
     async fn list(
         &self,
         req: crate::model::managed_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZonesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZonesListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -218,8 +218,8 @@ where
     async fn patch(
         &self,
         req: crate::model::managed_zones::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.patch(req, options).await
     }
 
@@ -227,8 +227,8 @@ where
     async fn set_iam_policy(
         &self,
         req: crate::model::managed_zones::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleIamV1Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleIamV1Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -236,8 +236,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: crate::model::managed_zones::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -245,8 +245,8 @@ where
     async fn update(
         &self,
         req: crate::model::managed_zones::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.update(req, options).await
     }
 
@@ -254,22 +254,22 @@ where
     async fn get_operation(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -300,8 +300,8 @@ where
     async fn create(
         &self,
         req: crate::model::policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.create(req, options).await
     }
 
@@ -309,8 +309,8 @@ where
     async fn delete(
         &self,
         req: crate::model::policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -318,8 +318,8 @@ where
     async fn get(
         &self,
         req: crate::model::policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         self.inner.get(req, options).await
     }
 
@@ -327,8 +327,8 @@ where
     async fn list(
         &self,
         req: crate::model::policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PoliciesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PoliciesListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -336,8 +336,8 @@ where
     async fn patch(
         &self,
         req: crate::model::policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PoliciesPatchResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PoliciesPatchResponse>> {
         self.inner.patch(req, options).await
     }
 
@@ -345,8 +345,8 @@ where
     async fn update(
         &self,
         req: crate::model::policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PoliciesUpdateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PoliciesUpdateResponse>> {
         self.inner.update(req, options).await
     }
 }
@@ -377,8 +377,8 @@ where
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Project>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Project>> {
         self.inner.get(req, options).await
     }
 }
@@ -409,8 +409,8 @@ where
     async fn create(
         &self,
         req: crate::model::resource_record_sets::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSet>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSet>> {
         self.inner.create(req, options).await
     }
 
@@ -418,8 +418,8 @@ where
     async fn delete(
         &self,
         req: crate::model::resource_record_sets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSetsDeleteResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSetsDeleteResponse>> {
         self.inner.delete(req, options).await
     }
 
@@ -427,8 +427,8 @@ where
     async fn get(
         &self,
         req: crate::model::resource_record_sets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSet>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSet>> {
         self.inner.get(req, options).await
     }
 
@@ -436,8 +436,8 @@ where
     async fn list(
         &self,
         req: crate::model::resource_record_sets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSetsListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSetsListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -445,8 +445,8 @@ where
     async fn patch(
         &self,
         req: crate::model::resource_record_sets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSet>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSet>> {
         self.inner.patch(req, options).await
     }
 }
@@ -477,8 +477,8 @@ where
     async fn create(
         &self,
         req: crate::model::response_policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicy>> {
         self.inner.create(req, options).await
     }
 
@@ -486,8 +486,8 @@ where
     async fn delete(
         &self,
         req: crate::model::response_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -495,8 +495,8 @@ where
     async fn get(
         &self,
         req: crate::model::response_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicy>> {
         self.inner.get(req, options).await
     }
 
@@ -504,8 +504,8 @@ where
     async fn list(
         &self,
         req: crate::model::response_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePoliciesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePoliciesListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -513,8 +513,8 @@ where
     async fn patch(
         &self,
         req: crate::model::response_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePoliciesPatchResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePoliciesPatchResponse>> {
         self.inner.patch(req, options).await
     }
 
@@ -522,8 +522,8 @@ where
     async fn update(
         &self,
         req: crate::model::response_policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePoliciesUpdateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePoliciesUpdateResponse>> {
         self.inner.update(req, options).await
     }
 }
@@ -554,8 +554,8 @@ where
     async fn create(
         &self,
         req: crate::model::response_policy_rules::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRule>> {
         self.inner.create(req, options).await
     }
 
@@ -563,8 +563,8 @@ where
     async fn delete(
         &self,
         req: crate::model::response_policy_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete(req, options).await
     }
 
@@ -572,8 +572,8 @@ where
     async fn get(
         &self,
         req: crate::model::response_policy_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRule>> {
         self.inner.get(req, options).await
     }
 
@@ -581,8 +581,8 @@ where
     async fn list(
         &self,
         req: crate::model::response_policy_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRulesListResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRulesListResponse>> {
         self.inner.list(req, options).await
     }
 
@@ -590,8 +590,8 @@ where
     async fn patch(
         &self,
         req: crate::model::response_policy_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRulesPatchResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRulesPatchResponse>> {
         self.inner.patch(req, options).await
     }
 
@@ -599,8 +599,8 @@ where
     async fn update(
         &self,
         req: crate::model::response_policy_rules::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRulesUpdateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRulesUpdateResponse>> {
         self.inner.update(req, options).await
     }
 }
diff --git a/src/generated/cloud/dns/v1/src/transport.rs b/src/generated/cloud/dns/v1/src/transport.rs
index 0ed5dba73b..c3a111f718 100644
--- a/src/generated/cloud/dns/v1/src/transport.rs
+++ b/src/generated/cloud/dns/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Changes](super::stub::Changes) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Changes {
 }
 
 impl Changes {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Changes for Changes {
     async fn create(
         &self,
         req: crate::model::changes::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Change>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Change>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89,9 +89,9 @@ impl super::stub::Changes for Changes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -106,13 +106,13 @@ impl super::stub::Changes for Changes {
     async fn get(
         &self,
         req: crate::model::changes::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Change>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Change>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -162,9 +162,9 @@ impl super::stub::Changes for Changes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -179,13 +179,13 @@ impl super::stub::Changes for Changes {
     async fn list(
         &self,
         req: crate::model::changes::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ChangesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ChangesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -238,9 +238,9 @@ impl super::stub::Changes for Changes {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -268,7 +268,7 @@ impl std::fmt::Debug for DnsKeys {
 }
 
 impl DnsKeys {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -278,13 +278,13 @@ impl super::stub::DnsKeys for DnsKeys {
     async fn get(
         &self,
         req: crate::model::dns_keys::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DnsKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DnsKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -338,9 +338,9 @@ impl super::stub::DnsKeys for DnsKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -355,13 +355,13 @@ impl super::stub::DnsKeys for DnsKeys {
     async fn list(
         &self,
         req: crate::model::dns_keys::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DnsKeysListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DnsKeysListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -410,9 +410,9 @@ impl super::stub::DnsKeys for DnsKeys {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -440,7 +440,7 @@ impl std::fmt::Debug for ManagedZoneOperations {
 }
 
 impl ManagedZoneOperations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -450,13 +450,13 @@ impl super::stub::ManagedZoneOperations for ManagedZoneOperations {
     async fn get(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -506,9 +506,9 @@ impl super::stub::ManagedZoneOperations for ManagedZoneOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -523,13 +523,13 @@ impl super::stub::ManagedZoneOperations for ManagedZoneOperations {
     async fn list(
         &self,
         req: crate::model::managed_zone_operations::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZoneOperationsListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZoneOperationsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -578,9 +578,9 @@ impl super::stub::ManagedZoneOperations for ManagedZoneOperations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -608,7 +608,7 @@ impl std::fmt::Debug for ManagedZones {
 }
 
 impl ManagedZones {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -618,13 +618,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn create(
         &self,
         req: crate::model::managed_zones::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZone>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZone>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -654,9 +654,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -671,13 +671,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn delete(
         &self,
         req: crate::model::managed_zones::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -717,9 +717,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -728,24 +728,25 @@ impl super::stub::ManagedZones for ManagedZones {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::managed_zones::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZone>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZone>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -785,9 +786,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -802,13 +803,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn get_iam_policy(
         &self,
         req: crate::model::managed_zones::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleIamV1Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleIamV1Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -835,9 +836,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -852,13 +853,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn list(
         &self,
         req: crate::model::managed_zones::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ManagedZonesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ManagedZonesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -897,9 +898,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -914,13 +915,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn patch(
         &self,
         req: crate::model::managed_zones::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -960,9 +961,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -977,13 +978,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn set_iam_policy(
         &self,
         req: crate::model::managed_zones::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleIamV1Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleIamV1Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1010,9 +1011,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1027,13 +1028,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn test_iam_permissions(
         &self,
         req: crate::model::managed_zones::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleIamV1TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1060,9 +1061,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1077,13 +1078,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn update(
         &self,
         req: crate::model::managed_zones::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1123,9 +1124,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1140,13 +1141,13 @@ impl super::stub::ManagedZones for ManagedZones {
     async fn get_operation(
         &self,
         req: crate::model::managed_zone_operations::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1196,9 +1197,9 @@ impl super::stub::ManagedZones for ManagedZones {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1212,15 +1213,15 @@ impl super::stub::ManagedZones for ManagedZones {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1240,7 +1241,7 @@ impl std::fmt::Debug for Policies {
 }
 
 impl Policies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1250,13 +1251,13 @@ impl super::stub::Policies for Policies {
     async fn create(
         &self,
         req: crate::model::policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1286,9 +1287,9 @@ impl super::stub::Policies for Policies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1303,13 +1304,13 @@ impl super::stub::Policies for Policies {
     async fn delete(
         &self,
         req: crate::model::policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1349,9 +1350,9 @@ impl super::stub::Policies for Policies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1360,24 +1361,25 @@ impl super::stub::Policies for Policies {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1417,9 +1419,9 @@ impl super::stub::Policies for Policies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1434,13 +1436,13 @@ impl super::stub::Policies for Policies {
     async fn list(
         &self,
         req: crate::model::policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PoliciesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PoliciesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1475,9 +1477,9 @@ impl super::stub::Policies for Policies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1492,13 +1494,13 @@ impl super::stub::Policies for Policies {
     async fn patch(
         &self,
         req: crate::model::policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PoliciesPatchResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PoliciesPatchResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1538,9 +1540,9 @@ impl super::stub::Policies for Policies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1555,13 +1557,13 @@ impl super::stub::Policies for Policies {
     async fn update(
         &self,
         req: crate::model::policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PoliciesUpdateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PoliciesUpdateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1601,9 +1603,9 @@ impl super::stub::Policies for Policies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1631,7 +1633,7 @@ impl std::fmt::Debug for Projects {
 }
 
 impl Projects {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1641,13 +1643,13 @@ impl super::stub::Projects for Projects {
     async fn get(
         &self,
         req: crate::model::projects::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Project>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Project>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1677,9 +1679,9 @@ impl super::stub::Projects for Projects {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1707,7 +1709,7 @@ impl std::fmt::Debug for ResourceRecordSets {
 }
 
 impl ResourceRecordSets {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1717,13 +1719,13 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
     async fn create(
         &self,
         req: crate::model::resource_record_sets::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSet>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSet>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1763,9 +1765,9 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1780,13 +1782,13 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
     async fn delete(
         &self,
         req: crate::model::resource_record_sets::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSetsDeleteResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSetsDeleteResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1846,9 +1848,9 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1863,13 +1865,13 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
     async fn get(
         &self,
         req: crate::model::resource_record_sets::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSet>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSet>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1929,9 +1931,9 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1946,13 +1948,13 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
     async fn list(
         &self,
         req: crate::model::resource_record_sets::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSetsListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSetsListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2005,9 +2007,9 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2022,13 +2024,13 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
     async fn patch(
         &self,
         req: crate::model::resource_record_sets::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceRecordSet>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceRecordSet>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2088,9 +2090,9 @@ impl super::stub::ResourceRecordSets for ResourceRecordSets {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2118,7 +2120,7 @@ impl std::fmt::Debug for ResponsePolicies {
 }
 
 impl ResponsePolicies {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2128,13 +2130,13 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
     async fn create(
         &self,
         req: crate::model::response_policies::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2164,9 +2166,9 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2181,13 +2183,13 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
     async fn delete(
         &self,
         req: crate::model::response_policies::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2227,9 +2229,9 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2238,24 +2240,25 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::response_policies::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2295,9 +2298,9 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2312,13 +2315,13 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
     async fn list(
         &self,
         req: crate::model::response_policies::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePoliciesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePoliciesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2353,9 +2356,9 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2370,13 +2373,13 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
     async fn patch(
         &self,
         req: crate::model::response_policies::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePoliciesPatchResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePoliciesPatchResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2416,9 +2419,9 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2433,13 +2436,13 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
     async fn update(
         &self,
         req: crate::model::response_policies::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePoliciesUpdateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePoliciesUpdateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2479,9 +2482,9 @@ impl super::stub::ResponsePolicies for ResponsePolicies {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2509,7 +2512,7 @@ impl std::fmt::Debug for ResponsePolicyRules {
 }
 
 impl ResponsePolicyRules {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2519,13 +2522,13 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
     async fn create(
         &self,
         req: crate::model::response_policy_rules::CreateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2565,9 +2568,9 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2582,13 +2585,13 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
     async fn delete(
         &self,
         req: crate::model::response_policy_rules::DeleteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2642,9 +2645,9 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2653,24 +2656,25 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get(
         &self,
         req: crate::model::response_policy_rules::GetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2724,9 +2728,9 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2741,13 +2745,13 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
     async fn list(
         &self,
         req: crate::model::response_policy_rules::ListRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRulesListResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRulesListResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2792,9 +2796,9 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2809,13 +2813,13 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
     async fn patch(
         &self,
         req: crate::model::response_policy_rules::PatchRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRulesPatchResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRulesPatchResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2869,9 +2873,9 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2886,13 +2890,13 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
     async fn update(
         &self,
         req: crate::model::response_policy_rules::UpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResponsePolicyRulesUpdateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResponsePolicyRulesUpdateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2946,9 +2950,9 @@ impl super::stub::ResponsePolicyRules for ResponsePolicyRules {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/documentai/v1/Cargo.toml b/src/generated/cloud/documentai/v1/Cargo.toml
index d79ff27ae8..2a9aec1946 100644
--- a/src/generated/cloud/documentai/v1/Cargo.toml
+++ b/src/generated/cloud/documentai/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace         = true
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/documentai/v1/src/builder.rs b/src/generated/cloud/documentai/v1/src/builder.rs
index fd2579730f..964e0d0dc7 100644
--- a/src/generated/cloud/documentai/v1/src/builder.rs
+++ b/src/generated/cloud/documentai/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod document_processor_service {
     /// A builder for [DocumentProcessorService][crate::client::DocumentProcessorService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_documentai_v1::*;
     /// # use builder::document_processor_service::ClientBuilder;
     /// # use client::DocumentProcessorService;
@@ -30,19 +30,18 @@ pub mod document_processor_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DocumentProcessorService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DocumentProcessorService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod document_processor_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DocumentProcessorService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod document_processor_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ProcessDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .process_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ProcessRequest::name].
@@ -243,8 +242,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ProcessDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ProcessDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -254,7 +253,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::BatchProcessDocuments;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -283,7 +282,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -298,7 +297,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .batch_process_documents(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `batch_process_documents`.
@@ -317,7 +316,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -425,8 +424,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchProcessDocuments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchProcessDocuments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -436,7 +435,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::FetchProcessorTypes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -467,7 +466,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -477,7 +476,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .fetch_processor_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::FetchProcessorTypesRequest::parent].
@@ -490,8 +489,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchProcessorTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchProcessorTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -501,8 +500,8 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ListProcessorTypes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -536,7 +535,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -546,14 +545,16 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .list_processor_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProcessorTypesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListProcessorTypesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -561,17 +562,17 @@ pub mod document_processor_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListProcessorTypesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -597,8 +598,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProcessorTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProcessorTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -608,7 +609,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::GetProcessorType;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -639,7 +640,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -649,7 +650,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .get_processor_type(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProcessorTypeRequest::name].
@@ -662,8 +663,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProcessorType {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProcessorType {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -673,8 +674,8 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ListProcessors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -705,7 +706,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -715,14 +716,16 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .list_processors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProcessorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListProcessorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -730,15 +733,17 @@ pub mod document_processor_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListProcessorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListProcessorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -764,8 +769,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProcessors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProcessors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -775,7 +780,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::GetProcessor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -803,7 +808,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -813,7 +818,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .get_processor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProcessorRequest::name].
@@ -826,8 +831,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProcessor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProcessor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -837,7 +842,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::TrainProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -869,7 +874,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -884,7 +889,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .train_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `train_processor_version`.
@@ -903,7 +908,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1047,8 +1052,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TrainProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TrainProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1058,7 +1063,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::GetProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1089,7 +1094,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1099,7 +1104,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .get_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProcessorVersionRequest::name].
@@ -1112,8 +1117,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1123,8 +1128,8 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ListProcessorVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1158,7 +1163,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1168,14 +1173,16 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .list_processor_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProcessorVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListProcessorVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1183,17 +1190,17 @@ pub mod document_processor_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListProcessorVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1219,8 +1226,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProcessorVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProcessorVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1230,7 +1237,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::DeleteProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1262,7 +1269,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1277,7 +1284,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .delete_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_processor_version`.
@@ -1294,7 +1301,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1331,8 +1338,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1342,7 +1349,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::DeployProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1374,7 +1381,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1389,7 +1396,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .deploy_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deploy_processor_version`.
@@ -1408,7 +1415,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1445,8 +1452,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeployProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeployProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1456,7 +1463,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::UndeployProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1490,7 +1497,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1505,7 +1512,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .undeploy_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `undeploy_processor_version`.
@@ -1524,7 +1531,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1561,8 +1568,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UndeployProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UndeployProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1572,7 +1579,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::CreateProcessor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1600,7 +1607,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1610,7 +1617,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .create_processor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateProcessorRequest::parent].
@@ -1645,8 +1652,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateProcessor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateProcessor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1656,7 +1663,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::DeleteProcessor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1685,7 +1692,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1700,7 +1707,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .delete_processor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_processor`.
@@ -1716,7 +1723,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1753,8 +1760,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteProcessor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteProcessor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1764,7 +1771,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::EnableProcessor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1793,7 +1800,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1808,7 +1815,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .enable_processor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `enable_processor`.
@@ -1827,7 +1834,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1864,8 +1871,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EnableProcessor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EnableProcessor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1875,7 +1882,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::DisableProcessor;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1907,7 +1914,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1922,7 +1929,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .disable_processor(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `disable_processor`.
@@ -1941,7 +1948,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1978,8 +1985,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DisableProcessor {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DisableProcessor {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1989,7 +1996,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::SetDefaultProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2023,7 +2030,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2038,7 +2045,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .set_default_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `set_default_processor_version`.
@@ -2057,7 +2064,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2102,8 +2109,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetDefaultProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetDefaultProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2113,7 +2120,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ReviewDocument;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2142,7 +2149,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2157,7 +2164,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .review_document(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `review_document`.
@@ -2176,7 +2183,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2273,8 +2280,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReviewDocument {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReviewDocument {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2284,7 +2291,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::EvaluateProcessorVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2318,7 +2325,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2333,7 +2340,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .evaluate_processor_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `evaluate_processor_version`.
@@ -2352,7 +2359,7 @@ pub mod document_processor_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2407,8 +2414,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EvaluateProcessorVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EvaluateProcessorVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2418,7 +2425,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::GetEvaluation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2446,7 +2453,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2456,7 +2463,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .get_evaluation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEvaluationRequest::name].
@@ -2469,8 +2476,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEvaluation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEvaluation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2480,8 +2487,8 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ListEvaluations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2512,7 +2519,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2522,14 +2529,16 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .list_evaluations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEvaluationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEvaluationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2537,15 +2546,17 @@ pub mod document_processor_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEvaluationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEvaluationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2571,8 +2582,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEvaluations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEvaluations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2582,8 +2593,8 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2617,7 +2628,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2627,15 +2638,15 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2644,17 +2655,17 @@ pub mod document_processor_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2684,8 +2695,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2695,7 +2706,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2726,7 +2737,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2736,7 +2747,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2747,8 +2758,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2758,8 +2769,8 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2795,7 +2806,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2805,15 +2816,15 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2822,17 +2833,17 @@ pub mod document_processor_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2868,8 +2879,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2879,7 +2890,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2910,7 +2921,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2920,7 +2931,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2931,8 +2942,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2942,7 +2953,7 @@ pub mod document_processor_service {
     /// # Example
     /// ```
     /// # use google_cloud_documentai_v1::builder::document_processor_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_documentai_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2975,7 +2986,7 @@ pub mod document_processor_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2985,7 +2996,7 @@ pub mod document_processor_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2996,8 +3007,8 @@ pub mod document_processor_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/documentai/v1/src/client.rs b/src/generated/cloud/documentai/v1/src/client.rs
index 47f6950399..e35a66bb47 100644
--- a/src/generated/cloud/documentai/v1/src/client.rs
+++ b/src/generated/cloud/documentai/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_documentai_v1::client::DocumentProcessorService;
 /// let client = DocumentProcessorService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Document AI API.
@@ -69,15 +69,13 @@ impl DocumentProcessorService {
     /// Returns a builder for [DocumentProcessorService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_documentai_v1::client::DocumentProcessorService;
     /// let client = DocumentProcessorService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::document_processor_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::document_processor_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::document_processor_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,14 +93,14 @@ impl DocumentProcessorService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::DocumentProcessorService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -113,13 +111,13 @@ impl DocumentProcessorService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DocumentProcessorService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DocumentProcessorService> {
         super::transport::DocumentProcessorService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DocumentProcessorService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DocumentProcessorService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DocumentProcessorService::new)
diff --git a/src/generated/cloud/documentai/v1/src/lib.rs b/src/generated/cloud/documentai/v1/src/lib.rs
index 4d7958be47..a5ad5d3033 100644
--- a/src/generated/cloud/documentai/v1/src/lib.rs
+++ b/src/generated/cloud/documentai/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/documentai/v1/src/model.rs b/src/generated/cloud/documentai/v1/src/model.rs
index 9698ffbda7..95de0c93b4 100644
--- a/src/generated/cloud/documentai/v1/src/model.rs
+++ b/src/generated/cloud/documentai/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -11187,7 +11187,7 @@ impl wkt::message::Message for ListProcessorTypesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProcessorTypesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProcessorTypesResponse {
     type PageItem = crate::model::ProcessorType;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11332,7 +11332,7 @@ impl wkt::message::Message for ListProcessorsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProcessorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProcessorsResponse {
     type PageItem = crate::model::Processor;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11592,7 +11592,7 @@ impl wkt::message::Message for ListProcessorVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProcessorVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProcessorVersionsResponse {
     type PageItem = crate::model::ProcessorVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -14390,7 +14390,7 @@ impl wkt::message::Message for ListEvaluationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEvaluationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEvaluationsResponse {
     type PageItem = crate::model::Evaluation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/documentai/v1/src/stub.rs b/src/generated/cloud/documentai/v1/src/stub.rs
index 9a7feeaa36..27fad4b556 100644
--- a/src/generated/cloud/documentai/v1/src/stub.rs
+++ b/src/generated/cloud/documentai/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn process_document(
         &self,
         _req: crate::model::ProcessRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProcessResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ProcessResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn batch_process_documents(
         &self,
         _req: crate::model::BatchProcessRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn fetch_processor_types(
         &self,
         _req: crate::model::FetchProcessorTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchProcessorTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchProcessorTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn list_processor_types(
         &self,
         _req: crate::model::ListProcessorTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListProcessorTypesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListProcessorTypesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn get_processor_type(
         &self,
         _req: crate::model::GetProcessorTypeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProcessorType>>,
+        Output = crate::Result<crate::Response<crate::model::ProcessorType>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn list_processors(
         &self,
         _req: crate::model::ListProcessorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListProcessorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListProcessorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +108,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn get_processor(
         &self,
         _req: crate::model::GetProcessorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Processor>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Processor>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -119,9 +118,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn train_processor_version(
         &self,
         _req: crate::model::TrainProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +129,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn get_processor_version(
         &self,
         _req: crate::model::GetProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProcessorVersion>>,
+        Output = crate::Result<crate::Response<crate::model::ProcessorVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,11 +140,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn list_processor_versions(
         &self,
         _req: crate::model::ListProcessorVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListProcessorVersionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListProcessorVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,9 +151,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn delete_processor_version(
         &self,
         _req: crate::model::DeleteProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,9 +162,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn deploy_processor_version(
         &self,
         _req: crate::model::DeployProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +173,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn undeploy_processor_version(
         &self,
         _req: crate::model::UndeployProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,10 +184,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn create_processor(
         &self,
         _req: crate::model::CreateProcessorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Processor>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Processor>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -198,9 +194,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn delete_processor(
         &self,
         _req: crate::model::DeleteProcessorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -209,9 +205,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn enable_processor(
         &self,
         _req: crate::model::EnableProcessorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +216,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn disable_processor(
         &self,
         _req: crate::model::DisableProcessorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +227,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn set_default_processor_version(
         &self,
         _req: crate::model::SetDefaultProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +238,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn review_document(
         &self,
         _req: crate::model::ReviewDocumentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +249,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn evaluate_processor_version(
         &self,
         _req: crate::model::EvaluateProcessorVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,10 +260,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn get_evaluation(
         &self,
         _req: crate::model::GetEvaluationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Evaluation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Evaluation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -275,9 +270,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn list_evaluations(
         &self,
         _req: crate::model::ListEvaluationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEvaluationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEvaluationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -286,10 +281,10 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -299,9 +294,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -310,10 +305,10 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -323,9 +318,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -334,8 +329,8 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -345,9 +340,9 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -356,8 +351,8 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/documentai/v1/src/stub/dynamic.rs b/src/generated/cloud/documentai/v1/src/stub/dynamic.rs
index 91ddfc592b..e20eec73bf 100644
--- a/src/generated/cloud/documentai/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/documentai/v1/src/stub/dynamic.rs
@@ -20,176 +20,174 @@ pub trait DocumentProcessorService: std::fmt::Debug + Send + Sync {
     async fn process_document(
         &self,
         req: crate::model::ProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessResponse>>;
 
     async fn batch_process_documents(
         &self,
         req: crate::model::BatchProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn fetch_processor_types(
         &self,
         req: crate::model::FetchProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchProcessorTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchProcessorTypesResponse>>;
 
     async fn list_processor_types(
         &self,
         req: crate::model::ListProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessorTypesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessorTypesResponse>>;
 
     async fn get_processor_type(
         &self,
         req: crate::model::GetProcessorTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessorType>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessorType>>;
 
     async fn list_processors(
         &self,
         req: crate::model::ListProcessorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessorsResponse>>;
 
     async fn get_processor(
         &self,
         req: crate::model::GetProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Processor>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Processor>>;
 
     async fn train_processor_version(
         &self,
         req: crate::model::TrainProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_processor_version(
         &self,
         req: crate::model::GetProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessorVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessorVersion>>;
 
     async fn list_processor_versions(
         &self,
         req: crate::model::ListProcessorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessorVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessorVersionsResponse>>;
 
     async fn delete_processor_version(
         &self,
         req: crate::model::DeleteProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn deploy_processor_version(
         &self,
         req: crate::model::DeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn undeploy_processor_version(
         &self,
         req: crate::model::UndeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_processor(
         &self,
         req: crate::model::CreateProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Processor>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Processor>>;
 
     async fn delete_processor(
         &self,
         req: crate::model::DeleteProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn enable_processor(
         &self,
         req: crate::model::EnableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn disable_processor(
         &self,
         req: crate::model::DisableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn set_default_processor_version(
         &self,
         req: crate::model::SetDefaultProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn review_document(
         &self,
         req: crate::model::ReviewDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn evaluate_processor_version(
         &self,
         req: crate::model::EvaluateProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_evaluation(
         &self,
         req: crate::model::GetEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Evaluation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Evaluation>>;
 
     async fn list_evaluations(
         &self,
         req: crate::model::ListEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEvaluationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEvaluationsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DocumentProcessorService] also implement [DocumentProcessorService].
@@ -199,8 +197,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn process_document(
         &self,
         req: crate::model::ProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessResponse>> {
         T::process_document(self, req, options).await
     }
 
@@ -208,8 +206,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn batch_process_documents(
         &self,
         req: crate::model::BatchProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::batch_process_documents(self, req, options).await
     }
 
@@ -217,8 +215,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn fetch_processor_types(
         &self,
         req: crate::model::FetchProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchProcessorTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchProcessorTypesResponse>> {
         T::fetch_processor_types(self, req, options).await
     }
 
@@ -226,8 +224,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn list_processor_types(
         &self,
         req: crate::model::ListProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessorTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessorTypesResponse>> {
         T::list_processor_types(self, req, options).await
     }
 
@@ -235,8 +233,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn get_processor_type(
         &self,
         req: crate::model::GetProcessorTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessorType>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessorType>> {
         T::get_processor_type(self, req, options).await
     }
 
@@ -244,8 +242,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn list_processors(
         &self,
         req: crate::model::ListProcessorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessorsResponse>> {
         T::list_processors(self, req, options).await
     }
 
@@ -253,8 +251,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn get_processor(
         &self,
         req: crate::model::GetProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Processor>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Processor>> {
         T::get_processor(self, req, options).await
     }
 
@@ -262,8 +260,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn train_processor_version(
         &self,
         req: crate::model::TrainProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::train_processor_version(self, req, options).await
     }
 
@@ -271,8 +269,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn get_processor_version(
         &self,
         req: crate::model::GetProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProcessorVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProcessorVersion>> {
         T::get_processor_version(self, req, options).await
     }
 
@@ -280,8 +278,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn list_processor_versions(
         &self,
         req: crate::model::ListProcessorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProcessorVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProcessorVersionsResponse>> {
         T::list_processor_versions(self, req, options).await
     }
 
@@ -289,8 +287,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn delete_processor_version(
         &self,
         req: crate::model::DeleteProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_processor_version(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn deploy_processor_version(
         &self,
         req: crate::model::DeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deploy_processor_version(self, req, options).await
     }
 
@@ -307,8 +305,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn undeploy_processor_version(
         &self,
         req: crate::model::UndeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::undeploy_processor_version(self, req, options).await
     }
 
@@ -316,8 +314,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn create_processor(
         &self,
         req: crate::model::CreateProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Processor>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Processor>> {
         T::create_processor(self, req, options).await
     }
 
@@ -325,8 +323,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn delete_processor(
         &self,
         req: crate::model::DeleteProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_processor(self, req, options).await
     }
 
@@ -334,8 +332,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn enable_processor(
         &self,
         req: crate::model::EnableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::enable_processor(self, req, options).await
     }
 
@@ -343,8 +341,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn disable_processor(
         &self,
         req: crate::model::DisableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::disable_processor(self, req, options).await
     }
 
@@ -352,8 +350,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn set_default_processor_version(
         &self,
         req: crate::model::SetDefaultProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::set_default_processor_version(self, req, options).await
     }
 
@@ -361,8 +359,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn review_document(
         &self,
         req: crate::model::ReviewDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::review_document(self, req, options).await
     }
 
@@ -370,8 +368,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn evaluate_processor_version(
         &self,
         req: crate::model::EvaluateProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::evaluate_processor_version(self, req, options).await
     }
 
@@ -379,8 +377,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn get_evaluation(
         &self,
         req: crate::model::GetEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Evaluation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Evaluation>> {
         T::get_evaluation(self, req, options).await
     }
 
@@ -388,8 +386,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn list_evaluations(
         &self,
         req: crate::model::ListEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEvaluationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEvaluationsResponse>> {
         T::list_evaluations(self, req, options).await
     }
 
@@ -397,9 +395,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -407,8 +404,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -416,10 +413,9 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -427,8 +423,8 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -436,22 +432,22 @@ impl<T: super::DocumentProcessorService> DocumentProcessorService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/documentai/v1/src/tracing.rs b/src/generated/cloud/documentai/v1/src/tracing.rs
index 802bc7ddac..81909f0f8b 100644
--- a/src/generated/cloud/documentai/v1/src/tracing.rs
+++ b/src/generated/cloud/documentai/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn process_document(
         &self,
         req: crate::model::ProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessResponse>> {
         self.inner.process_document(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn batch_process_documents(
         &self,
         req: crate::model::BatchProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.batch_process_documents(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn fetch_processor_types(
         &self,
         req: crate::model::FetchProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchProcessorTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchProcessorTypesResponse>> {
         self.inner.fetch_processor_types(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_processor_types(
         &self,
         req: crate::model::ListProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessorTypesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessorTypesResponse>> {
         self.inner.list_processor_types(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_processor_type(
         &self,
         req: crate::model::GetProcessorTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessorType>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessorType>> {
         self.inner.get_processor_type(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_processors(
         &self,
         req: crate::model::ListProcessorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessorsResponse>> {
         self.inner.list_processors(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_processor(
         &self,
         req: crate::model::GetProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Processor>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Processor>> {
         self.inner.get_processor(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn train_processor_version(
         &self,
         req: crate::model::TrainProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.train_processor_version(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_processor_version(
         &self,
         req: crate::model::GetProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessorVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessorVersion>> {
         self.inner.get_processor_version(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_processor_versions(
         &self,
         req: crate::model::ListProcessorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessorVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessorVersionsResponse>> {
         self.inner.list_processor_versions(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_processor_version(
         &self,
         req: crate::model::DeleteProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_processor_version(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn deploy_processor_version(
         &self,
         req: crate::model::DeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deploy_processor_version(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn undeploy_processor_version(
         &self,
         req: crate::model::UndeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.undeploy_processor_version(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn create_processor(
         &self,
         req: crate::model::CreateProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Processor>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Processor>> {
         self.inner.create_processor(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn delete_processor(
         &self,
         req: crate::model::DeleteProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_processor(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn enable_processor(
         &self,
         req: crate::model::EnableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.enable_processor(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn disable_processor(
         &self,
         req: crate::model::DisableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.disable_processor(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn set_default_processor_version(
         &self,
         req: crate::model::SetDefaultProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.set_default_processor_version(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn review_document(
         &self,
         req: crate::model::ReviewDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.review_document(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn evaluate_processor_version(
         &self,
         req: crate::model::EvaluateProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.evaluate_processor_version(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn get_evaluation(
         &self,
         req: crate::model::GetEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Evaluation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Evaluation>> {
         self.inner.get_evaluation(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn list_evaluations(
         &self,
         req: crate::model::ListEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEvaluationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEvaluationsResponse>> {
         self.inner.list_evaluations(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -257,9 +257,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -267,8 +266,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -276,22 +275,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/documentai/v1/src/transport.rs b/src/generated/cloud/documentai/v1/src/transport.rs
index 5fc260b4c6..6bbb29c3db 100644
--- a/src/generated/cloud/documentai/v1/src/transport.rs
+++ b/src/generated/cloud/documentai/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DocumentProcessorService](super::stub::DocumentProcessorService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DocumentProcessorService {
 }
 
 impl DocumentProcessorService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn process_document(
         &self,
         req: crate::model::ProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -131,9 +131,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -148,13 +148,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn batch_process_documents(
         &self,
         req: crate::model::BatchProcessRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -236,9 +236,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -253,13 +253,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn fetch_processor_types(
         &self,
         req: crate::model::FetchProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchProcessorTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchProcessorTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -296,9 +296,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -313,13 +313,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn list_processor_types(
         &self,
         req: crate::model::ListProcessorTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessorTypesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessorTypesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -358,9 +358,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -375,13 +375,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn get_processor_type(
         &self,
         req: crate::model::GetProcessorTypeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessorType>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessorType>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -422,9 +422,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -439,13 +439,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn list_processors(
         &self,
         req: crate::model::ListProcessorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -484,9 +484,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -501,13 +501,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn get_processor(
         &self,
         req: crate::model::GetProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Processor>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Processor>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -548,9 +548,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -565,13 +565,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn train_processor_version(
         &self,
         req: crate::model::TrainProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -612,9 +612,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -629,13 +629,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn get_processor_version(
         &self,
         req: crate::model::GetProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProcessorVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProcessorVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -680,9 +680,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -697,13 +697,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn list_processor_versions(
         &self,
         req: crate::model::ListProcessorVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProcessorVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProcessorVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -746,9 +746,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -763,13 +763,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn delete_processor_version(
         &self,
         req: crate::model::DeleteProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -814,9 +814,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -831,13 +831,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn deploy_processor_version(
         &self,
         req: crate::model::DeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -882,9 +882,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -899,13 +899,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn undeploy_processor_version(
         &self,
         req: crate::model::UndeployProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -950,9 +950,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -967,13 +967,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn create_processor(
         &self,
         req: crate::model::CreateProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Processor>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Processor>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1010,9 +1010,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1027,13 +1027,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn delete_processor(
         &self,
         req: crate::model::DeleteProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1074,9 +1074,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1091,13 +1091,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn enable_processor(
         &self,
         req: crate::model::EnableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1138,9 +1138,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1155,13 +1155,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn disable_processor(
         &self,
         req: crate::model::DisableProcessorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1202,9 +1202,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1219,13 +1219,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn set_default_processor_version(
         &self,
         req: crate::model::SetDefaultProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1266,9 +1266,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1283,13 +1283,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn review_document(
         &self,
         req: crate::model::ReviewDocumentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1336,9 +1336,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1353,13 +1353,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn evaluate_processor_version(
         &self,
         req: crate::model::EvaluateProcessorVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1404,9 +1404,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1421,13 +1421,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn get_evaluation(
         &self,
         req: crate::model::GetEvaluationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Evaluation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Evaluation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1476,9 +1476,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1493,13 +1493,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn list_evaluations(
         &self,
         req: crate::model::ListEvaluationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEvaluationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEvaluationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1546,9 +1546,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1563,13 +1563,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1625,9 +1625,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1642,13 +1642,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1718,9 +1718,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1735,14 +1735,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1826,9 +1825,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1843,13 +1842,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1960,9 +1959,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1977,13 +1976,13 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2061,9 +2060,9 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2072,25 +2071,26 @@ impl super::stub::DocumentProcessorService for DocumentProcessorService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/domains/v1/Cargo.toml b/src/generated/cloud/domains/v1/Cargo.toml
index 1462aa945f..a1a3c986fc 100644
--- a/src/generated/cloud/domains/v1/Cargo.toml
+++ b/src/generated/cloud/domains/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 google-cloud-type.workspace        = true
diff --git a/src/generated/cloud/domains/v1/src/builder.rs b/src/generated/cloud/domains/v1/src/builder.rs
index 1b284f5cec..5298c91b30 100644
--- a/src/generated/cloud/domains/v1/src/builder.rs
+++ b/src/generated/cloud/domains/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod domains {
     /// A builder for [Domains][crate::client::Domains].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_domains_v1::*;
     /// # use builder::domains::ClientBuilder;
     /// # use client::Domains;
@@ -30,19 +30,18 @@ pub mod domains {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Domains;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Domains;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod domains {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Domains>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod domains {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::SearchDomains;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100,7 +99,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110,7 +109,7 @@ pub mod domains {
             (*self.0.stub)
                 .search_domains(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [query][crate::model::SearchDomainsRequest::query].
@@ -131,8 +130,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchDomains {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchDomains {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -142,7 +141,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::RetrieveRegisterParameters;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -173,7 +172,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -183,7 +182,7 @@ pub mod domains {
             (*self.0.stub)
                 .retrieve_register_parameters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [domain_name][crate::model::RetrieveRegisterParametersRequest::domain_name].
@@ -204,8 +203,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetrieveRegisterParameters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetrieveRegisterParameters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -215,7 +214,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::RegisterDomain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -242,7 +241,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -257,7 +256,7 @@ pub mod domains {
             (*self.0.stub)
                 .register_domain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `register_domain`.
@@ -274,7 +273,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -383,8 +382,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RegisterDomain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RegisterDomain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -394,7 +393,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::RetrieveTransferParameters;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -425,7 +424,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -435,7 +434,7 @@ pub mod domains {
             (*self.0.stub)
                 .retrieve_transfer_parameters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [domain_name][crate::model::RetrieveTransferParametersRequest::domain_name].
@@ -456,8 +455,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetrieveTransferParameters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetrieveTransferParameters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -467,7 +466,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::TransferDomain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -494,7 +493,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -509,7 +508,7 @@ pub mod domains {
             (*self.0.stub)
                 .transfer_domain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `transfer_domain`.
@@ -526,7 +525,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -642,8 +641,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TransferDomain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TransferDomain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -653,8 +652,8 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ListRegistrations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -686,7 +685,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -696,14 +695,16 @@ pub mod domains {
             (*self.0.stub)
                 .list_registrations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRegistrationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRegistrationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -711,15 +712,17 @@ pub mod domains {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRegistrationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRegistrationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -751,8 +754,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRegistrations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRegistrations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -762,7 +765,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::GetRegistration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -788,7 +791,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -798,7 +801,7 @@ pub mod domains {
             (*self.0.stub)
                 .get_registration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRegistrationRequest::name].
@@ -811,8 +814,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRegistration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRegistration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -822,7 +825,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::UpdateRegistration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -852,7 +855,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -867,7 +870,7 @@ pub mod domains {
             (*self.0.stub)
                 .update_registration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_registration`.
@@ -884,7 +887,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -953,8 +956,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRegistration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRegistration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -964,7 +967,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ConfigureManagementSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -996,7 +999,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1011,7 +1014,7 @@ pub mod domains {
             (*self.0.stub)
                 .configure_management_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `configure_management_settings`.
@@ -1028,7 +1031,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1105,8 +1108,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ConfigureManagementSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ConfigureManagementSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1116,7 +1119,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ConfigureDnsSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1146,7 +1149,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1161,7 +1164,7 @@ pub mod domains {
             (*self.0.stub)
                 .configure_dns_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `configure_dns_settings`.
@@ -1178,7 +1181,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1261,8 +1264,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ConfigureDnsSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ConfigureDnsSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1272,7 +1275,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ConfigureContactSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1304,7 +1307,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1319,7 +1322,7 @@ pub mod domains {
             (*self.0.stub)
                 .configure_contact_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `configure_contact_settings`.
@@ -1336,7 +1339,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1430,8 +1433,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ConfigureContactSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ConfigureContactSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1441,7 +1444,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ExportRegistration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1471,7 +1474,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1486,7 +1489,7 @@ pub mod domains {
             (*self.0.stub)
                 .export_registration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_registration`.
@@ -1503,7 +1506,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1540,8 +1543,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportRegistration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportRegistration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1551,7 +1554,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::DeleteRegistration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1581,7 +1584,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1596,7 +1599,7 @@ pub mod domains {
             (*self.0.stub)
                 .delete_registration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_registration`.
@@ -1608,7 +1611,7 @@ pub mod domains {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1645,8 +1648,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRegistration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRegistration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1656,7 +1659,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::RetrieveAuthorizationCode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1687,7 +1690,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1697,7 +1700,7 @@ pub mod domains {
             (*self.0.stub)
                 .retrieve_authorization_code(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [registration][crate::model::RetrieveAuthorizationCodeRequest::registration].
@@ -1710,8 +1713,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RetrieveAuthorizationCode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RetrieveAuthorizationCode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1721,7 +1724,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ResetAuthorizationCode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1750,7 +1753,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1760,7 +1763,7 @@ pub mod domains {
             (*self.0.stub)
                 .reset_authorization_code(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [registration][crate::model::ResetAuthorizationCodeRequest::registration].
@@ -1773,8 +1776,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResetAuthorizationCode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResetAuthorizationCode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1784,8 +1787,8 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1819,7 +1822,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1829,15 +1832,15 @@ pub mod domains {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1846,17 +1849,17 @@ pub mod domains {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1892,8 +1895,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1903,7 +1906,7 @@ pub mod domains {
     /// # Example
     /// ```
     /// # use google_cloud_domains_v1::builder::domains::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_domains_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1932,7 +1935,7 @@ pub mod domains {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1942,7 +1945,7 @@ pub mod domains {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1953,8 +1956,8 @@ pub mod domains {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/domains/v1/src/client.rs b/src/generated/cloud/domains/v1/src/client.rs
index a4dfe76487..7c9494fc0d 100644
--- a/src/generated/cloud/domains/v1/src/client.rs
+++ b/src/generated/cloud/domains/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_domains_v1::client::Domains;
 /// let client = Domains::builder().build().await?;
 /// // use `client` to make requests to the Cloud Domains API.
@@ -66,13 +66,13 @@ impl Domains {
     /// Returns a builder for [Domains].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_domains_v1::client::Domains;
     /// let client = Domains::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::domains::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::domains::client::Factory)
+        crate::new_client_builder(super::builder::domains::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Domains {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Domains>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Domains>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Domains {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Domains> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Domains> {
         super::transport::Domains::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Domains> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Domains> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Domains::new)
diff --git a/src/generated/cloud/domains/v1/src/lib.rs b/src/generated/cloud/domains/v1/src/lib.rs
index 059e893a01..af8c86cec5 100644
--- a/src/generated/cloud/domains/v1/src/lib.rs
+++ b/src/generated/cloud/domains/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/domains/v1/src/model.rs b/src/generated/cloud/domains/v1/src/model.rs
index f689b9da9e..ec0fbeda64 100644
--- a/src/generated/cloud/domains/v1/src/model.rs
+++ b/src/generated/cloud/domains/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate google_cloud_type;
@@ -3088,7 +3088,7 @@ impl wkt::message::Message for ListRegistrationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRegistrationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRegistrationsResponse {
     type PageItem = crate::model::Registration;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/domains/v1/src/stub.rs b/src/generated/cloud/domains/v1/src/stub.rs
index d15026d91d..a025134142 100644
--- a/src/generated/cloud/domains/v1/src/stub.rs
+++ b/src/generated/cloud/domains/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn search_domains(
         &self,
         _req: crate::model::SearchDomainsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchDomainsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchDomainsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,11 +53,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn retrieve_register_parameters(
         &self,
         _req: crate::model::RetrieveRegisterParametersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RetrieveRegisterParametersResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RetrieveRegisterParametersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn register_domain(
         &self,
         _req: crate::model::RegisterDomainRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,11 +75,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn retrieve_transfer_parameters(
         &self,
         _req: crate::model::RetrieveTransferParametersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::RetrieveTransferParametersResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::RetrieveTransferParametersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -90,9 +86,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn transfer_domain(
         &self,
         _req: crate::model::TransferDomainRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -101,9 +97,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn list_registrations(
         &self,
         _req: crate::model::ListRegistrationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRegistrationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRegistrationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -112,9 +108,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn get_registration(
         &self,
         _req: crate::model::GetRegistrationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Registration>>,
+        Output = crate::Result<crate::Response<crate::model::Registration>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,9 +119,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn update_registration(
         &self,
         _req: crate::model::UpdateRegistrationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +130,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn configure_management_settings(
         &self,
         _req: crate::model::ConfigureManagementSettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,9 +141,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn configure_dns_settings(
         &self,
         _req: crate::model::ConfigureDnsSettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,9 +152,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn configure_contact_settings(
         &self,
         _req: crate::model::ConfigureContactSettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,9 +163,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn export_registration(
         &self,
         _req: crate::model::ExportRegistrationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +174,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn delete_registration(
         &self,
         _req: crate::model::DeleteRegistrationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,9 +185,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn retrieve_authorization_code(
         &self,
         _req: crate::model::RetrieveAuthorizationCodeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuthorizationCode>>,
+        Output = crate::Result<crate::Response<crate::model::AuthorizationCode>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,9 +196,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn reset_authorization_code(
         &self,
         _req: crate::model::ResetAuthorizationCodeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AuthorizationCode>>,
+        Output = crate::Result<crate::Response<crate::model::AuthorizationCode>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,10 +207,10 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -224,9 +220,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -237,9 +233,9 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -248,8 +244,8 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/domains/v1/src/stub/dynamic.rs b/src/generated/cloud/domains/v1/src/stub/dynamic.rs
index 27366d6b28..cbdc51cfd1 100644
--- a/src/generated/cloud/domains/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/domains/v1/src/stub/dynamic.rs
@@ -20,116 +20,114 @@ pub trait Domains: std::fmt::Debug + Send + Sync {
     async fn search_domains(
         &self,
         req: crate::model::SearchDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchDomainsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchDomainsResponse>>;
 
     async fn retrieve_register_parameters(
         &self,
         req: crate::model::RetrieveRegisterParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetrieveRegisterParametersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetrieveRegisterParametersResponse>>;
 
     async fn register_domain(
         &self,
         req: crate::model::RegisterDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn retrieve_transfer_parameters(
         &self,
         req: crate::model::RetrieveTransferParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetrieveTransferParametersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetrieveTransferParametersResponse>>;
 
     async fn transfer_domain(
         &self,
         req: crate::model::TransferDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_registrations(
         &self,
         req: crate::model::ListRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRegistrationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRegistrationsResponse>>;
 
     async fn get_registration(
         &self,
         req: crate::model::GetRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Registration>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Registration>>;
 
     async fn update_registration(
         &self,
         req: crate::model::UpdateRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn configure_management_settings(
         &self,
         req: crate::model::ConfigureManagementSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn configure_dns_settings(
         &self,
         req: crate::model::ConfigureDnsSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn configure_contact_settings(
         &self,
         req: crate::model::ConfigureContactSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_registration(
         &self,
         req: crate::model::ExportRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_registration(
         &self,
         req: crate::model::DeleteRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn retrieve_authorization_code(
         &self,
         req: crate::model::RetrieveAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizationCode>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizationCode>>;
 
     async fn reset_authorization_code(
         &self,
         req: crate::model::ResetAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizationCode>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizationCode>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Domains] also implement [Domains].
@@ -139,8 +137,8 @@ impl<T: super::Domains> Domains for T {
     async fn search_domains(
         &self,
         req: crate::model::SearchDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchDomainsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchDomainsResponse>> {
         T::search_domains(self, req, options).await
     }
 
@@ -148,9 +146,8 @@ impl<T: super::Domains> Domains for T {
     async fn retrieve_register_parameters(
         &self,
         req: crate::model::RetrieveRegisterParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetrieveRegisterParametersResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetrieveRegisterParametersResponse>> {
         T::retrieve_register_parameters(self, req, options).await
     }
 
@@ -158,8 +155,8 @@ impl<T: super::Domains> Domains for T {
     async fn register_domain(
         &self,
         req: crate::model::RegisterDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::register_domain(self, req, options).await
     }
 
@@ -167,9 +164,8 @@ impl<T: super::Domains> Domains for T {
     async fn retrieve_transfer_parameters(
         &self,
         req: crate::model::RetrieveTransferParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RetrieveTransferParametersResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RetrieveTransferParametersResponse>> {
         T::retrieve_transfer_parameters(self, req, options).await
     }
 
@@ -177,8 +173,8 @@ impl<T: super::Domains> Domains for T {
     async fn transfer_domain(
         &self,
         req: crate::model::TransferDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::transfer_domain(self, req, options).await
     }
 
@@ -186,8 +182,8 @@ impl<T: super::Domains> Domains for T {
     async fn list_registrations(
         &self,
         req: crate::model::ListRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRegistrationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRegistrationsResponse>> {
         T::list_registrations(self, req, options).await
     }
 
@@ -195,8 +191,8 @@ impl<T: super::Domains> Domains for T {
     async fn get_registration(
         &self,
         req: crate::model::GetRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Registration>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Registration>> {
         T::get_registration(self, req, options).await
     }
 
@@ -204,8 +200,8 @@ impl<T: super::Domains> Domains for T {
     async fn update_registration(
         &self,
         req: crate::model::UpdateRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_registration(self, req, options).await
     }
 
@@ -213,8 +209,8 @@ impl<T: super::Domains> Domains for T {
     async fn configure_management_settings(
         &self,
         req: crate::model::ConfigureManagementSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::configure_management_settings(self, req, options).await
     }
 
@@ -222,8 +218,8 @@ impl<T: super::Domains> Domains for T {
     async fn configure_dns_settings(
         &self,
         req: crate::model::ConfigureDnsSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::configure_dns_settings(self, req, options).await
     }
 
@@ -231,8 +227,8 @@ impl<T: super::Domains> Domains for T {
     async fn configure_contact_settings(
         &self,
         req: crate::model::ConfigureContactSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::configure_contact_settings(self, req, options).await
     }
 
@@ -240,8 +236,8 @@ impl<T: super::Domains> Domains for T {
     async fn export_registration(
         &self,
         req: crate::model::ExportRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_registration(self, req, options).await
     }
 
@@ -249,8 +245,8 @@ impl<T: super::Domains> Domains for T {
     async fn delete_registration(
         &self,
         req: crate::model::DeleteRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_registration(self, req, options).await
     }
 
@@ -258,8 +254,8 @@ impl<T: super::Domains> Domains for T {
     async fn retrieve_authorization_code(
         &self,
         req: crate::model::RetrieveAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizationCode>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizationCode>> {
         T::retrieve_authorization_code(self, req, options).await
     }
 
@@ -267,8 +263,8 @@ impl<T: super::Domains> Domains for T {
     async fn reset_authorization_code(
         &self,
         req: crate::model::ResetAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AuthorizationCode>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AuthorizationCode>> {
         T::reset_authorization_code(self, req, options).await
     }
 
@@ -276,10 +272,9 @@ impl<T: super::Domains> Domains for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -287,22 +282,22 @@ impl<T: super::Domains> Domains for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/domains/v1/src/tracing.rs b/src/generated/cloud/domains/v1/src/tracing.rs
index f0e5491881..67fee350a3 100644
--- a/src/generated/cloud/domains/v1/src/tracing.rs
+++ b/src/generated/cloud/domains/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn search_domains(
         &self,
         req: crate::model::SearchDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchDomainsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchDomainsResponse>> {
         self.inner.search_domains(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn retrieve_register_parameters(
         &self,
         req: crate::model::RetrieveRegisterParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetrieveRegisterParametersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetrieveRegisterParametersResponse>> {
         self.inner.retrieve_register_parameters(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn register_domain(
         &self,
         req: crate::model::RegisterDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.register_domain(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn retrieve_transfer_parameters(
         &self,
         req: crate::model::RetrieveTransferParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetrieveTransferParametersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetrieveTransferParametersResponse>> {
         self.inner.retrieve_transfer_parameters(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn transfer_domain(
         &self,
         req: crate::model::TransferDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.transfer_domain(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_registrations(
         &self,
         req: crate::model::ListRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRegistrationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRegistrationsResponse>> {
         self.inner.list_registrations(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_registration(
         &self,
         req: crate::model::GetRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Registration>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Registration>> {
         self.inner.get_registration(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn update_registration(
         &self,
         req: crate::model::UpdateRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_registration(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn configure_management_settings(
         &self,
         req: crate::model::ConfigureManagementSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.configure_management_settings(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn configure_dns_settings(
         &self,
         req: crate::model::ConfigureDnsSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.configure_dns_settings(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn configure_contact_settings(
         &self,
         req: crate::model::ConfigureContactSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.configure_contact_settings(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn export_registration(
         &self,
         req: crate::model::ExportRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_registration(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn delete_registration(
         &self,
         req: crate::model::DeleteRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_registration(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn retrieve_authorization_code(
         &self,
         req: crate::model::RetrieveAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizationCode>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizationCode>> {
         self.inner.retrieve_authorization_code(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn reset_authorization_code(
         &self,
         req: crate::model::ResetAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizationCode>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizationCode>> {
         self.inner.reset_authorization_code(req, options).await
     }
 
@@ -176,9 +176,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -186,22 +185,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/domains/v1/src/transport.rs b/src/generated/cloud/domains/v1/src/transport.rs
index a8071e958d..c90b261992 100644
--- a/src/generated/cloud/domains/v1/src/transport.rs
+++ b/src/generated/cloud/domains/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Domains](super::stub::Domains) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Domains {
 }
 
 impl Domains {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Domains for Domains {
     async fn search_domains(
         &self,
         req: crate::model::SearchDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchDomainsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchDomainsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::Domains for Domains {
     async fn retrieve_register_parameters(
         &self,
         req: crate::model::RetrieveRegisterParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetrieveRegisterParametersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetrieveRegisterParametersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -148,9 +148,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -165,13 +165,13 @@ impl super::stub::Domains for Domains {
     async fn register_domain(
         &self,
         req: crate::model::RegisterDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -208,9 +208,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -225,13 +225,13 @@ impl super::stub::Domains for Domains {
     async fn retrieve_transfer_parameters(
         &self,
         req: crate::model::RetrieveTransferParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RetrieveTransferParametersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RetrieveTransferParametersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -269,9 +269,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -286,13 +286,13 @@ impl super::stub::Domains for Domains {
     async fn transfer_domain(
         &self,
         req: crate::model::TransferDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -329,9 +329,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -346,13 +346,13 @@ impl super::stub::Domains for Domains {
     async fn list_registrations(
         &self,
         req: crate::model::ListRegistrationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRegistrationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRegistrationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -392,9 +392,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -409,13 +409,13 @@ impl super::stub::Domains for Domains {
     async fn get_registration(
         &self,
         req: crate::model::GetRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Registration>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Registration>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -456,9 +456,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -473,13 +473,13 @@ impl super::stub::Domains for Domains {
     async fn update_registration(
         &self,
         req: crate::model::UpdateRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -538,9 +538,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -555,13 +555,13 @@ impl super::stub::Domains for Domains {
     async fn configure_management_settings(
         &self,
         req: crate::model::ConfigureManagementSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -602,9 +602,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -619,13 +619,13 @@ impl super::stub::Domains for Domains {
     async fn configure_dns_settings(
         &self,
         req: crate::model::ConfigureDnsSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -666,9 +666,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -683,13 +683,13 @@ impl super::stub::Domains for Domains {
     async fn configure_contact_settings(
         &self,
         req: crate::model::ConfigureContactSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -730,9 +730,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -747,13 +747,13 @@ impl super::stub::Domains for Domains {
     async fn export_registration(
         &self,
         req: crate::model::ExportRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -794,9 +794,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -811,13 +811,13 @@ impl super::stub::Domains for Domains {
     async fn delete_registration(
         &self,
         req: crate::model::DeleteRegistrationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -858,9 +858,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -875,13 +875,13 @@ impl super::stub::Domains for Domains {
     async fn retrieve_authorization_code(
         &self,
         req: crate::model::RetrieveAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizationCode>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizationCode>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -922,9 +922,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -939,13 +939,13 @@ impl super::stub::Domains for Domains {
     async fn reset_authorization_code(
         &self,
         req: crate::model::ResetAuthorizationCodeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AuthorizationCode>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AuthorizationCode>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -986,9 +986,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1003,14 +1003,13 @@ impl super::stub::Domains for Domains {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1052,9 +1051,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1069,13 +1068,13 @@ impl super::stub::Domains for Domains {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1116,9 +1115,9 @@ impl super::stub::Domains for Domains {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1132,15 +1131,15 @@ impl super::stub::Domains for Domains {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/edgecontainer/v1/Cargo.toml b/src/generated/cloud/edgecontainer/v1/Cargo.toml
index 3cbe144909..13fc573228 100644
--- a/src/generated/cloud/edgecontainer/v1/Cargo.toml
+++ b/src/generated/cloud/edgecontainer/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/edgecontainer/v1/src/builder.rs b/src/generated/cloud/edgecontainer/v1/src/builder.rs
index 88de4c3b30..125b7b7a82 100644
--- a/src/generated/cloud/edgecontainer/v1/src/builder.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod edge_container {
     /// A builder for [EdgeContainer][crate::client::EdgeContainer].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_edgecontainer_v1::*;
     /// # use builder::edge_container::ClientBuilder;
     /// # use client::EdgeContainer;
@@ -30,19 +30,18 @@ pub mod edge_container {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EdgeContainer;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EdgeContainer;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod edge_container {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EdgeContainer>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod edge_container {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::ListClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod edge_container {
             (*self.0.stub)
                 .list_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListClustersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListClustersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod edge_container {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListClustersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListClustersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetClusterRequest::name].
@@ -241,8 +242,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::CreateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .create_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_cluster`.
@@ -313,7 +314,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -386,8 +387,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -397,7 +398,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::UpdateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -426,7 +427,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -441,7 +442,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .update_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_cluster`.
@@ -458,7 +459,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -529,8 +530,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -540,7 +541,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::UpgradeCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -569,7 +570,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -584,7 +585,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .upgrade_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `upgrade_cluster`.
@@ -601,7 +602,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -661,8 +662,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpgradeCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpgradeCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -672,7 +673,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::DeleteCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -701,7 +702,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -716,7 +717,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .delete_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_cluster`.
@@ -728,7 +729,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -771,8 +772,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -782,7 +783,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GenerateAccessToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -813,7 +814,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -823,7 +824,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .generate_access_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [cluster][crate::model::GenerateAccessTokenRequest::cluster].
@@ -836,8 +837,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAccessToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAccessToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -847,7 +848,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GenerateOfflineCredential;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -880,7 +881,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -890,7 +891,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .generate_offline_credential(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [cluster][crate::model::GenerateOfflineCredentialRequest::cluster].
@@ -903,8 +904,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateOfflineCredential {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateOfflineCredential {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -914,8 +915,8 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::ListNodePools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -946,7 +947,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -956,13 +957,13 @@ pub mod edge_container {
             (*self.0.stub)
                 .list_node_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNodePoolsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListNodePoolsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -971,15 +972,17 @@ pub mod edge_container {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListNodePoolsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListNodePoolsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1017,8 +1020,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNodePools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNodePools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1028,7 +1031,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1056,7 +1059,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1066,7 +1069,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNodePoolRequest::name].
@@ -1079,8 +1082,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1090,7 +1093,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::CreateNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1119,7 +1122,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1134,7 +1137,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .create_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_node_pool`.
@@ -1151,7 +1154,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1224,8 +1227,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1235,7 +1238,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::UpdateNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1264,7 +1267,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1279,7 +1282,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .update_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_node_pool`.
@@ -1296,7 +1299,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1367,8 +1370,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1378,7 +1381,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::DeleteNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1407,7 +1410,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1422,7 +1425,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .delete_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_node_pool`.
@@ -1434,7 +1437,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1477,8 +1480,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1488,8 +1491,8 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::ListMachines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1520,7 +1523,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1530,13 +1533,13 @@ pub mod edge_container {
             (*self.0.stub)
                 .list_machines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMachinesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListMachinesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1545,15 +1548,17 @@ pub mod edge_container {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMachinesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMachinesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1591,8 +1596,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMachines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMachines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1602,7 +1607,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetMachine;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1630,7 +1635,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1640,7 +1645,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_machine(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMachineRequest::name].
@@ -1653,8 +1658,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMachine {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMachine {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1664,8 +1669,8 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::ListVpnConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1699,7 +1704,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1709,14 +1714,16 @@ pub mod edge_container {
             (*self.0.stub)
                 .list_vpn_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVpnConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListVpnConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1724,17 +1731,17 @@ pub mod edge_container {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListVpnConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1772,8 +1779,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVpnConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVpnConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1783,7 +1790,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetVpnConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1814,7 +1821,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1824,7 +1831,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_vpn_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVpnConnectionRequest::name].
@@ -1837,8 +1844,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVpnConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVpnConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1848,7 +1855,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::CreateVpnConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1880,7 +1887,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1895,7 +1902,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .create_vpn_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_vpn_connection`.
@@ -1912,7 +1919,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1985,8 +1992,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVpnConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVpnConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1996,7 +2003,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::DeleteVpnConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2028,7 +2035,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2043,7 +2050,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .delete_vpn_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_vpn_connection`.
@@ -2055,7 +2062,7 @@ pub mod edge_container {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2098,8 +2105,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVpnConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVpnConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2109,7 +2116,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetServerConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2137,7 +2144,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2147,7 +2154,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_server_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServerConfigRequest::name].
@@ -2160,8 +2167,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServerConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServerConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2171,8 +2178,8 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2206,7 +2213,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2216,15 +2223,15 @@ pub mod edge_container {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2233,17 +2240,17 @@ pub mod edge_container {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2273,8 +2280,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2284,7 +2291,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2315,7 +2322,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2325,7 +2332,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2336,8 +2343,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2347,8 +2354,8 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2384,7 +2391,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2394,15 +2401,15 @@ pub mod edge_container {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2411,17 +2418,17 @@ pub mod edge_container {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2457,8 +2464,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2468,7 +2475,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2499,7 +2506,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2509,7 +2516,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2520,8 +2527,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2531,7 +2538,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2564,7 +2571,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2574,7 +2581,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2585,8 +2592,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2596,7 +2603,7 @@ pub mod edge_container {
     /// # Example
     /// ```
     /// # use google_cloud_edgecontainer_v1::builder::edge_container::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgecontainer_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2629,7 +2636,7 @@ pub mod edge_container {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2639,7 +2646,7 @@ pub mod edge_container {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2650,8 +2657,8 @@ pub mod edge_container {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/edgecontainer/v1/src/client.rs b/src/generated/cloud/edgecontainer/v1/src/client.rs
index 922acc28c3..226b48352d 100644
--- a/src/generated/cloud/edgecontainer/v1/src/client.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_edgecontainer_v1::client::EdgeContainer;
 /// let client = EdgeContainer::builder().build().await?;
 /// // use `client` to make requests to the Distributed Cloud Edge Container API.
@@ -67,13 +67,13 @@ impl EdgeContainer {
     /// Returns a builder for [EdgeContainer].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_edgecontainer_v1::client::EdgeContainer;
     /// let client = EdgeContainer::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::edge_container::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::edge_container::client::Factory)
+        crate::new_client_builder(super::builder::edge_container::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl EdgeContainer {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EdgeContainer>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EdgeContainer>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl EdgeContainer {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EdgeContainer> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EdgeContainer> {
         super::transport::EdgeContainer::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EdgeContainer> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EdgeContainer> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EdgeContainer::new)
diff --git a/src/generated/cloud/edgecontainer/v1/src/lib.rs b/src/generated/cloud/edgecontainer/v1/src/lib.rs
index 312f9ddfa3..0b9ee5b018 100644
--- a/src/generated/cloud/edgecontainer/v1/src/lib.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/edgecontainer/v1/src/model.rs b/src/generated/cloud/edgecontainer/v1/src/model.rs
index a1218cbbe4..f594a851eb 100644
--- a/src/generated/cloud/edgecontainer/v1/src/model.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -5926,7 +5926,7 @@ impl wkt::message::Message for ListClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListClustersResponse {
     type PageItem = crate::model::Cluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6871,7 +6871,7 @@ impl wkt::message::Message for ListNodePoolsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNodePoolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNodePoolsResponse {
     type PageItem = crate::model::NodePool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7357,7 +7357,7 @@ impl wkt::message::Message for ListMachinesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMachinesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMachinesResponse {
     type PageItem = crate::model::Machine;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7579,7 +7579,7 @@ impl wkt::message::Message for ListVpnConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVpnConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVpnConnectionsResponse {
     type PageItem = crate::model::VpnConnection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/edgecontainer/v1/src/stub.rs b/src/generated/cloud/edgecontainer/v1/src/stub.rs
index 92c970698a..1968c65a6f 100644
--- a/src/generated/cloud/edgecontainer/v1/src/stub.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn list_clusters(
         &self,
         _req: crate::model::ListClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_cluster(
         &self,
         _req: crate::model::GetClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Cluster>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Cluster>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn create_cluster(
         &self,
         _req: crate::model::CreateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn update_cluster(
         &self,
         _req: crate::model::UpdateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn upgrade_cluster(
         &self,
         _req: crate::model::UpgradeClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn delete_cluster(
         &self,
         _req: crate::model::DeleteClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn generate_access_token(
         &self,
         _req: crate::model::GenerateAccessTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateAccessTokenResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateAccessTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,11 +118,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn generate_offline_credential(
         &self,
         _req: crate::model::GenerateOfflineCredentialRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateOfflineCredentialResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateOfflineCredentialResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,9 +129,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn list_node_pools(
         &self,
         _req: crate::model::ListNodePoolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNodePoolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNodePoolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,10 +140,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_node_pool(
         &self,
         _req: crate::model::GetNodePoolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::NodePool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::NodePool>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -154,9 +150,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn create_node_pool(
         &self,
         _req: crate::model::CreateNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,9 +161,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn update_node_pool(
         &self,
         _req: crate::model::UpdateNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +172,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn delete_node_pool(
         &self,
         _req: crate::model::DeleteNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,9 +183,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn list_machines(
         &self,
         _req: crate::model::ListMachinesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMachinesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMachinesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,10 +194,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_machine(
         &self,
         _req: crate::model::GetMachineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Machine>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Machine>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -209,9 +204,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn list_vpn_connections(
         &self,
         _req: crate::model::ListVpnConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVpnConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVpnConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +215,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_vpn_connection(
         &self,
         _req: crate::model::GetVpnConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VpnConnection>>,
+        Output = crate::Result<crate::Response<crate::model::VpnConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +226,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn create_vpn_connection(
         &self,
         _req: crate::model::CreateVpnConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +237,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn delete_vpn_connection(
         &self,
         _req: crate::model::DeleteVpnConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +248,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_server_config(
         &self,
         _req: crate::model::GetServerConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServerConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ServerConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,10 +259,10 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -277,9 +272,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,10 +283,10 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -301,9 +296,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -312,8 +307,8 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -321,8 +316,8 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -332,9 +327,9 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -343,8 +338,8 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/edgecontainer/v1/src/stub/dynamic.rs b/src/generated/cloud/edgecontainer/v1/src/stub/dynamic.rs
index 2c662bf7de..b467e2b6d7 100644
--- a/src/generated/cloud/edgecontainer/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/stub/dynamic.rs
@@ -20,170 +20,168 @@ pub trait EdgeContainer: std::fmt::Debug + Send + Sync {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>>;
 
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>>;
 
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_access_token(
         &self,
         req: crate::model::GenerateAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAccessTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAccessTokenResponse>>;
 
     async fn generate_offline_credential(
         &self,
         req: crate::model::GenerateOfflineCredentialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateOfflineCredentialResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateOfflineCredentialResponse>>;
 
     async fn list_node_pools(
         &self,
         req: crate::model::ListNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNodePoolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNodePoolsResponse>>;
 
     async fn get_node_pool(
         &self,
         req: crate::model::GetNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodePool>>;
 
     async fn create_node_pool(
         &self,
         req: crate::model::CreateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_node_pool(
         &self,
         req: crate::model::UpdateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_node_pool(
         &self,
         req: crate::model::DeleteNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_machines(
         &self,
         req: crate::model::ListMachinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMachinesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMachinesResponse>>;
 
     async fn get_machine(
         &self,
         req: crate::model::GetMachineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Machine>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Machine>>;
 
     async fn list_vpn_connections(
         &self,
         req: crate::model::ListVpnConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVpnConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVpnConnectionsResponse>>;
 
     async fn get_vpn_connection(
         &self,
         req: crate::model::GetVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnConnection>>;
 
     async fn create_vpn_connection(
         &self,
         req: crate::model::CreateVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_vpn_connection(
         &self,
         req: crate::model::DeleteVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_server_config(
         &self,
         req: crate::model::GetServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServerConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServerConfig>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EdgeContainer] also implement [EdgeContainer].
@@ -193,8 +191,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>> {
         T::list_clusters(self, req, options).await
     }
 
@@ -202,8 +200,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>> {
         T::get_cluster(self, req, options).await
     }
 
@@ -211,8 +209,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_cluster(self, req, options).await
     }
 
@@ -220,8 +218,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_cluster(self, req, options).await
     }
 
@@ -229,8 +227,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::upgrade_cluster(self, req, options).await
     }
 
@@ -238,8 +236,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_cluster(self, req, options).await
     }
 
@@ -247,8 +245,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn generate_access_token(
         &self,
         req: crate::model::GenerateAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAccessTokenResponse>> {
         T::generate_access_token(self, req, options).await
     }
 
@@ -256,9 +254,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn generate_offline_credential(
         &self,
         req: crate::model::GenerateOfflineCredentialRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateOfflineCredentialResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateOfflineCredentialResponse>> {
         T::generate_offline_credential(self, req, options).await
     }
 
@@ -266,8 +263,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn list_node_pools(
         &self,
         req: crate::model::ListNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNodePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNodePoolsResponse>> {
         T::list_node_pools(self, req, options).await
     }
 
@@ -275,8 +272,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_node_pool(
         &self,
         req: crate::model::GetNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::NodePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::NodePool>> {
         T::get_node_pool(self, req, options).await
     }
 
@@ -284,8 +281,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn create_node_pool(
         &self,
         req: crate::model::CreateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_node_pool(self, req, options).await
     }
 
@@ -293,8 +290,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn update_node_pool(
         &self,
         req: crate::model::UpdateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_node_pool(self, req, options).await
     }
 
@@ -302,8 +299,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn delete_node_pool(
         &self,
         req: crate::model::DeleteNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_node_pool(self, req, options).await
     }
 
@@ -311,8 +308,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn list_machines(
         &self,
         req: crate::model::ListMachinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMachinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMachinesResponse>> {
         T::list_machines(self, req, options).await
     }
 
@@ -320,8 +317,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_machine(
         &self,
         req: crate::model::GetMachineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Machine>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Machine>> {
         T::get_machine(self, req, options).await
     }
 
@@ -329,8 +326,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn list_vpn_connections(
         &self,
         req: crate::model::ListVpnConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVpnConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVpnConnectionsResponse>> {
         T::list_vpn_connections(self, req, options).await
     }
 
@@ -338,8 +335,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_vpn_connection(
         &self,
         req: crate::model::GetVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VpnConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VpnConnection>> {
         T::get_vpn_connection(self, req, options).await
     }
 
@@ -347,8 +344,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn create_vpn_connection(
         &self,
         req: crate::model::CreateVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_vpn_connection(self, req, options).await
     }
 
@@ -356,8 +353,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn delete_vpn_connection(
         &self,
         req: crate::model::DeleteVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_vpn_connection(self, req, options).await
     }
 
@@ -365,8 +362,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_server_config(
         &self,
         req: crate::model::GetServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServerConfig>> {
         T::get_server_config(self, req, options).await
     }
 
@@ -374,9 +371,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -384,8 +380,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -393,10 +389,9 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -404,8 +399,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -413,8 +408,8 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -422,22 +417,22 @@ impl<T: super::EdgeContainer> EdgeContainer for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/edgecontainer/v1/src/tracing.rs b/src/generated/cloud/edgecontainer/v1/src/tracing.rs
index 3e4dab62e9..af0432ecff 100644
--- a/src/generated/cloud/edgecontainer/v1/src/tracing.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         self.inner.list_clusters(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         self.inner.get_cluster(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_cluster(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_cluster(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.upgrade_cluster(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_cluster(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn generate_access_token(
         &self,
         req: crate::model::GenerateAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAccessTokenResponse>> {
         self.inner.generate_access_token(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn generate_offline_credential(
         &self,
         req: crate::model::GenerateOfflineCredentialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateOfflineCredentialResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateOfflineCredentialResponse>> {
         self.inner.generate_offline_credential(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_node_pools(
         &self,
         req: crate::model::ListNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNodePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNodePoolsResponse>> {
         self.inner.list_node_pools(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_node_pool(
         &self,
         req: crate::model::GetNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodePool>> {
         self.inner.get_node_pool(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn create_node_pool(
         &self,
         req: crate::model::CreateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_node_pool(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn update_node_pool(
         &self,
         req: crate::model::UpdateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_node_pool(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn delete_node_pool(
         &self,
         req: crate::model::DeleteNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_node_pool(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_machines(
         &self,
         req: crate::model::ListMachinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMachinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMachinesResponse>> {
         self.inner.list_machines(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_machine(
         &self,
         req: crate::model::GetMachineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Machine>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Machine>> {
         self.inner.get_machine(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn list_vpn_connections(
         &self,
         req: crate::model::ListVpnConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVpnConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVpnConnectionsResponse>> {
         self.inner.list_vpn_connections(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn get_vpn_connection(
         &self,
         req: crate::model::GetVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnConnection>> {
         self.inner.get_vpn_connection(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn create_vpn_connection(
         &self,
         req: crate::model::CreateVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_vpn_connection(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn delete_vpn_connection(
         &self,
         req: crate::model::DeleteVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_vpn_connection(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn get_server_config(
         &self,
         req: crate::model::GetServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServerConfig>> {
         self.inner.get_server_config(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -239,9 +239,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -249,8 +248,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -258,8 +257,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -267,22 +266,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/edgecontainer/v1/src/transport.rs b/src/generated/cloud/edgecontainer/v1/src/transport.rs
index 6323d525c7..45868d9dc7 100644
--- a/src/generated/cloud/edgecontainer/v1/src/transport.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [EdgeContainer](super::stub::EdgeContainer) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for EdgeContainer {
 }
 
 impl EdgeContainer {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn upgrade_cluster(
         &self,
         req: crate::model::UpgradeClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -363,9 +363,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -380,13 +380,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +428,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +445,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn generate_access_token(
         &self,
         req: crate::model::GenerateAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAccessTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAccessTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +492,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +509,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn generate_offline_credential(
         &self,
         req: crate::model::GenerateOfflineCredentialRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateOfflineCredentialResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateOfflineCredentialResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -556,9 +556,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -573,13 +573,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn list_node_pools(
         &self,
         req: crate::model::ListNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNodePoolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNodePoolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -624,9 +624,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -641,13 +641,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_node_pool(
         &self,
         req: crate::model::GetNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::NodePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::NodePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -692,9 +692,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -709,13 +709,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn create_node_pool(
         &self,
         req: crate::model::CreateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -758,9 +758,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -775,13 +775,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn update_node_pool(
         &self,
         req: crate::model::UpdateNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -845,9 +845,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -862,13 +862,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn delete_node_pool(
         &self,
         req: crate::model::DeleteNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -914,9 +914,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -931,13 +931,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn list_machines(
         &self,
         req: crate::model::ListMachinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMachinesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMachinesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -978,9 +978,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -995,13 +995,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_machine(
         &self,
         req: crate::model::GetMachineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Machine>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Machine>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1042,9 +1042,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1059,13 +1059,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn list_vpn_connections(
         &self,
         req: crate::model::ListVpnConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVpnConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVpnConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1106,9 +1106,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1123,13 +1123,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_vpn_connection(
         &self,
         req: crate::model::GetVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VpnConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VpnConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1170,9 +1170,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1187,13 +1187,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn create_vpn_connection(
         &self,
         req: crate::model::CreateVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1232,9 +1232,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1249,13 +1249,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn delete_vpn_connection(
         &self,
         req: crate::model::DeleteVpnConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1297,9 +1297,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1314,13 +1314,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_server_config(
         &self,
         req: crate::model::GetServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServerConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServerConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1357,9 +1357,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1374,13 +1374,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1410,9 +1410,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1427,13 +1427,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1470,9 +1470,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1487,14 +1487,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1536,9 +1535,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1553,13 +1552,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1600,9 +1599,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1617,13 +1616,13 @@ impl super::stub::EdgeContainer for EdgeContainer {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1664,9 +1663,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1675,24 +1674,25 @@ impl super::stub::EdgeContainer for EdgeContainer {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1733,9 +1733,9 @@ impl super::stub::EdgeContainer for EdgeContainer {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1744,25 +1744,26 @@ impl super::stub::EdgeContainer for EdgeContainer {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/edgenetwork/v1/Cargo.toml b/src/generated/cloud/edgenetwork/v1/Cargo.toml
index 420bbf7c9e..a4d262ddb4 100644
--- a/src/generated/cloud/edgenetwork/v1/Cargo.toml
+++ b/src/generated/cloud/edgenetwork/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/edgenetwork/v1/src/builder.rs b/src/generated/cloud/edgenetwork/v1/src/builder.rs
index fa3b9344aa..8a23359442 100644
--- a/src/generated/cloud/edgenetwork/v1/src/builder.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod edge_network {
     /// A builder for [EdgeNetwork][crate::client::EdgeNetwork].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_edgenetwork_v1::*;
     /// # use builder::edge_network::ClientBuilder;
     /// # use client::EdgeNetwork;
@@ -30,19 +30,18 @@ pub mod edge_network {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EdgeNetwork;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EdgeNetwork;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod edge_network {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EdgeNetwork>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod edge_network {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::InitializeZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .initialize_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::InitializeZoneRequest::name].
@@ -127,8 +126,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InitializeZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InitializeZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -138,8 +137,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListZones;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -170,7 +169,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -180,13 +179,13 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_zones(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListZonesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListZonesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -195,15 +194,15 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListZonesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListZonesResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -241,8 +240,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListZones {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListZones {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +251,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -280,7 +279,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -290,7 +289,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetZoneRequest::name].
@@ -303,8 +302,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -314,8 +313,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListNetworks;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -346,7 +345,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -356,13 +355,13 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_networks(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListNetworksResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListNetworksResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -371,15 +370,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListNetworksResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListNetworksResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -417,8 +418,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListNetworks {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListNetworks {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -428,7 +429,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -456,7 +457,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -466,7 +467,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetNetworkRequest::name].
@@ -479,8 +480,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -490,7 +491,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DiagnoseNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -518,7 +519,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -528,7 +529,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .diagnose_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DiagnoseNetworkRequest::name].
@@ -541,8 +542,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DiagnoseNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DiagnoseNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -552,7 +553,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::CreateNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -581,7 +582,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -596,7 +597,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .create_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_network`.
@@ -613,7 +614,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -686,8 +687,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -697,7 +698,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DeleteNetwork;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -726,7 +727,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -741,7 +742,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .delete_network(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_network`.
@@ -753,7 +754,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -796,8 +797,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteNetwork {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteNetwork {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -807,8 +808,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListSubnets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -839,7 +840,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -849,13 +850,13 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_subnets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSubnetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSubnetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -864,15 +865,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSubnetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSubnetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -910,8 +913,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSubnets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSubnets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -921,7 +924,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetSubnet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -949,7 +952,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -959,7 +962,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_subnet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSubnetRequest::name].
@@ -972,8 +975,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSubnet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSubnet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -983,7 +986,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::CreateSubnet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1012,7 +1015,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1027,7 +1030,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .create_subnet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_subnet`.
@@ -1044,7 +1047,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1117,8 +1120,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSubnet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSubnet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1128,7 +1131,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::UpdateSubnet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1157,7 +1160,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1172,7 +1175,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .update_subnet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_subnet`.
@@ -1189,7 +1192,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1268,8 +1271,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSubnet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSubnet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1279,7 +1282,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DeleteSubnet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1308,7 +1311,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1323,7 +1326,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .delete_subnet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_subnet`.
@@ -1335,7 +1338,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1378,8 +1381,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSubnet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSubnet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1389,8 +1392,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListInterconnects;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1424,7 +1427,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1434,14 +1437,16 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_interconnects(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInterconnectsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListInterconnectsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1449,15 +1454,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInterconnectsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInterconnectsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1495,8 +1502,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInterconnects {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInterconnects {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1506,7 +1513,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetInterconnect;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1534,7 +1541,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1544,7 +1551,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_interconnect(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInterconnectRequest::name].
@@ -1557,8 +1564,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInterconnect {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInterconnect {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1568,7 +1575,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DiagnoseInterconnect;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1599,7 +1606,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1609,7 +1616,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .diagnose_interconnect(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DiagnoseInterconnectRequest::name].
@@ -1622,8 +1629,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DiagnoseInterconnect {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DiagnoseInterconnect {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1633,8 +1640,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListInterconnectAttachments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1670,7 +1677,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1680,15 +1687,15 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_interconnect_attachments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListInterconnectAttachmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1697,17 +1704,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListInterconnectAttachmentsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1745,8 +1752,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInterconnectAttachments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInterconnectAttachments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1756,7 +1763,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetInterconnectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1789,7 +1796,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1799,7 +1806,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_interconnect_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInterconnectAttachmentRequest::name].
@@ -1812,8 +1819,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInterconnectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInterconnectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1823,7 +1830,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::CreateInterconnectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1857,7 +1864,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1872,7 +1879,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .create_interconnect_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_interconnect_attachment`.
@@ -1891,7 +1898,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1967,8 +1974,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInterconnectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInterconnectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1978,7 +1985,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DeleteInterconnectAttachment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2012,7 +2019,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2027,7 +2034,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .delete_interconnect_attachment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_interconnect_attachment`.
@@ -2039,7 +2046,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2082,8 +2089,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInterconnectAttachment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInterconnectAttachment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2093,8 +2100,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListRouters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2125,7 +2132,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2135,13 +2142,13 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_routers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRoutersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRoutersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2150,15 +2157,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRoutersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRoutersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2196,8 +2205,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRouters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRouters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2207,7 +2216,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetRouter;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2235,7 +2244,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2245,7 +2254,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_router(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRouterRequest::name].
@@ -2258,8 +2267,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRouter {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRouter {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2269,7 +2278,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DiagnoseRouter;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2297,7 +2306,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2307,7 +2316,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .diagnose_router(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DiagnoseRouterRequest::name].
@@ -2320,8 +2329,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DiagnoseRouter {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DiagnoseRouter {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2331,7 +2340,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::CreateRouter;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2360,7 +2369,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2375,7 +2384,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .create_router(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_router`.
@@ -2392,7 +2401,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2465,8 +2474,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRouter {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRouter {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2476,7 +2485,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::UpdateRouter;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2505,7 +2514,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2520,7 +2529,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .update_router(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_router`.
@@ -2537,7 +2546,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2616,8 +2625,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRouter {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRouter {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2627,7 +2636,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DeleteRouter;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2656,7 +2665,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2671,7 +2680,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .delete_router(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_router`.
@@ -2683,7 +2692,7 @@ pub mod edge_network {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2726,8 +2735,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRouter {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRouter {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2737,8 +2746,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2772,7 +2781,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2782,15 +2791,15 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2799,17 +2808,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2839,8 +2848,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2850,7 +2859,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2881,7 +2890,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2891,7 +2900,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2902,8 +2911,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2913,8 +2922,8 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2950,7 +2959,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2960,15 +2969,15 @@ pub mod edge_network {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2977,17 +2986,17 @@ pub mod edge_network {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3023,8 +3032,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3034,7 +3043,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3065,7 +3074,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3075,7 +3084,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3086,8 +3095,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3097,7 +3106,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3130,7 +3139,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3140,7 +3149,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3151,8 +3160,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3162,7 +3171,7 @@ pub mod edge_network {
     /// # Example
     /// ```
     /// # use google_cloud_edgenetwork_v1::builder::edge_network::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_edgenetwork_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3195,7 +3204,7 @@ pub mod edge_network {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3205,7 +3214,7 @@ pub mod edge_network {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3216,8 +3225,8 @@ pub mod edge_network {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/edgenetwork/v1/src/client.rs b/src/generated/cloud/edgenetwork/v1/src/client.rs
index 0ce8cac999..b171655826 100644
--- a/src/generated/cloud/edgenetwork/v1/src/client.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_edgenetwork_v1::client::EdgeNetwork;
 /// let client = EdgeNetwork::builder().build().await?;
 /// // use `client` to make requests to the Distributed Cloud Edge Network API.
@@ -69,13 +69,13 @@ impl EdgeNetwork {
     /// Returns a builder for [EdgeNetwork].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_edgenetwork_v1::client::EdgeNetwork;
     /// let client = EdgeNetwork::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::edge_network::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::edge_network::client::Factory)
+        crate::new_client_builder(super::builder::edge_network::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -93,14 +93,14 @@ impl EdgeNetwork {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EdgeNetwork>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EdgeNetwork>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -109,13 +109,13 @@ impl EdgeNetwork {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EdgeNetwork> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EdgeNetwork> {
         super::transport::EdgeNetwork::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EdgeNetwork> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EdgeNetwork> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EdgeNetwork::new)
diff --git a/src/generated/cloud/edgenetwork/v1/src/lib.rs b/src/generated/cloud/edgenetwork/v1/src/lib.rs
index 96ecb1c17e..705b9e745d 100644
--- a/src/generated/cloud/edgenetwork/v1/src/lib.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/edgenetwork/v1/src/model.rs b/src/generated/cloud/edgenetwork/v1/src/model.rs
index e3547e4856..09a7020970 100644
--- a/src/generated/cloud/edgenetwork/v1/src/model.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -3528,7 +3528,7 @@ impl wkt::message::Message for ListZonesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListZonesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListZonesResponse {
     type PageItem = crate::model::Zone;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3752,7 +3752,7 @@ impl wkt::message::Message for ListNetworksResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListNetworksResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListNetworksResponse {
     type PageItem = crate::model::Network;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4149,7 +4149,7 @@ impl wkt::message::Message for ListSubnetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSubnetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSubnetsResponse {
     type PageItem = crate::model::Subnet;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4668,7 +4668,7 @@ impl wkt::message::Message for ListInterconnectsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInterconnectsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInterconnectsResponse {
     type PageItem = crate::model::Interconnect;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4890,7 +4890,9 @@ impl wkt::message::Message for ListInterconnectAttachmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInterconnectAttachmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListInterconnectAttachmentsResponse
+{
     type PageItem = crate::model::InterconnectAttachment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5290,7 +5292,7 @@ impl wkt::message::Message for ListRoutersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRoutersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRoutersResponse {
     type PageItem = crate::model::Router;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/edgenetwork/v1/src/stub.rs b/src/generated/cloud/edgenetwork/v1/src/stub.rs
index 60bbc3af0e..66d9f4b221 100644
--- a/src/generated/cloud/edgenetwork/v1/src/stub.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn initialize_zone(
         &self,
         _req: crate::model::InitializeZoneRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InitializeZoneResponse>>,
+        Output = crate::Result<crate::Response<crate::model::InitializeZoneResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_zones(
         &self,
         _req: crate::model::ListZonesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListZonesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListZonesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +64,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_zone(
         &self,
         _req: crate::model::GetZoneRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Zone>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Zone>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +74,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_networks(
         &self,
         _req: crate::model::ListNetworksRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListNetworksResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListNetworksResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +85,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_network(
         &self,
         _req: crate::model::GetNetworkRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Network>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Network>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +95,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn diagnose_network(
         &self,
         _req: crate::model::DiagnoseNetworkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiagnoseNetworkResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DiagnoseNetworkResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +106,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn create_network(
         &self,
         _req: crate::model::CreateNetworkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +117,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn delete_network(
         &self,
         _req: crate::model::DeleteNetworkRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +128,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_subnets(
         &self,
         _req: crate::model::ListSubnetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSubnetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSubnetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,10 +139,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_subnet(
         &self,
         _req: crate::model::GetSubnetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Subnet>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Subnet>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -152,9 +149,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn create_subnet(
         &self,
         _req: crate::model::CreateSubnetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +160,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn update_subnet(
         &self,
         _req: crate::model::UpdateSubnetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +171,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn delete_subnet(
         &self,
         _req: crate::model::DeleteSubnetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,9 +182,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_interconnects(
         &self,
         _req: crate::model::ListInterconnectsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInterconnectsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInterconnectsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -196,9 +193,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_interconnect(
         &self,
         _req: crate::model::GetInterconnectRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Interconnect>>,
+        Output = crate::Result<crate::Response<crate::model::Interconnect>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,9 +204,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn diagnose_interconnect(
         &self,
         _req: crate::model::DiagnoseInterconnectRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiagnoseInterconnectResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DiagnoseInterconnectResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -218,11 +215,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_interconnect_attachments(
         &self,
         _req: crate::model::ListInterconnectAttachmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListInterconnectAttachmentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListInterconnectAttachmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +226,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_interconnect_attachment(
         &self,
         _req: crate::model::GetInterconnectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InterconnectAttachment>>,
+        Output = crate::Result<crate::Response<crate::model::InterconnectAttachment>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +237,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn create_interconnect_attachment(
         &self,
         _req: crate::model::CreateInterconnectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +248,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn delete_interconnect_attachment(
         &self,
         _req: crate::model::DeleteInterconnectAttachmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,9 +259,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_routers(
         &self,
         _req: crate::model::ListRoutersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRoutersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRoutersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -275,10 +270,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_router(
         &self,
         _req: crate::model::GetRouterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Router>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Router>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -286,9 +280,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn diagnose_router(
         &self,
         _req: crate::model::DiagnoseRouterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DiagnoseRouterResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DiagnoseRouterResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -297,9 +291,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn create_router(
         &self,
         _req: crate::model::CreateRouterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -308,9 +302,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn update_router(
         &self,
         _req: crate::model::UpdateRouterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -319,9 +313,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn delete_router(
         &self,
         _req: crate::model::DeleteRouterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -330,10 +324,10 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -343,9 +337,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -354,10 +348,10 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -367,9 +361,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -378,8 +372,8 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -387,8 +381,8 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -398,9 +392,9 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -409,8 +403,8 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/edgenetwork/v1/src/stub/dynamic.rs b/src/generated/cloud/edgenetwork/v1/src/stub/dynamic.rs
index d4cb943781..343698df3d 100644
--- a/src/generated/cloud/edgenetwork/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/stub/dynamic.rs
@@ -20,206 +20,204 @@ pub trait EdgeNetwork: std::fmt::Debug + Send + Sync {
     async fn initialize_zone(
         &self,
         req: crate::model::InitializeZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InitializeZoneResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InitializeZoneResponse>>;
 
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListZonesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListZonesResponse>>;
 
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Zone>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Zone>>;
 
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNetworksResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNetworksResponse>>;
 
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>>;
 
     async fn diagnose_network(
         &self,
         req: crate::model::DiagnoseNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiagnoseNetworkResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiagnoseNetworkResponse>>;
 
     async fn create_network(
         &self,
         req: crate::model::CreateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_network(
         &self,
         req: crate::model::DeleteNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_subnets(
         &self,
         req: crate::model::ListSubnetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSubnetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSubnetsResponse>>;
 
     async fn get_subnet(
         &self,
         req: crate::model::GetSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Subnet>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Subnet>>;
 
     async fn create_subnet(
         &self,
         req: crate::model::CreateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_subnet(
         &self,
         req: crate::model::UpdateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_subnet(
         &self,
         req: crate::model::DeleteSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_interconnects(
         &self,
         req: crate::model::ListInterconnectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInterconnectsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInterconnectsResponse>>;
 
     async fn get_interconnect(
         &self,
         req: crate::model::GetInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Interconnect>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Interconnect>>;
 
     async fn diagnose_interconnect(
         &self,
         req: crate::model::DiagnoseInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiagnoseInterconnectResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiagnoseInterconnectResponse>>;
 
     async fn list_interconnect_attachments(
         &self,
         req: crate::model::ListInterconnectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInterconnectAttachmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInterconnectAttachmentsResponse>>;
 
     async fn get_interconnect_attachment(
         &self,
         req: crate::model::GetInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachment>>;
 
     async fn create_interconnect_attachment(
         &self,
         req: crate::model::CreateInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_interconnect_attachment(
         &self,
         req: crate::model::DeleteInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_routers(
         &self,
         req: crate::model::ListRoutersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutersResponse>>;
 
     async fn get_router(
         &self,
         req: crate::model::GetRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Router>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Router>>;
 
     async fn diagnose_router(
         &self,
         req: crate::model::DiagnoseRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiagnoseRouterResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiagnoseRouterResponse>>;
 
     async fn create_router(
         &self,
         req: crate::model::CreateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_router(
         &self,
         req: crate::model::UpdateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_router(
         &self,
         req: crate::model::DeleteRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::EdgeNetwork] also implement [EdgeNetwork].
@@ -229,8 +227,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn initialize_zone(
         &self,
         req: crate::model::InitializeZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InitializeZoneResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InitializeZoneResponse>> {
         T::initialize_zone(self, req, options).await
     }
 
@@ -238,8 +236,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListZonesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListZonesResponse>> {
         T::list_zones(self, req, options).await
     }
 
@@ -247,8 +245,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Zone>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Zone>> {
         T::get_zone(self, req, options).await
     }
 
@@ -256,8 +254,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListNetworksResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListNetworksResponse>> {
         T::list_networks(self, req, options).await
     }
 
@@ -265,8 +263,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Network>> {
         T::get_network(self, req, options).await
     }
 
@@ -274,8 +272,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn diagnose_network(
         &self,
         req: crate::model::DiagnoseNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiagnoseNetworkResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiagnoseNetworkResponse>> {
         T::diagnose_network(self, req, options).await
     }
 
@@ -283,8 +281,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn create_network(
         &self,
         req: crate::model::CreateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_network(self, req, options).await
     }
 
@@ -292,8 +290,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn delete_network(
         &self,
         req: crate::model::DeleteNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_network(self, req, options).await
     }
 
@@ -301,8 +299,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_subnets(
         &self,
         req: crate::model::ListSubnetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSubnetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSubnetsResponse>> {
         T::list_subnets(self, req, options).await
     }
 
@@ -310,8 +308,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_subnet(
         &self,
         req: crate::model::GetSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Subnet>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Subnet>> {
         T::get_subnet(self, req, options).await
     }
 
@@ -319,8 +317,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn create_subnet(
         &self,
         req: crate::model::CreateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_subnet(self, req, options).await
     }
 
@@ -328,8 +326,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn update_subnet(
         &self,
         req: crate::model::UpdateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_subnet(self, req, options).await
     }
 
@@ -337,8 +335,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn delete_subnet(
         &self,
         req: crate::model::DeleteSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_subnet(self, req, options).await
     }
 
@@ -346,8 +344,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_interconnects(
         &self,
         req: crate::model::ListInterconnectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInterconnectsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInterconnectsResponse>> {
         T::list_interconnects(self, req, options).await
     }
 
@@ -355,8 +353,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_interconnect(
         &self,
         req: crate::model::GetInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Interconnect>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Interconnect>> {
         T::get_interconnect(self, req, options).await
     }
 
@@ -364,8 +362,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn diagnose_interconnect(
         &self,
         req: crate::model::DiagnoseInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiagnoseInterconnectResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiagnoseInterconnectResponse>> {
         T::diagnose_interconnect(self, req, options).await
     }
 
@@ -373,9 +371,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_interconnect_attachments(
         &self,
         req: crate::model::ListInterconnectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInterconnectAttachmentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInterconnectAttachmentsResponse>> {
         T::list_interconnect_attachments(self, req, options).await
     }
 
@@ -383,8 +380,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_interconnect_attachment(
         &self,
         req: crate::model::GetInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InterconnectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InterconnectAttachment>> {
         T::get_interconnect_attachment(self, req, options).await
     }
 
@@ -392,8 +389,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn create_interconnect_attachment(
         &self,
         req: crate::model::CreateInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_interconnect_attachment(self, req, options).await
     }
 
@@ -401,8 +398,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn delete_interconnect_attachment(
         &self,
         req: crate::model::DeleteInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_interconnect_attachment(self, req, options).await
     }
 
@@ -410,8 +407,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_routers(
         &self,
         req: crate::model::ListRoutersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutersResponse>> {
         T::list_routers(self, req, options).await
     }
 
@@ -419,8 +416,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_router(
         &self,
         req: crate::model::GetRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Router>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Router>> {
         T::get_router(self, req, options).await
     }
 
@@ -428,8 +425,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn diagnose_router(
         &self,
         req: crate::model::DiagnoseRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DiagnoseRouterResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DiagnoseRouterResponse>> {
         T::diagnose_router(self, req, options).await
     }
 
@@ -437,8 +434,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn create_router(
         &self,
         req: crate::model::CreateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_router(self, req, options).await
     }
 
@@ -446,8 +443,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn update_router(
         &self,
         req: crate::model::UpdateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_router(self, req, options).await
     }
 
@@ -455,8 +452,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn delete_router(
         &self,
         req: crate::model::DeleteRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_router(self, req, options).await
     }
 
@@ -464,9 +461,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -474,8 +470,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -483,10 +479,9 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -494,8 +489,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -503,8 +498,8 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -512,22 +507,22 @@ impl<T: super::EdgeNetwork> EdgeNetwork for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/edgenetwork/v1/src/tracing.rs b/src/generated/cloud/edgenetwork/v1/src/tracing.rs
index d77c698874..8e233e8cc0 100644
--- a/src/generated/cloud/edgenetwork/v1/src/tracing.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn initialize_zone(
         &self,
         req: crate::model::InitializeZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InitializeZoneResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InitializeZoneResponse>> {
         self.inner.initialize_zone(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListZonesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListZonesResponse>> {
         self.inner.list_zones(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Zone>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Zone>> {
         self.inner.get_zone(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNetworksResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNetworksResponse>> {
         self.inner.list_networks(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         self.inner.get_network(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn diagnose_network(
         &self,
         req: crate::model::DiagnoseNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiagnoseNetworkResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiagnoseNetworkResponse>> {
         self.inner.diagnose_network(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn create_network(
         &self,
         req: crate::model::CreateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_network(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn delete_network(
         &self,
         req: crate::model::DeleteNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_network(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_subnets(
         &self,
         req: crate::model::ListSubnetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSubnetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSubnetsResponse>> {
         self.inner.list_subnets(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_subnet(
         &self,
         req: crate::model::GetSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Subnet>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Subnet>> {
         self.inner.get_subnet(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn create_subnet(
         &self,
         req: crate::model::CreateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_subnet(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn update_subnet(
         &self,
         req: crate::model::UpdateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_subnet(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn delete_subnet(
         &self,
         req: crate::model::DeleteSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_subnet(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_interconnects(
         &self,
         req: crate::model::ListInterconnectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInterconnectsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInterconnectsResponse>> {
         self.inner.list_interconnects(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_interconnect(
         &self,
         req: crate::model::GetInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Interconnect>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Interconnect>> {
         self.inner.get_interconnect(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn diagnose_interconnect(
         &self,
         req: crate::model::DiagnoseInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiagnoseInterconnectResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiagnoseInterconnectResponse>> {
         self.inner.diagnose_interconnect(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn list_interconnect_attachments(
         &self,
         req: crate::model::ListInterconnectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInterconnectAttachmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInterconnectAttachmentsResponse>> {
         self.inner.list_interconnect_attachments(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_interconnect_attachment(
         &self,
         req: crate::model::GetInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachment>> {
         self.inner.get_interconnect_attachment(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn create_interconnect_attachment(
         &self,
         req: crate::model::CreateInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_interconnect_attachment(req, options)
             .await
@@ -214,8 +214,8 @@ where
     async fn delete_interconnect_attachment(
         &self,
         req: crate::model::DeleteInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_interconnect_attachment(req, options)
             .await
@@ -225,8 +225,8 @@ where
     async fn list_routers(
         &self,
         req: crate::model::ListRoutersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutersResponse>> {
         self.inner.list_routers(req, options).await
     }
 
@@ -234,8 +234,8 @@ where
     async fn get_router(
         &self,
         req: crate::model::GetRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Router>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Router>> {
         self.inner.get_router(req, options).await
     }
 
@@ -243,8 +243,8 @@ where
     async fn diagnose_router(
         &self,
         req: crate::model::DiagnoseRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiagnoseRouterResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiagnoseRouterResponse>> {
         self.inner.diagnose_router(req, options).await
     }
 
@@ -252,8 +252,8 @@ where
     async fn create_router(
         &self,
         req: crate::model::CreateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_router(req, options).await
     }
 
@@ -261,8 +261,8 @@ where
     async fn update_router(
         &self,
         req: crate::model::UpdateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_router(req, options).await
     }
 
@@ -270,8 +270,8 @@ where
     async fn delete_router(
         &self,
         req: crate::model::DeleteRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_router(req, options).await
     }
 
@@ -279,8 +279,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -288,8 +288,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -297,9 +297,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -307,8 +306,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -316,8 +315,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -325,22 +324,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/edgenetwork/v1/src/transport.rs b/src/generated/cloud/edgenetwork/v1/src/transport.rs
index 961b8d654a..89b7cb26ab 100644
--- a/src/generated/cloud/edgenetwork/v1/src/transport.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [EdgeNetwork](super::stub::EdgeNetwork) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for EdgeNetwork {
 }
 
 impl EdgeNetwork {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn initialize_zone(
         &self,
         req: crate::model::InitializeZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InitializeZoneResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InitializeZoneResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_zones(
         &self,
         req: crate::model::ListZonesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListZonesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListZonesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_zone(
         &self,
         req: crate::model::GetZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Zone>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Zone>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -218,9 +218,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -235,13 +235,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_networks(
         &self,
         req: crate::model::ListNetworksRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListNetworksResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListNetworksResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -286,9 +286,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -303,13 +303,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_network(
         &self,
         req: crate::model::GetNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Network>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Network>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -354,9 +354,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -371,13 +371,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn diagnose_network(
         &self,
         req: crate::model::DiagnoseNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiagnoseNetworkResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiagnoseNetworkResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -422,9 +422,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -439,13 +439,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn create_network(
         &self,
         req: crate::model::CreateNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -488,9 +488,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -505,13 +505,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn delete_network(
         &self,
         req: crate::model::DeleteNetworkRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -557,9 +557,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -574,13 +574,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_subnets(
         &self,
         req: crate::model::ListSubnetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSubnetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSubnetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -625,9 +625,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -642,13 +642,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_subnet(
         &self,
         req: crate::model::GetSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Subnet>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Subnet>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -693,9 +693,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -710,13 +710,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn create_subnet(
         &self,
         req: crate::model::CreateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -759,9 +759,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -776,13 +776,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn update_subnet(
         &self,
         req: crate::model::UpdateSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -846,9 +846,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -863,13 +863,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn delete_subnet(
         &self,
         req: crate::model::DeleteSubnetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -915,9 +915,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -932,13 +932,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_interconnects(
         &self,
         req: crate::model::ListInterconnectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInterconnectsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInterconnectsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -983,9 +983,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1000,13 +1000,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_interconnect(
         &self,
         req: crate::model::GetInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Interconnect>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Interconnect>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1051,9 +1051,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1068,13 +1068,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn diagnose_interconnect(
         &self,
         req: crate::model::DiagnoseInterconnectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiagnoseInterconnectResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiagnoseInterconnectResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1119,9 +1119,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1136,13 +1136,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_interconnect_attachments(
         &self,
         req: crate::model::ListInterconnectAttachmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInterconnectAttachmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInterconnectAttachmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1187,9 +1187,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1204,13 +1204,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_interconnect_attachment(
         &self,
         req: crate::model::GetInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InterconnectAttachment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InterconnectAttachment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1255,9 +1255,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1272,13 +1272,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn create_interconnect_attachment(
         &self,
         req: crate::model::CreateInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1322,9 +1322,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1339,13 +1339,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn delete_interconnect_attachment(
         &self,
         req: crate::model::DeleteInterconnectAttachmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1391,9 +1391,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1408,13 +1408,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_routers(
         &self,
         req: crate::model::ListRoutersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1459,9 +1459,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1476,13 +1476,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_router(
         &self,
         req: crate::model::GetRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Router>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Router>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1527,9 +1527,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1544,13 +1544,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn diagnose_router(
         &self,
         req: crate::model::DiagnoseRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DiagnoseRouterResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DiagnoseRouterResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1595,9 +1595,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1612,13 +1612,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn create_router(
         &self,
         req: crate::model::CreateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1661,9 +1661,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1678,13 +1678,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn update_router(
         &self,
         req: crate::model::UpdateRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1748,9 +1748,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1765,13 +1765,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn delete_router(
         &self,
         req: crate::model::DeleteRouterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1817,9 +1817,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1834,13 +1834,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1870,9 +1870,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1887,13 +1887,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1930,9 +1930,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1947,14 +1947,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1996,9 +1995,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2013,13 +2012,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2060,9 +2059,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2077,13 +2076,13 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2124,9 +2123,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2135,24 +2134,25 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2193,9 +2193,9 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2204,25 +2204,26 @@ impl super::stub::EdgeNetwork for EdgeNetwork {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/essentialcontacts/v1/Cargo.toml b/src/generated/cloud/essentialcontacts/v1/Cargo.toml
index a5e2fba2ea..3e737ccedd 100644
--- a/src/generated/cloud/essentialcontacts/v1/Cargo.toml
+++ b/src/generated/cloud/essentialcontacts/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/essentialcontacts/v1/src/builder.rs b/src/generated/cloud/essentialcontacts/v1/src/builder.rs
index 68a241f675..9b138486f9 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/builder.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod essential_contacts_service {
     /// A builder for [EssentialContactsService][crate::client::EssentialContactsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_essentialcontacts_v1::*;
     /// # use builder::essential_contacts_service::ClientBuilder;
     /// # use client::EssentialContactsService;
@@ -30,19 +30,18 @@ pub mod essential_contacts_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EssentialContactsService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EssentialContactsService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod essential_contacts_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EssentialContactsService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod essential_contacts_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::CreateContact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .create_contact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateContactRequest::parent].
@@ -149,8 +148,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateContact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateContact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -160,7 +159,7 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::UpdateContact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -188,7 +187,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -198,7 +197,7 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .update_contact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [contact][crate::model::UpdateContactRequest::contact].
@@ -243,8 +242,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateContact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateContact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -254,8 +253,8 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::ListContacts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -286,7 +285,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,13 +295,13 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .list_contacts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListContactsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListContactsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -311,15 +310,17 @@ pub mod essential_contacts_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListContactsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListContactsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -345,8 +346,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListContacts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListContacts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -356,7 +357,7 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::GetContact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -384,7 +385,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -394,7 +395,7 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .get_contact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetContactRequest::name].
@@ -407,8 +408,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetContact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetContact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -418,7 +419,7 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::DeleteContact;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -446,7 +447,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -456,7 +457,7 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .delete_contact(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteContactRequest::name].
@@ -469,8 +470,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteContact {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteContact {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -480,8 +481,8 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::ComputeContacts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -512,7 +513,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -522,14 +523,16 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .compute_contacts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ComputeContactsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ComputeContactsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -537,15 +540,17 @@ pub mod essential_contacts_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ComputeContactsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ComputeContactsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -582,8 +587,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ComputeContacts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ComputeContacts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -593,7 +598,7 @@ pub mod essential_contacts_service {
     /// # Example
     /// ```
     /// # use google_cloud_essentialcontacts_v1::builder::essential_contacts_service::SendTestMessage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_essentialcontacts_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -621,7 +626,7 @@ pub mod essential_contacts_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -631,7 +636,7 @@ pub mod essential_contacts_service {
             (*self.0.stub)
                 .send_test_message(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [contacts][crate::model::SendTestMessageRequest::contacts].
@@ -668,8 +673,8 @@ pub mod essential_contacts_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SendTestMessage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SendTestMessage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/essentialcontacts/v1/src/client.rs b/src/generated/cloud/essentialcontacts/v1/src/client.rs
index 2e6cb99dbe..5fba08fee6 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/client.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_essentialcontacts_v1::client::EssentialContactsService;
 /// let client = EssentialContactsService::builder().build().await?;
 /// // use `client` to make requests to the Essential Contacts API.
@@ -66,15 +66,13 @@ impl EssentialContactsService {
     /// Returns a builder for [EssentialContactsService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_essentialcontacts_v1::client::EssentialContactsService;
     /// let client = EssentialContactsService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::essential_contacts_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::essential_contacts_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::essential_contacts_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl EssentialContactsService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::EssentialContactsService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -110,13 +108,13 @@ impl EssentialContactsService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EssentialContactsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EssentialContactsService> {
         super::transport::EssentialContactsService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EssentialContactsService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EssentialContactsService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EssentialContactsService::new)
diff --git a/src/generated/cloud/essentialcontacts/v1/src/lib.rs b/src/generated/cloud/essentialcontacts/v1/src/lib.rs
index b93d49c8a8..d3ef7d4551 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/lib.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/essentialcontacts/v1/src/model.rs b/src/generated/cloud/essentialcontacts/v1/src/model.rs
index 5553938f2a..dc4e916372 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/model.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -322,7 +322,7 @@ impl wkt::message::Message for ListContactsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListContactsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListContactsResponse {
     type PageItem = crate::model::Contact;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -740,7 +740,7 @@ impl wkt::message::Message for ComputeContactsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ComputeContactsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ComputeContactsResponse {
     type PageItem = crate::model::Contact;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/essentialcontacts/v1/src/stub.rs b/src/generated/cloud/essentialcontacts/v1/src/stub.rs
index 7d93a9e4b0..98597ad0d0 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/stub.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn create_contact(
         &self,
         _req: crate::model::CreateContactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Contact>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Contact>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,10 +52,9 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn update_contact(
         &self,
         _req: crate::model::UpdateContactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Contact>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Contact>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +62,9 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn list_contacts(
         &self,
         _req: crate::model::ListContactsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListContactsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListContactsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +73,9 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn get_contact(
         &self,
         _req: crate::model::GetContactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Contact>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Contact>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +83,8 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn delete_contact(
         &self,
         _req: crate::model::DeleteContactRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +92,9 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn compute_contacts(
         &self,
         _req: crate::model::ComputeContactsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ComputeContactsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ComputeContactsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,8 +103,8 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     fn send_test_message(
         &self,
         _req: crate::model::SendTestMessageRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/essentialcontacts/v1/src/stub/dynamic.rs b/src/generated/cloud/essentialcontacts/v1/src/stub/dynamic.rs
index e0aca35adf..8b1e5786ef 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/stub/dynamic.rs
@@ -20,44 +20,44 @@ pub trait EssentialContactsService: std::fmt::Debug + Send + Sync {
     async fn create_contact(
         &self,
         req: crate::model::CreateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contact>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contact>>;
 
     async fn update_contact(
         &self,
         req: crate::model::UpdateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contact>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contact>>;
 
     async fn list_contacts(
         &self,
         req: crate::model::ListContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContactsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContactsResponse>>;
 
     async fn get_contact(
         &self,
         req: crate::model::GetContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contact>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contact>>;
 
     async fn delete_contact(
         &self,
         req: crate::model::DeleteContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn compute_contacts(
         &self,
         req: crate::model::ComputeContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ComputeContactsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ComputeContactsResponse>>;
 
     async fn send_test_message(
         &self,
         req: crate::model::SendTestMessageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::EssentialContactsService] also implement [EssentialContactsService].
@@ -67,8 +67,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn create_contact(
         &self,
         req: crate::model::CreateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contact>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contact>> {
         T::create_contact(self, req, options).await
     }
 
@@ -76,8 +76,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn update_contact(
         &self,
         req: crate::model::UpdateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contact>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contact>> {
         T::update_contact(self, req, options).await
     }
 
@@ -85,8 +85,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn list_contacts(
         &self,
         req: crate::model::ListContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListContactsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListContactsResponse>> {
         T::list_contacts(self, req, options).await
     }
 
@@ -94,8 +94,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn get_contact(
         &self,
         req: crate::model::GetContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Contact>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Contact>> {
         T::get_contact(self, req, options).await
     }
 
@@ -103,8 +103,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn delete_contact(
         &self,
         req: crate::model::DeleteContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_contact(self, req, options).await
     }
 
@@ -112,8 +112,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn compute_contacts(
         &self,
         req: crate::model::ComputeContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ComputeContactsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ComputeContactsResponse>> {
         T::compute_contacts(self, req, options).await
     }
 
@@ -121,8 +121,8 @@ impl<T: super::EssentialContactsService> EssentialContactsService for T {
     async fn send_test_message(
         &self,
         req: crate::model::SendTestMessageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::send_test_message(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/essentialcontacts/v1/src/tracing.rs b/src/generated/cloud/essentialcontacts/v1/src/tracing.rs
index c71ede06ec..25618c0c0b 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/tracing.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_contact(
         &self,
         req: crate::model::CreateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contact>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contact>> {
         self.inner.create_contact(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_contact(
         &self,
         req: crate::model::UpdateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contact>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contact>> {
         self.inner.update_contact(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_contacts(
         &self,
         req: crate::model::ListContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContactsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContactsResponse>> {
         self.inner.list_contacts(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_contact(
         &self,
         req: crate::model::GetContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contact>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contact>> {
         self.inner.get_contact(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_contact(
         &self,
         req: crate::model::DeleteContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_contact(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn compute_contacts(
         &self,
         req: crate::model::ComputeContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ComputeContactsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ComputeContactsResponse>> {
         self.inner.compute_contacts(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn send_test_message(
         &self,
         req: crate::model::SendTestMessageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.send_test_message(req, options).await
     }
 }
diff --git a/src/generated/cloud/essentialcontacts/v1/src/transport.rs b/src/generated/cloud/essentialcontacts/v1/src/transport.rs
index 07035e0423..5ef3a9464e 100644
--- a/src/generated/cloud/essentialcontacts/v1/src/transport.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [EssentialContactsService](super::stub::EssentialContactsService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for EssentialContactsService {
 }
 
 impl EssentialContactsService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
     async fn create_contact(
         &self,
         req: crate::model::CreateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contact>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contact>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -122,9 +122,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -139,13 +139,13 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
     async fn update_contact(
         &self,
         req: crate::model::UpdateContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contact>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contact>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -302,9 +302,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -319,13 +319,13 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
     async fn list_contacts(
         &self,
         req: crate::model::ListContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListContactsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListContactsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -404,9 +404,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -421,13 +421,13 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
     async fn get_contact(
         &self,
         req: crate::model::GetContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Contact>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Contact>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -530,9 +530,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -547,13 +547,13 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
     async fn delete_contact(
         &self,
         req: crate::model::DeleteContactRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -656,9 +656,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -667,24 +667,25 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn compute_contacts(
         &self,
         req: crate::model::ComputeContactsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ComputeContactsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ComputeContactsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -781,9 +782,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -798,13 +799,13 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
     async fn send_test_message(
         &self,
         req: crate::model::SendTestMessageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -877,9 +878,9 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -888,11 +889,12 @@ impl super::stub::EssentialContactsService for EssentialContactsService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/eventarc/publishing/v1/Cargo.toml b/src/generated/cloud/eventarc/publishing/v1/Cargo.toml
index 543b3bbfb1..7ef71532f2 100644
--- a/src/generated/cloud/eventarc/publishing/v1/Cargo.toml
+++ b/src/generated/cloud/eventarc/publishing/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/builder.rs b/src/generated/cloud/eventarc/publishing/v1/src/builder.rs
index 5ff3b5446a..68f7733d5c 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/builder.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod publisher {
     /// A builder for [Publisher][crate::client::Publisher].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_eventarc_publishing_v1::*;
     /// # use builder::publisher::ClientBuilder;
     /// # use client::Publisher;
@@ -30,19 +30,18 @@ pub mod publisher {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Publisher;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Publisher;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod publisher {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Publisher>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod publisher {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod publisher {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_publishing_v1::builder::publisher::PublishChannelConnectionEvents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_publishing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -109,7 +108,7 @@ pub mod publisher {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -119,7 +118,7 @@ pub mod publisher {
             (*self.0.stub)
                 .publish_channel_connection_events(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [channel_connection][crate::model::PublishChannelConnectionEventsRequest::channel_connection].
@@ -152,8 +151,8 @@ pub mod publisher {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PublishChannelConnectionEvents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PublishChannelConnectionEvents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -163,7 +162,7 @@ pub mod publisher {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_publishing_v1::builder::publisher::PublishEvents;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_publishing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -191,7 +190,7 @@ pub mod publisher {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -201,7 +200,7 @@ pub mod publisher {
             (*self.0.stub)
                 .publish_events(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [channel][crate::model::PublishEventsRequest::channel].
@@ -234,8 +233,8 @@ pub mod publisher {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PublishEvents {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PublishEvents {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -245,7 +244,7 @@ pub mod publisher {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_publishing_v1::builder::publisher::Publish;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_publishing_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -273,7 +272,7 @@ pub mod publisher {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -283,7 +282,7 @@ pub mod publisher {
             (*self.0.stub)
                 .publish(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [message_bus][crate::model::PublishRequest::message_bus].
@@ -346,8 +345,8 @@ pub mod publisher {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Publish {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Publish {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/client.rs b/src/generated/cloud/eventarc/publishing/v1/src/client.rs
index 98e4e03aeb..eecc2530d3 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/client.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_eventarc_publishing_v1::client::Publisher;
 /// let client = Publisher::builder().build().await?;
 /// // use `client` to make requests to the Eventarc Publishing API.
@@ -94,13 +94,13 @@ impl Publisher {
     /// Returns a builder for [Publisher].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_eventarc_publishing_v1::client::Publisher;
     /// let client = Publisher::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::publisher::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::publisher::client::Factory)
+        crate::new_client_builder(super::builder::publisher::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -118,14 +118,14 @@ impl Publisher {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Publisher>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Publisher>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -134,13 +134,13 @@ impl Publisher {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Publisher> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Publisher> {
         super::transport::Publisher::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Publisher> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Publisher> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Publisher::new)
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/lib.rs b/src/generated/cloud/eventarc/publishing/v1/src/lib.rs
index 833ea66959..96023940b8 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/lib.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/model.rs b/src/generated/cloud/eventarc/publishing/v1/src/model.rs
index 9c4ce1587a..74004199a7 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/model.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/stub.rs b/src/generated/cloud/eventarc/publishing/v1/src/stub.rs
index 8ab9b164c2..6ec1761887 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/stub.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/stub.rs
@@ -42,10 +42,10 @@ pub trait Publisher: std::fmt::Debug + Send + Sync {
     fn publish_channel_connection_events(
         &self,
         _req: crate::model::PublishChannelConnectionEventsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::PublishChannelConnectionEventsResponse>,
+            crate::Response<crate::model::PublishChannelConnectionEventsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -55,9 +55,9 @@ pub trait Publisher: std::fmt::Debug + Send + Sync {
     fn publish_events(
         &self,
         _req: crate::model::PublishEventsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublishEventsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PublishEventsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +66,9 @@ pub trait Publisher: std::fmt::Debug + Send + Sync {
     fn publish(
         &self,
         _req: crate::model::PublishRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublishResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PublishResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/stub/dynamic.rs b/src/generated/cloud/eventarc/publishing/v1/src/stub/dynamic.rs
index 212fd79655..1963708db6 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/stub/dynamic.rs
@@ -20,20 +20,20 @@ pub trait Publisher: std::fmt::Debug + Send + Sync {
     async fn publish_channel_connection_events(
         &self,
         req: crate::model::PublishChannelConnectionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublishChannelConnectionEventsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublishChannelConnectionEventsResponse>>;
 
     async fn publish_events(
         &self,
         req: crate::model::PublishEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublishEventsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublishEventsResponse>>;
 
     async fn publish(
         &self,
         req: crate::model::PublishRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublishResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublishResponse>>;
 }
 
 /// All implementations of [super::Publisher] also implement [Publisher].
@@ -43,9 +43,8 @@ impl<T: super::Publisher> Publisher for T {
     async fn publish_channel_connection_events(
         &self,
         req: crate::model::PublishChannelConnectionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublishChannelConnectionEventsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublishChannelConnectionEventsResponse>> {
         T::publish_channel_connection_events(self, req, options).await
     }
 
@@ -53,8 +52,8 @@ impl<T: super::Publisher> Publisher for T {
     async fn publish_events(
         &self,
         req: crate::model::PublishEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublishEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublishEventsResponse>> {
         T::publish_events(self, req, options).await
     }
 
@@ -62,8 +61,8 @@ impl<T: super::Publisher> Publisher for T {
     async fn publish(
         &self,
         req: crate::model::PublishRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublishResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublishResponse>> {
         T::publish(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/tracing.rs b/src/generated/cloud/eventarc/publishing/v1/src/tracing.rs
index 732764fe6b..49c670e528 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/tracing.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn publish_channel_connection_events(
         &self,
         req: crate::model::PublishChannelConnectionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublishChannelConnectionEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublishChannelConnectionEventsResponse>> {
         self.inner
             .publish_channel_connection_events(req, options)
             .await
@@ -52,8 +52,8 @@ where
     async fn publish_events(
         &self,
         req: crate::model::PublishEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublishEventsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublishEventsResponse>> {
         self.inner.publish_events(req, options).await
     }
 
@@ -61,8 +61,8 @@ where
     async fn publish(
         &self,
         req: crate::model::PublishRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublishResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublishResponse>> {
         self.inner.publish(req, options).await
     }
 }
diff --git a/src/generated/cloud/eventarc/publishing/v1/src/transport.rs b/src/generated/cloud/eventarc/publishing/v1/src/transport.rs
index 36272730a7..dbbcb6ea44 100644
--- a/src/generated/cloud/eventarc/publishing/v1/src/transport.rs
+++ b/src/generated/cloud/eventarc/publishing/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Publisher](super::stub::Publisher) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Publisher {
 }
 
 impl Publisher {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Publisher for Publisher {
     async fn publish_channel_connection_events(
         &self,
         req: crate::model::PublishChannelConnectionEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublishChannelConnectionEventsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublishChannelConnectionEventsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -94,9 +94,9 @@ impl super::stub::Publisher for Publisher {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -111,13 +111,13 @@ impl super::stub::Publisher for Publisher {
     async fn publish_events(
         &self,
         req: crate::model::PublishEventsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublishEventsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublishEventsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -158,9 +158,9 @@ impl super::stub::Publisher for Publisher {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -175,13 +175,13 @@ impl super::stub::Publisher for Publisher {
     async fn publish(
         &self,
         req: crate::model::PublishRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublishResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublishResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -222,9 +222,9 @@ impl super::stub::Publisher for Publisher {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/eventarc/v1/Cargo.toml b/src/generated/cloud/eventarc/v1/Cargo.toml
index 5eddd14c62..dde39571af 100644
--- a/src/generated/cloud/eventarc/v1/Cargo.toml
+++ b/src/generated/cloud/eventarc/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/eventarc/v1/src/builder.rs b/src/generated/cloud/eventarc/v1/src/builder.rs
index 3acb9c8af8..4b1c95ea93 100644
--- a/src/generated/cloud/eventarc/v1/src/builder.rs
+++ b/src/generated/cloud/eventarc/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod eventarc {
     /// A builder for [Eventarc][crate::client::Eventarc].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_eventarc_v1::*;
     /// # use builder::eventarc::ClientBuilder;
     /// # use client::Eventarc;
@@ -30,19 +30,18 @@ pub mod eventarc {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Eventarc;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Eventarc;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod eventarc {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Eventarc>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod eventarc {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetTrigger;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -100,7 +99,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -110,7 +109,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_trigger(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTriggerRequest::name].
@@ -123,8 +122,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTrigger {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTrigger {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -134,8 +133,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListTriggers;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -164,7 +163,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -174,13 +173,13 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_triggers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTriggersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTriggersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -189,15 +188,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTriggersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTriggersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -235,8 +236,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTriggers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTriggers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +247,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreateTrigger;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -273,7 +274,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -288,7 +289,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_trigger(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_trigger`.
@@ -305,7 +306,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -378,8 +379,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTrigger {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTrigger {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -389,7 +390,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdateTrigger;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -416,7 +417,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -431,7 +432,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_trigger(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_trigger`.
@@ -448,7 +449,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -525,8 +526,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTrigger {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTrigger {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -536,7 +537,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteTrigger;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -563,7 +564,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -578,7 +579,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_trigger(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_trigger`.
@@ -595,7 +596,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -650,8 +651,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTrigger {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTrigger {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -661,7 +662,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -687,7 +688,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -697,7 +698,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetChannelRequest::name].
@@ -710,8 +711,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -721,8 +722,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListChannels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -751,7 +752,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -761,13 +762,13 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_channels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListChannelsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListChannelsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -776,15 +777,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListChannelsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListChannelsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -816,8 +819,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListChannels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListChannels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -827,7 +830,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreateChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -854,7 +857,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -869,7 +872,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_channel`.
@@ -886,7 +889,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -959,8 +962,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -970,7 +973,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdateChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -997,7 +1000,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1012,7 +1015,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_channel`.
@@ -1029,7 +1032,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1100,8 +1103,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1111,7 +1114,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1138,7 +1141,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1153,7 +1156,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_channel`.
@@ -1170,7 +1173,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1213,8 +1216,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1224,7 +1227,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetProvider;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1250,7 +1253,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1260,7 +1263,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_provider(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProviderRequest::name].
@@ -1273,8 +1276,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProvider {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProvider {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1284,8 +1287,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListProviders;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1314,7 +1317,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1324,13 +1327,13 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_providers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProvidersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListProvidersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1339,15 +1342,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListProvidersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListProvidersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1385,8 +1390,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProviders {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProviders {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1396,7 +1401,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetChannelConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1425,7 +1430,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1435,7 +1440,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_channel_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetChannelConnectionRequest::name].
@@ -1448,8 +1453,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetChannelConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetChannelConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1459,8 +1464,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListChannelConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1492,7 +1497,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1502,15 +1507,15 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_channel_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListChannelConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1519,17 +1524,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListChannelConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1555,8 +1560,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListChannelConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListChannelConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1566,7 +1571,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreateChannelConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1598,7 +1603,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1613,7 +1618,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_channel_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_channel_connection`.
@@ -1632,7 +1637,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1699,8 +1704,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateChannelConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateChannelConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1710,7 +1715,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteChannelConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1742,7 +1747,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1757,7 +1762,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_channel_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_channel_connection`.
@@ -1776,7 +1781,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1813,8 +1818,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteChannelConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteChannelConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1824,7 +1829,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetGoogleChannelConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1853,7 +1858,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1863,7 +1868,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_google_channel_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGoogleChannelConfigRequest::name].
@@ -1876,8 +1881,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGoogleChannelConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGoogleChannelConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1887,7 +1892,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdateGoogleChannelConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1918,7 +1923,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1928,7 +1933,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_google_channel_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [google_channel_config][crate::model::UpdateGoogleChannelConfigRequest::google_channel_config].
@@ -1973,8 +1978,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGoogleChannelConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGoogleChannelConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1984,7 +1989,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetMessageBus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2010,7 +2015,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2020,7 +2025,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_message_bus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMessageBusRequest::name].
@@ -2033,8 +2038,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMessageBus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMessageBus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2044,8 +2049,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListMessageBuses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2077,7 +2082,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2087,14 +2092,16 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_message_buses(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMessageBusesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMessageBusesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2102,15 +2109,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMessageBusesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMessageBusesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2148,8 +2157,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMessageBuses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMessageBuses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2159,7 +2168,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListMessageBusEnrollments;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2190,7 +2199,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2200,7 +2209,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_message_bus_enrollments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListMessageBusEnrollmentsRequest::parent].
@@ -2225,8 +2234,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMessageBusEnrollments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMessageBusEnrollments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2236,7 +2245,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreateMessageBus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2266,7 +2275,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2281,7 +2290,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_message_bus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_message_bus`.
@@ -2298,7 +2307,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2371,8 +2380,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMessageBus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMessageBus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2382,7 +2391,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdateMessageBus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2412,7 +2421,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2427,7 +2436,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_message_bus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_message_bus`.
@@ -2444,7 +2453,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2525,8 +2534,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMessageBus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMessageBus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2536,7 +2545,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteMessageBus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2566,7 +2575,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2581,7 +2590,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_message_bus(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_message_bus`.
@@ -2598,7 +2607,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2653,8 +2662,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMessageBus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMessageBus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2664,7 +2673,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetEnrollment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2690,7 +2699,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2700,7 +2709,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_enrollment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEnrollmentRequest::name].
@@ -2713,8 +2722,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEnrollment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEnrollment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2724,8 +2733,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListEnrollments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2754,7 +2763,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2764,14 +2773,16 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_enrollments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEnrollmentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEnrollmentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2779,15 +2790,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEnrollmentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEnrollmentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2825,8 +2838,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEnrollments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEnrollments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2836,7 +2849,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreateEnrollment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2866,7 +2879,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2881,7 +2894,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_enrollment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_enrollment`.
@@ -2898,7 +2911,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2971,8 +2984,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEnrollment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEnrollment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2982,7 +2995,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdateEnrollment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3012,7 +3025,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3027,7 +3040,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_enrollment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_enrollment`.
@@ -3044,7 +3057,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3125,8 +3138,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEnrollment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEnrollment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3136,7 +3149,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteEnrollment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3166,7 +3179,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3181,7 +3194,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_enrollment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_enrollment`.
@@ -3198,7 +3211,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3253,8 +3266,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEnrollment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEnrollment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3264,7 +3277,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetPipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3290,7 +3303,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3300,7 +3313,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPipelineRequest::name].
@@ -3313,8 +3326,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3324,8 +3337,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListPipelines;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3354,7 +3367,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3364,13 +3377,13 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_pipelines(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPipelinesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListPipelinesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3379,15 +3392,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListPipelinesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListPipelinesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3425,8 +3440,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPipelines {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPipelines {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3436,7 +3451,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreatePipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3463,7 +3478,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3478,7 +3493,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_pipeline`.
@@ -3495,7 +3510,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3568,8 +3583,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3579,7 +3594,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdatePipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3606,7 +3621,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3621,7 +3636,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_pipeline`.
@@ -3638,7 +3653,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3719,8 +3734,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3730,7 +3745,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeletePipeline;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3757,7 +3772,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3772,7 +3787,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_pipeline(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_pipeline`.
@@ -3789,7 +3804,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3844,8 +3859,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePipeline {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePipeline {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3855,7 +3870,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetGoogleApiSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3884,7 +3899,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3894,7 +3909,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_google_api_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGoogleApiSourceRequest::name].
@@ -3907,8 +3922,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGoogleApiSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGoogleApiSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3918,8 +3933,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListGoogleApiSources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3951,7 +3966,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3961,14 +3976,16 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_google_api_sources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGoogleApiSourcesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListGoogleApiSourcesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3976,17 +3993,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListGoogleApiSourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4024,8 +4041,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGoogleApiSources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGoogleApiSources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4035,7 +4052,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CreateGoogleApiSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4065,7 +4082,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4080,7 +4097,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .create_google_api_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_google_api_source`.
@@ -4097,7 +4114,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4170,8 +4187,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGoogleApiSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGoogleApiSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4181,7 +4198,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::UpdateGoogleApiSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4211,7 +4228,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4226,7 +4243,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .update_google_api_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_google_api_source`.
@@ -4243,7 +4260,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4324,8 +4341,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGoogleApiSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGoogleApiSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4335,7 +4352,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteGoogleApiSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4365,7 +4382,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4380,7 +4397,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_google_api_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_google_api_source`.
@@ -4397,7 +4414,7 @@ pub mod eventarc {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4452,8 +4469,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGoogleApiSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGoogleApiSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4463,8 +4480,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4496,7 +4513,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4506,15 +4523,15 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4523,17 +4540,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4563,8 +4580,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4574,7 +4591,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4603,7 +4620,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4613,7 +4630,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4624,8 +4641,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4635,7 +4652,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4664,7 +4681,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4674,7 +4691,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4727,8 +4744,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4738,7 +4755,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4767,7 +4784,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4777,7 +4794,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4808,8 +4825,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4819,7 +4836,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4850,7 +4867,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4860,7 +4877,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4886,8 +4903,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4897,8 +4914,8 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4932,7 +4949,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4942,15 +4959,15 @@ pub mod eventarc {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4959,17 +4976,17 @@ pub mod eventarc {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5005,8 +5022,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5016,7 +5033,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5045,7 +5062,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5055,7 +5072,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5066,8 +5083,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5077,7 +5094,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5108,7 +5125,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5118,7 +5135,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5129,8 +5146,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5140,7 +5157,7 @@ pub mod eventarc {
     /// # Example
     /// ```
     /// # use google_cloud_eventarc_v1::builder::eventarc::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_eventarc_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5171,7 +5188,7 @@ pub mod eventarc {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5181,7 +5198,7 @@ pub mod eventarc {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5192,8 +5209,8 @@ pub mod eventarc {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/eventarc/v1/src/client.rs b/src/generated/cloud/eventarc/v1/src/client.rs
index 126a24c964..caefb628aa 100644
--- a/src/generated/cloud/eventarc/v1/src/client.rs
+++ b/src/generated/cloud/eventarc/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_eventarc_v1::client::Eventarc;
 /// let client = Eventarc::builder().build().await?;
 /// // use `client` to make requests to the Eventarc API.
@@ -67,13 +67,13 @@ impl Eventarc {
     /// Returns a builder for [Eventarc].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_eventarc_v1::client::Eventarc;
     /// let client = Eventarc::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::eventarc::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::eventarc::client::Factory)
+        crate::new_client_builder(super::builder::eventarc::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl Eventarc {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Eventarc>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Eventarc>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl Eventarc {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Eventarc> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Eventarc> {
         super::transport::Eventarc::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Eventarc> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Eventarc> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Eventarc::new)
diff --git a/src/generated/cloud/eventarc/v1/src/lib.rs b/src/generated/cloud/eventarc/v1/src/lib.rs
index e6901b2253..896b86e06b 100644
--- a/src/generated/cloud/eventarc/v1/src/lib.rs
+++ b/src/generated/cloud/eventarc/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/eventarc/v1/src/model.rs b/src/generated/cloud/eventarc/v1/src/model.rs
index a3136506de..c146d28e88 100644
--- a/src/generated/cloud/eventarc/v1/src/model.rs
+++ b/src/generated/cloud/eventarc/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -1420,7 +1420,7 @@ impl wkt::message::Message for ListTriggersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTriggersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTriggersResponse {
     type PageItem = crate::model::Trigger;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1944,7 +1944,7 @@ impl wkt::message::Message for ListChannelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListChannelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListChannelsResponse {
     type PageItem = crate::model::Channel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2433,7 +2433,7 @@ impl wkt::message::Message for ListProvidersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProvidersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProvidersResponse {
     type PageItem = crate::model::Provider;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2633,7 +2633,7 @@ impl wkt::message::Message for ListChannelConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListChannelConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListChannelConnectionsResponse {
     type PageItem = crate::model::ChannelConnection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3114,7 +3114,7 @@ impl wkt::message::Message for ListMessageBusesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMessageBusesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMessageBusesResponse {
     type PageItem = crate::model::MessageBus;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3800,7 +3800,7 @@ impl wkt::message::Message for ListEnrollmentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEnrollmentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEnrollmentsResponse {
     type PageItem = crate::model::Enrollment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4341,7 +4341,7 @@ impl wkt::message::Message for ListPipelinesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPipelinesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPipelinesResponse {
     type PageItem = crate::model::Pipeline;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4882,7 +4882,7 @@ impl wkt::message::Message for ListGoogleApiSourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGoogleApiSourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGoogleApiSourcesResponse {
     type PageItem = crate::model::GoogleApiSource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/eventarc/v1/src/stub.rs b/src/generated/cloud/eventarc/v1/src/stub.rs
index c83a901ff7..13d098ae8d 100644
--- a/src/generated/cloud/eventarc/v1/src/stub.rs
+++ b/src/generated/cloud/eventarc/v1/src/stub.rs
@@ -42,10 +42,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_trigger(
         &self,
         _req: crate::model::GetTriggerRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Trigger>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Trigger>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_triggers(
         &self,
         _req: crate::model::ListTriggersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTriggersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTriggersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +63,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_trigger(
         &self,
         _req: crate::model::CreateTriggerRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_trigger(
         &self,
         _req: crate::model::UpdateTriggerRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_trigger(
         &self,
         _req: crate::model::DeleteTriggerRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,10 +96,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_channel(
         &self,
         _req: crate::model::GetChannelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Channel>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Channel>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -108,9 +106,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_channels(
         &self,
         _req: crate::model::ListChannelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListChannelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListChannelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +117,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_channel(
         &self,
         _req: crate::model::CreateChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +128,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_channel(
         &self,
         _req: crate::model::UpdateChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +139,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_channel(
         &self,
         _req: crate::model::DeleteChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,10 +150,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_provider(
         &self,
         _req: crate::model::GetProviderRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Provider>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Provider>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -163,9 +160,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_providers(
         &self,
         _req: crate::model::ListProvidersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListProvidersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListProvidersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +171,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_channel_connection(
         &self,
         _req: crate::model::GetChannelConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ChannelConnection>>,
+        Output = crate::Result<crate::Response<crate::model::ChannelConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,11 +182,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_channel_connections(
         &self,
         _req: crate::model::ListChannelConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListChannelConnectionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListChannelConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,9 +193,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_channel_connection(
         &self,
         _req: crate::model::CreateChannelConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -209,9 +204,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_channel_connection(
         &self,
         _req: crate::model::DeleteChannelConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +215,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_google_channel_config(
         &self,
         _req: crate::model::GetGoogleChannelConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GoogleChannelConfig>>,
+        Output = crate::Result<crate::Response<crate::model::GoogleChannelConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +226,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_google_channel_config(
         &self,
         _req: crate::model::UpdateGoogleChannelConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GoogleChannelConfig>>,
+        Output = crate::Result<crate::Response<crate::model::GoogleChannelConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,10 +237,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_message_bus(
         &self,
         _req: crate::model::GetMessageBusRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MessageBus>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::MessageBus>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -253,9 +247,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_message_buses(
         &self,
         _req: crate::model::ListMessageBusesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMessageBusesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMessageBusesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,11 +258,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_message_bus_enrollments(
         &self,
         _req: crate::model::ListMessageBusEnrollmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListMessageBusEnrollmentsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListMessageBusEnrollmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -277,9 +269,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_message_bus(
         &self,
         _req: crate::model::CreateMessageBusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,9 +280,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_message_bus(
         &self,
         _req: crate::model::UpdateMessageBusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -299,9 +291,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_message_bus(
         &self,
         _req: crate::model::DeleteMessageBusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -310,10 +302,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_enrollment(
         &self,
         _req: crate::model::GetEnrollmentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Enrollment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Enrollment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -321,9 +312,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_enrollments(
         &self,
         _req: crate::model::ListEnrollmentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEnrollmentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEnrollmentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -332,9 +323,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_enrollment(
         &self,
         _req: crate::model::CreateEnrollmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -343,9 +334,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_enrollment(
         &self,
         _req: crate::model::UpdateEnrollmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -354,9 +345,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_enrollment(
         &self,
         _req: crate::model::DeleteEnrollmentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -365,10 +356,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_pipeline(
         &self,
         _req: crate::model::GetPipelineRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Pipeline>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Pipeline>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -376,9 +366,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_pipelines(
         &self,
         _req: crate::model::ListPipelinesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPipelinesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPipelinesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -387,9 +377,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_pipeline(
         &self,
         _req: crate::model::CreatePipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -398,9 +388,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_pipeline(
         &self,
         _req: crate::model::UpdatePipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,9 +399,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_pipeline(
         &self,
         _req: crate::model::DeletePipelineRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -420,9 +410,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_google_api_source(
         &self,
         _req: crate::model::GetGoogleApiSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GoogleApiSource>>,
+        Output = crate::Result<crate::Response<crate::model::GoogleApiSource>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -431,9 +421,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_google_api_sources(
         &self,
         _req: crate::model::ListGoogleApiSourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGoogleApiSourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGoogleApiSourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -442,9 +432,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn create_google_api_source(
         &self,
         _req: crate::model::CreateGoogleApiSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -453,9 +443,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn update_google_api_source(
         &self,
         _req: crate::model::UpdateGoogleApiSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -464,9 +454,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_google_api_source(
         &self,
         _req: crate::model::DeleteGoogleApiSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -475,10 +465,10 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -488,9 +478,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -499,9 +489,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -510,9 +500,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -521,10 +511,10 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -534,10 +524,10 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -547,9 +537,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -558,8 +548,8 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -567,8 +557,8 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -578,9 +568,9 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -589,8 +579,8 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/eventarc/v1/src/stub/dynamic.rs b/src/generated/cloud/eventarc/v1/src/stub/dynamic.rs
index 4ad0bd0e43..d71ddb1668 100644
--- a/src/generated/cloud/eventarc/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/eventarc/v1/src/stub/dynamic.rs
@@ -20,304 +20,300 @@ pub trait Eventarc: std::fmt::Debug + Send + Sync {
     async fn get_trigger(
         &self,
         req: crate::model::GetTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trigger>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trigger>>;
 
     async fn list_triggers(
         &self,
         req: crate::model::ListTriggersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTriggersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTriggersResponse>>;
 
     async fn create_trigger(
         &self,
         req: crate::model::CreateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_trigger(
         &self,
         req: crate::model::UpdateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_trigger(
         &self,
         req: crate::model::DeleteTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_channel(
         &self,
         req: crate::model::GetChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Channel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Channel>>;
 
     async fn list_channels(
         &self,
         req: crate::model::ListChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListChannelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListChannelsResponse>>;
 
     async fn create_channel(
         &self,
         req: crate::model::CreateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_channel(
         &self,
         req: crate::model::UpdateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_channel(
         &self,
         req: crate::model::DeleteChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Provider>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Provider>>;
 
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProvidersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProvidersResponse>>;
 
     async fn get_channel_connection(
         &self,
         req: crate::model::GetChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ChannelConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ChannelConnection>>;
 
     async fn list_channel_connections(
         &self,
         req: crate::model::ListChannelConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListChannelConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListChannelConnectionsResponse>>;
 
     async fn create_channel_connection(
         &self,
         req: crate::model::CreateChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_channel_connection(
         &self,
         req: crate::model::DeleteChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_google_channel_config(
         &self,
         req: crate::model::GetGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleChannelConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleChannelConfig>>;
 
     async fn update_google_channel_config(
         &self,
         req: crate::model::UpdateGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleChannelConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleChannelConfig>>;
 
     async fn get_message_bus(
         &self,
         req: crate::model::GetMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MessageBus>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MessageBus>>;
 
     async fn list_message_buses(
         &self,
         req: crate::model::ListMessageBusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMessageBusesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMessageBusesResponse>>;
 
     async fn list_message_bus_enrollments(
         &self,
         req: crate::model::ListMessageBusEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMessageBusEnrollmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMessageBusEnrollmentsResponse>>;
 
     async fn create_message_bus(
         &self,
         req: crate::model::CreateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_message_bus(
         &self,
         req: crate::model::UpdateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_message_bus(
         &self,
         req: crate::model::DeleteMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_enrollment(
         &self,
         req: crate::model::GetEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Enrollment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Enrollment>>;
 
     async fn list_enrollments(
         &self,
         req: crate::model::ListEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnrollmentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnrollmentsResponse>>;
 
     async fn create_enrollment(
         &self,
         req: crate::model::CreateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_enrollment(
         &self,
         req: crate::model::UpdateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_enrollment(
         &self,
         req: crate::model::DeleteEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_pipeline(
         &self,
         req: crate::model::GetPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Pipeline>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Pipeline>>;
 
     async fn list_pipelines(
         &self,
         req: crate::model::ListPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPipelinesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPipelinesResponse>>;
 
     async fn create_pipeline(
         &self,
         req: crate::model::CreatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_pipeline(
         &self,
         req: crate::model::UpdatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_pipeline(
         &self,
         req: crate::model::DeletePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_google_api_source(
         &self,
         req: crate::model::GetGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleApiSource>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleApiSource>>;
 
     async fn list_google_api_sources(
         &self,
         req: crate::model::ListGoogleApiSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGoogleApiSourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGoogleApiSourcesResponse>>;
 
     async fn create_google_api_source(
         &self,
         req: crate::model::CreateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_google_api_source(
         &self,
         req: crate::model::UpdateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_google_api_source(
         &self,
         req: crate::model::DeleteGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Eventarc] also implement [Eventarc].
@@ -327,8 +323,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_trigger(
         &self,
         req: crate::model::GetTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Trigger>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Trigger>> {
         T::get_trigger(self, req, options).await
     }
 
@@ -336,8 +332,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_triggers(
         &self,
         req: crate::model::ListTriggersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTriggersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTriggersResponse>> {
         T::list_triggers(self, req, options).await
     }
 
@@ -345,8 +341,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_trigger(
         &self,
         req: crate::model::CreateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_trigger(self, req, options).await
     }
 
@@ -354,8 +350,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_trigger(
         &self,
         req: crate::model::UpdateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_trigger(self, req, options).await
     }
 
@@ -363,8 +359,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_trigger(
         &self,
         req: crate::model::DeleteTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_trigger(self, req, options).await
     }
 
@@ -372,8 +368,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_channel(
         &self,
         req: crate::model::GetChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Channel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Channel>> {
         T::get_channel(self, req, options).await
     }
 
@@ -381,8 +377,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_channels(
         &self,
         req: crate::model::ListChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListChannelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListChannelsResponse>> {
         T::list_channels(self, req, options).await
     }
 
@@ -390,8 +386,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_channel(
         &self,
         req: crate::model::CreateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_channel(self, req, options).await
     }
 
@@ -399,8 +395,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_channel(
         &self,
         req: crate::model::UpdateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_channel(self, req, options).await
     }
 
@@ -408,8 +404,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_channel(
         &self,
         req: crate::model::DeleteChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_channel(self, req, options).await
     }
 
@@ -417,8 +413,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Provider>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Provider>> {
         T::get_provider(self, req, options).await
     }
 
@@ -426,8 +422,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProvidersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProvidersResponse>> {
         T::list_providers(self, req, options).await
     }
 
@@ -435,8 +431,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_channel_connection(
         &self,
         req: crate::model::GetChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ChannelConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ChannelConnection>> {
         T::get_channel_connection(self, req, options).await
     }
 
@@ -444,8 +440,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_channel_connections(
         &self,
         req: crate::model::ListChannelConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListChannelConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListChannelConnectionsResponse>> {
         T::list_channel_connections(self, req, options).await
     }
 
@@ -453,8 +449,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_channel_connection(
         &self,
         req: crate::model::CreateChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_channel_connection(self, req, options).await
     }
 
@@ -462,8 +458,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_channel_connection(
         &self,
         req: crate::model::DeleteChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_channel_connection(self, req, options).await
     }
 
@@ -471,8 +467,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_google_channel_config(
         &self,
         req: crate::model::GetGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleChannelConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleChannelConfig>> {
         T::get_google_channel_config(self, req, options).await
     }
 
@@ -480,8 +476,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_google_channel_config(
         &self,
         req: crate::model::UpdateGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleChannelConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleChannelConfig>> {
         T::update_google_channel_config(self, req, options).await
     }
 
@@ -489,8 +485,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_message_bus(
         &self,
         req: crate::model::GetMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MessageBus>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MessageBus>> {
         T::get_message_bus(self, req, options).await
     }
 
@@ -498,8 +494,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_message_buses(
         &self,
         req: crate::model::ListMessageBusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMessageBusesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMessageBusesResponse>> {
         T::list_message_buses(self, req, options).await
     }
 
@@ -507,9 +503,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_message_bus_enrollments(
         &self,
         req: crate::model::ListMessageBusEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMessageBusEnrollmentsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMessageBusEnrollmentsResponse>> {
         T::list_message_bus_enrollments(self, req, options).await
     }
 
@@ -517,8 +512,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_message_bus(
         &self,
         req: crate::model::CreateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_message_bus(self, req, options).await
     }
 
@@ -526,8 +521,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_message_bus(
         &self,
         req: crate::model::UpdateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_message_bus(self, req, options).await
     }
 
@@ -535,8 +530,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_message_bus(
         &self,
         req: crate::model::DeleteMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_message_bus(self, req, options).await
     }
 
@@ -544,8 +539,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_enrollment(
         &self,
         req: crate::model::GetEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Enrollment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Enrollment>> {
         T::get_enrollment(self, req, options).await
     }
 
@@ -553,8 +548,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_enrollments(
         &self,
         req: crate::model::ListEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEnrollmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEnrollmentsResponse>> {
         T::list_enrollments(self, req, options).await
     }
 
@@ -562,8 +557,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_enrollment(
         &self,
         req: crate::model::CreateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_enrollment(self, req, options).await
     }
 
@@ -571,8 +566,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_enrollment(
         &self,
         req: crate::model::UpdateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_enrollment(self, req, options).await
     }
 
@@ -580,8 +575,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_enrollment(
         &self,
         req: crate::model::DeleteEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_enrollment(self, req, options).await
     }
 
@@ -589,8 +584,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_pipeline(
         &self,
         req: crate::model::GetPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Pipeline>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Pipeline>> {
         T::get_pipeline(self, req, options).await
     }
 
@@ -598,8 +593,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_pipelines(
         &self,
         req: crate::model::ListPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPipelinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPipelinesResponse>> {
         T::list_pipelines(self, req, options).await
     }
 
@@ -607,8 +602,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_pipeline(
         &self,
         req: crate::model::CreatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_pipeline(self, req, options).await
     }
 
@@ -616,8 +611,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_pipeline(
         &self,
         req: crate::model::UpdatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_pipeline(self, req, options).await
     }
 
@@ -625,8 +620,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_pipeline(
         &self,
         req: crate::model::DeletePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_pipeline(self, req, options).await
     }
 
@@ -634,8 +629,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_google_api_source(
         &self,
         req: crate::model::GetGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GoogleApiSource>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GoogleApiSource>> {
         T::get_google_api_source(self, req, options).await
     }
 
@@ -643,8 +638,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_google_api_sources(
         &self,
         req: crate::model::ListGoogleApiSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGoogleApiSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGoogleApiSourcesResponse>> {
         T::list_google_api_sources(self, req, options).await
     }
 
@@ -652,8 +647,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn create_google_api_source(
         &self,
         req: crate::model::CreateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_google_api_source(self, req, options).await
     }
 
@@ -661,8 +656,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn update_google_api_source(
         &self,
         req: crate::model::UpdateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_google_api_source(self, req, options).await
     }
 
@@ -670,8 +665,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_google_api_source(
         &self,
         req: crate::model::DeleteGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_google_api_source(self, req, options).await
     }
 
@@ -679,9 +674,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -689,8 +683,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -698,8 +692,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -707,8 +701,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -716,10 +710,9 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -727,10 +720,9 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -738,8 +730,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -747,8 +739,8 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -756,22 +748,22 @@ impl<T: super::Eventarc> Eventarc for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/eventarc/v1/src/tracing.rs b/src/generated/cloud/eventarc/v1/src/tracing.rs
index b38058e71d..2b65b5cf54 100644
--- a/src/generated/cloud/eventarc/v1/src/tracing.rs
+++ b/src/generated/cloud/eventarc/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_trigger(
         &self,
         req: crate::model::GetTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trigger>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trigger>> {
         self.inner.get_trigger(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_triggers(
         &self,
         req: crate::model::ListTriggersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTriggersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTriggersResponse>> {
         self.inner.list_triggers(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_trigger(
         &self,
         req: crate::model::CreateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_trigger(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_trigger(
         &self,
         req: crate::model::UpdateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_trigger(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_trigger(
         &self,
         req: crate::model::DeleteTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_trigger(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_channel(
         &self,
         req: crate::model::GetChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Channel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Channel>> {
         self.inner.get_channel(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_channels(
         &self,
         req: crate::model::ListChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListChannelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListChannelsResponse>> {
         self.inner.list_channels(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_channel(
         &self,
         req: crate::model::CreateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_channel(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_channel(
         &self,
         req: crate::model::UpdateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_channel(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_channel(
         &self,
         req: crate::model::DeleteChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_channel(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Provider>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Provider>> {
         self.inner.get_provider(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProvidersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProvidersResponse>> {
         self.inner.list_providers(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn get_channel_connection(
         &self,
         req: crate::model::GetChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ChannelConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ChannelConnection>> {
         self.inner.get_channel_connection(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_channel_connections(
         &self,
         req: crate::model::ListChannelConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListChannelConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListChannelConnectionsResponse>> {
         self.inner.list_channel_connections(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn create_channel_connection(
         &self,
         req: crate::model::CreateChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_channel_connection(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn delete_channel_connection(
         &self,
         req: crate::model::DeleteChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_channel_connection(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn get_google_channel_config(
         &self,
         req: crate::model::GetGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleChannelConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleChannelConfig>> {
         self.inner.get_google_channel_config(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn update_google_channel_config(
         &self,
         req: crate::model::UpdateGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleChannelConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleChannelConfig>> {
         self.inner.update_google_channel_config(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn get_message_bus(
         &self,
         req: crate::model::GetMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MessageBus>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MessageBus>> {
         self.inner.get_message_bus(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn list_message_buses(
         &self,
         req: crate::model::ListMessageBusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMessageBusesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMessageBusesResponse>> {
         self.inner.list_message_buses(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_message_bus_enrollments(
         &self,
         req: crate::model::ListMessageBusEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMessageBusEnrollmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMessageBusEnrollmentsResponse>> {
         self.inner.list_message_bus_enrollments(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn create_message_bus(
         &self,
         req: crate::model::CreateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_message_bus(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn update_message_bus(
         &self,
         req: crate::model::UpdateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_message_bus(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn delete_message_bus(
         &self,
         req: crate::model::DeleteMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_message_bus(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn get_enrollment(
         &self,
         req: crate::model::GetEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Enrollment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Enrollment>> {
         self.inner.get_enrollment(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn list_enrollments(
         &self,
         req: crate::model::ListEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnrollmentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnrollmentsResponse>> {
         self.inner.list_enrollments(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn create_enrollment(
         &self,
         req: crate::model::CreateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_enrollment(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn update_enrollment(
         &self,
         req: crate::model::UpdateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_enrollment(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn delete_enrollment(
         &self,
         req: crate::model::DeleteEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_enrollment(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn get_pipeline(
         &self,
         req: crate::model::GetPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Pipeline>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Pipeline>> {
         self.inner.get_pipeline(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn list_pipelines(
         &self,
         req: crate::model::ListPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPipelinesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPipelinesResponse>> {
         self.inner.list_pipelines(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn create_pipeline(
         &self,
         req: crate::model::CreatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_pipeline(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn update_pipeline(
         &self,
         req: crate::model::UpdatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_pipeline(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn delete_pipeline(
         &self,
         req: crate::model::DeletePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_pipeline(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn get_google_api_source(
         &self,
         req: crate::model::GetGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleApiSource>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleApiSource>> {
         self.inner.get_google_api_source(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn list_google_api_sources(
         &self,
         req: crate::model::ListGoogleApiSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGoogleApiSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGoogleApiSourcesResponse>> {
         self.inner.list_google_api_sources(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn create_google_api_source(
         &self,
         req: crate::model::CreateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_google_api_source(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn update_google_api_source(
         &self,
         req: crate::model::UpdateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_google_api_source(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn delete_google_api_source(
         &self,
         req: crate::model::DeleteGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_google_api_source(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -401,8 +401,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -410,8 +410,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -419,8 +419,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -428,9 +428,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -438,9 +437,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -448,8 +446,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -457,8 +455,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -466,22 +464,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/eventarc/v1/src/transport.rs b/src/generated/cloud/eventarc/v1/src/transport.rs
index efd5feaafc..42fc2baa2b 100644
--- a/src/generated/cloud/eventarc/v1/src/transport.rs
+++ b/src/generated/cloud/eventarc/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Eventarc](super::stub::Eventarc) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Eventarc {
 }
 
 impl Eventarc {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_trigger(
         &self,
         req: crate::model::GetTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Trigger>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Trigger>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_triggers(
         &self,
         req: crate::model::ListTriggersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTriggersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTriggersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_trigger(
         &self,
         req: crate::model::CreateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_trigger(
         &self,
         req: crate::model::UpdateTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -300,9 +300,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -317,13 +317,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_trigger(
         &self,
         req: crate::model::DeleteTriggerRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -367,9 +367,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -384,13 +384,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_channel(
         &self,
         req: crate::model::GetChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Channel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Channel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -431,9 +431,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -448,13 +448,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_channels(
         &self,
         req: crate::model::ListChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListChannelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListChannelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -494,9 +494,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -511,13 +511,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_channel(
         &self,
         req: crate::model::CreateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -556,9 +556,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -573,13 +573,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_channel(
         &self,
         req: crate::model::UpdateChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -639,9 +639,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -656,13 +656,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_channel(
         &self,
         req: crate::model::DeleteChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -704,9 +704,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -721,13 +721,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_provider(
         &self,
         req: crate::model::GetProviderRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Provider>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Provider>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -768,9 +768,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -785,13 +785,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_providers(
         &self,
         req: crate::model::ListProvidersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProvidersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProvidersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -832,9 +832,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -849,13 +849,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_channel_connection(
         &self,
         req: crate::model::GetChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ChannelConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ChannelConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -896,9 +896,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -913,13 +913,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_channel_connections(
         &self,
         req: crate::model::ListChannelConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListChannelConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListChannelConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -958,9 +958,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -975,13 +975,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_channel_connection(
         &self,
         req: crate::model::CreateChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1019,9 +1019,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1036,13 +1036,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_channel_connection(
         &self,
         req: crate::model::DeleteChannelConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1083,9 +1083,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1100,13 +1100,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_google_channel_config(
         &self,
         req: crate::model::GetGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleChannelConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleChannelConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1145,9 +1145,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1162,13 +1162,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_google_channel_config(
         &self,
         req: crate::model::UpdateGoogleChannelConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleChannelConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleChannelConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1225,9 +1225,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1242,13 +1242,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_message_bus(
         &self,
         req: crate::model::GetMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MessageBus>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MessageBus>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1289,9 +1289,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1306,13 +1306,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_message_buses(
         &self,
         req: crate::model::ListMessageBusesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMessageBusesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMessageBusesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1353,9 +1353,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1370,13 +1370,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_message_bus_enrollments(
         &self,
         req: crate::model::ListMessageBusEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMessageBusEnrollmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMessageBusEnrollmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1419,9 +1419,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1436,13 +1436,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_message_bus(
         &self,
         req: crate::model::CreateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1481,9 +1481,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1498,13 +1498,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_message_bus(
         &self,
         req: crate::model::UpdateMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1565,9 +1565,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1582,13 +1582,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_message_bus(
         &self,
         req: crate::model::DeleteMessageBusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1632,9 +1632,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1649,13 +1649,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_enrollment(
         &self,
         req: crate::model::GetEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Enrollment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Enrollment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1696,9 +1696,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1713,13 +1713,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_enrollments(
         &self,
         req: crate::model::ListEnrollmentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEnrollmentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEnrollmentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1760,9 +1760,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1777,13 +1777,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_enrollment(
         &self,
         req: crate::model::CreateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1822,9 +1822,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1839,13 +1839,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_enrollment(
         &self,
         req: crate::model::UpdateEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1906,9 +1906,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1923,13 +1923,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_enrollment(
         &self,
         req: crate::model::DeleteEnrollmentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1973,9 +1973,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1990,13 +1990,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_pipeline(
         &self,
         req: crate::model::GetPipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Pipeline>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Pipeline>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2037,9 +2037,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2054,13 +2054,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_pipelines(
         &self,
         req: crate::model::ListPipelinesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPipelinesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPipelinesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2101,9 +2101,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2118,13 +2118,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_pipeline(
         &self,
         req: crate::model::CreatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2163,9 +2163,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2180,13 +2180,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_pipeline(
         &self,
         req: crate::model::UpdatePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2247,9 +2247,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2264,13 +2264,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_pipeline(
         &self,
         req: crate::model::DeletePipelineRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2314,9 +2314,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2331,13 +2331,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_google_api_source(
         &self,
         req: crate::model::GetGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GoogleApiSource>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GoogleApiSource>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2378,9 +2378,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2395,13 +2395,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_google_api_sources(
         &self,
         req: crate::model::ListGoogleApiSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGoogleApiSourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGoogleApiSourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2442,9 +2442,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2459,13 +2459,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn create_google_api_source(
         &self,
         req: crate::model::CreateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2504,9 +2504,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2521,13 +2521,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn update_google_api_source(
         &self,
         req: crate::model::UpdateGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2588,9 +2588,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2605,13 +2605,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_google_api_source(
         &self,
         req: crate::model::DeleteGoogleApiSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2655,9 +2655,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2672,13 +2672,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2708,9 +2708,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2725,13 +2725,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2768,9 +2768,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2785,13 +2785,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3091,9 +3091,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3108,13 +3108,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3510,9 +3510,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3527,14 +3527,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3834,9 +3833,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3851,14 +3850,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3900,9 +3898,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3917,13 +3915,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3964,9 +3962,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3981,13 +3979,13 @@ impl super::stub::Eventarc for Eventarc {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4028,9 +4026,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4039,24 +4037,25 @@ impl super::stub::Eventarc for Eventarc {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4097,9 +4096,9 @@ impl super::stub::Eventarc for Eventarc {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4108,25 +4107,26 @@ impl super::stub::Eventarc for Eventarc {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/filestore/v1/Cargo.toml b/src/generated/cloud/filestore/v1/Cargo.toml
index e81e361995..7985587558 100644
--- a/src/generated/cloud/filestore/v1/Cargo.toml
+++ b/src/generated/cloud/filestore/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-common.workspace      = true
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/filestore/v1/src/builder.rs b/src/generated/cloud/filestore/v1/src/builder.rs
index c48d08841a..8b0ba2fe3b 100644
--- a/src/generated/cloud/filestore/v1/src/builder.rs
+++ b/src/generated/cloud/filestore/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_filestore_manager {
     /// A builder for [CloudFilestoreManager][crate::client::CloudFilestoreManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_filestore_v1::*;
     /// # use builder::cloud_filestore_manager::ClientBuilder;
     /// # use client::CloudFilestoreManager;
@@ -30,19 +30,18 @@ pub mod cloud_filestore_manager {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudFilestoreManager;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudFilestoreManager;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_filestore_manager {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudFilestoreManager>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_filestore_manager {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod cloud_filestore_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -241,8 +242,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -315,7 +316,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -382,8 +383,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -393,7 +394,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -422,7 +423,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -437,7 +438,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -456,7 +457,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -521,8 +522,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -532,7 +533,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::RestoreInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -561,7 +562,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -576,7 +577,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .restore_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_instance`.
@@ -595,7 +596,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -665,8 +666,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -676,7 +677,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::RevertInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -705,7 +706,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -720,7 +721,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .revert_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `revert_instance`.
@@ -739,7 +740,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -784,8 +785,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RevertInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RevertInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -795,7 +796,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -824,7 +825,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -839,7 +840,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -856,7 +857,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -899,8 +900,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -910,8 +911,8 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::ListSnapshots;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -942,7 +943,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -952,13 +953,13 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .list_snapshots(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSnapshotsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSnapshotsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -967,15 +968,17 @@ pub mod cloud_filestore_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSnapshotsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSnapshotsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1019,8 +1022,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSnapshots {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSnapshots {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1030,7 +1033,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::GetSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1058,7 +1061,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1068,7 +1071,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .get_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSnapshotRequest::name].
@@ -1081,8 +1084,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1092,7 +1095,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::CreateSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1121,7 +1124,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1136,7 +1139,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .create_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_snapshot`.
@@ -1155,7 +1158,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1222,8 +1225,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1233,7 +1236,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::DeleteSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1262,7 +1265,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1277,7 +1280,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .delete_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_snapshot`.
@@ -1294,7 +1297,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1331,8 +1334,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1342,7 +1345,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::UpdateSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1371,7 +1374,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1386,7 +1389,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .update_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_snapshot`.
@@ -1405,7 +1408,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1478,8 +1481,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1489,8 +1492,8 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1521,7 +1524,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1531,13 +1534,13 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1546,15 +1549,17 @@ pub mod cloud_filestore_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1592,8 +1597,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1603,7 +1608,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1631,7 +1636,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1641,7 +1646,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -1654,8 +1659,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1665,7 +1670,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::CreateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1694,7 +1699,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1709,7 +1714,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .create_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup`.
@@ -1728,7 +1733,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1795,8 +1800,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1806,7 +1811,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1835,7 +1840,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1850,7 +1855,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -1867,7 +1872,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1904,8 +1909,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1915,7 +1920,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::UpdateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1944,7 +1949,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1959,7 +1964,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .update_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup`.
@@ -1978,7 +1983,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2051,8 +2056,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2062,7 +2067,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::PromoteReplica;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2091,7 +2096,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2106,7 +2111,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .promote_replica(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `promote_replica`.
@@ -2125,7 +2130,7 @@ pub mod cloud_filestore_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2168,8 +2173,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PromoteReplica {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PromoteReplica {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2179,8 +2184,8 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2214,7 +2219,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2224,15 +2229,15 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2241,17 +2246,17 @@ pub mod cloud_filestore_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2281,8 +2286,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2292,7 +2297,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2323,7 +2328,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2333,7 +2338,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2344,8 +2349,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2355,8 +2360,8 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2392,7 +2397,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2402,15 +2407,15 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2419,17 +2424,17 @@ pub mod cloud_filestore_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2465,8 +2470,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2476,7 +2481,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2507,7 +2512,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2517,7 +2522,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2528,8 +2533,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2539,7 +2544,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2572,7 +2577,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2582,7 +2587,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2593,8 +2598,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2604,7 +2609,7 @@ pub mod cloud_filestore_manager {
     /// # Example
     /// ```
     /// # use google_cloud_filestore_v1::builder::cloud_filestore_manager::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_filestore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2637,7 +2642,7 @@ pub mod cloud_filestore_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2647,7 +2652,7 @@ pub mod cloud_filestore_manager {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2658,8 +2663,8 @@ pub mod cloud_filestore_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/filestore/v1/src/client.rs b/src/generated/cloud/filestore/v1/src/client.rs
index ba6225e65e..c5e31dbb9e 100644
--- a/src/generated/cloud/filestore/v1/src/client.rs
+++ b/src/generated/cloud/filestore/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_filestore_v1::client::CloudFilestoreManager;
 /// let client = CloudFilestoreManager::builder().build().await?;
 /// // use `client` to make requests to the Cloud Filestore API.
@@ -86,15 +86,13 @@ impl CloudFilestoreManager {
     /// Returns a builder for [CloudFilestoreManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_filestore_v1::client::CloudFilestoreManager;
     /// let client = CloudFilestoreManager::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_filestore_manager::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cloud_filestore_manager::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cloud_filestore_manager::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -112,14 +110,14 @@ impl CloudFilestoreManager {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudFilestoreManager>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudFilestoreManager>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -129,13 +127,13 @@ impl CloudFilestoreManager {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudFilestoreManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudFilestoreManager> {
         super::transport::CloudFilestoreManager::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudFilestoreManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudFilestoreManager> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudFilestoreManager::new)
diff --git a/src/generated/cloud/filestore/v1/src/lib.rs b/src/generated/cloud/filestore/v1/src/lib.rs
index d84855a93f..ec47f775b6 100644
--- a/src/generated/cloud/filestore/v1/src/lib.rs
+++ b/src/generated/cloud/filestore/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/filestore/v1/src/model.rs b/src/generated/cloud/filestore/v1/src/model.rs
index e46741931b..eaafcdc61a 100644
--- a/src/generated/cloud/filestore/v1/src/model.rs
+++ b/src/generated/cloud/filestore/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_common;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -3748,7 +3748,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4531,7 +4531,7 @@ impl wkt::message::Message for ListSnapshotsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSnapshotsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSnapshotsResponse {
     type PageItem = crate::model::Snapshot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5560,7 +5560,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/filestore/v1/src/stub.rs b/src/generated/cloud/filestore/v1/src/stub.rs
index 35238d16f3..462be118b2 100644
--- a/src/generated/cloud/filestore/v1/src/stub.rs
+++ b/src/generated/cloud/filestore/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn restore_instance(
         &self,
         _req: crate::model::RestoreInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn revert_instance(
         &self,
         _req: crate::model::RevertInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn list_snapshots(
         &self,
         _req: crate::model::ListSnapshotsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSnapshotsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,10 +129,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn get_snapshot(
         &self,
         _req: crate::model::GetSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Snapshot>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Snapshot>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -141,9 +139,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn create_snapshot(
         &self,
         _req: crate::model::CreateSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +150,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn delete_snapshot(
         &self,
         _req: crate::model::DeleteSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +161,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn update_snapshot(
         &self,
         _req: crate::model::UpdateSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +172,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,10 +183,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -196,9 +193,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn create_backup(
         &self,
         _req: crate::model::CreateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,9 +204,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -218,9 +215,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn update_backup(
         &self,
         _req: crate::model::UpdateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -229,9 +226,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn promote_replica(
         &self,
         _req: crate::model::PromoteReplicaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,10 +237,10 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -253,9 +250,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,10 +261,10 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -277,9 +274,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,8 +285,8 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -297,8 +294,8 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -308,9 +305,9 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -319,8 +316,8 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/filestore/v1/src/stub/dynamic.rs b/src/generated/cloud/filestore/v1/src/stub/dynamic.rs
index 46bb7fdb2a..153b075be4 100644
--- a/src/generated/cloud/filestore/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/filestore/v1/src/stub/dynamic.rs
@@ -20,158 +20,156 @@ pub trait CloudFilestoreManager: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_instance(
         &self,
         req: crate::model::RestoreInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn revert_instance(
         &self,
         req: crate::model::RevertInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSnapshotsResponse>>;
 
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>>;
 
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn promote_replica(
         &self,
         req: crate::model::PromoteReplicaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CloudFilestoreManager] also implement [CloudFilestoreManager].
@@ -181,8 +179,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -190,8 +188,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -199,8 +197,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -208,8 +206,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -217,8 +215,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn restore_instance(
         &self,
         req: crate::model::RestoreInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_instance(self, req, options).await
     }
 
@@ -226,8 +224,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn revert_instance(
         &self,
         req: crate::model::RevertInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::revert_instance(self, req, options).await
     }
 
@@ -235,8 +233,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -244,8 +242,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         T::list_snapshots(self, req, options).await
     }
 
@@ -253,8 +251,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>> {
         T::get_snapshot(self, req, options).await
     }
 
@@ -262,8 +260,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_snapshot(self, req, options).await
     }
 
@@ -271,8 +269,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_snapshot(self, req, options).await
     }
 
@@ -280,8 +278,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_snapshot(self, req, options).await
     }
 
@@ -289,8 +287,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -307,8 +305,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup(self, req, options).await
     }
 
@@ -316,8 +314,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -325,8 +323,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup(self, req, options).await
     }
 
@@ -334,8 +332,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn promote_replica(
         &self,
         req: crate::model::PromoteReplicaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::promote_replica(self, req, options).await
     }
 
@@ -343,9 +341,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -353,8 +350,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -362,10 +359,9 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -373,8 +369,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -382,8 +378,8 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -391,22 +387,22 @@ impl<T: super::CloudFilestoreManager> CloudFilestoreManager for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/filestore/v1/src/tracing.rs b/src/generated/cloud/filestore/v1/src/tracing.rs
index bd0cbb5fbb..e04c4b4b56 100644
--- a/src/generated/cloud/filestore/v1/src/tracing.rs
+++ b/src/generated/cloud/filestore/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn restore_instance(
         &self,
         req: crate::model::RestoreInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn revert_instance(
         &self,
         req: crate::model::RevertInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.revert_instance(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         self.inner.list_snapshots(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         self.inner.get_snapshot(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_snapshot(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_snapshot(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_snapshot(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn promote_replica(
         &self,
         req: crate::model::PromoteReplicaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.promote_replica(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -221,9 +221,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -231,8 +230,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -240,8 +239,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -249,22 +248,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/filestore/v1/src/transport.rs b/src/generated/cloud/filestore/v1/src/transport.rs
index fa67d765eb..27303e5e3c 100644
--- a/src/generated/cloud/filestore/v1/src/transport.rs
+++ b/src/generated/cloud/filestore/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudFilestoreManager](super::stub::CloudFilestoreManager) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudFilestoreManager {
 }
 
 impl CloudFilestoreManager {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn restore_instance(
         &self,
         req: crate::model::RestoreInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -378,13 +378,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn revert_instance(
         &self,
         req: crate::model::RevertInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -490,9 +490,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -507,13 +507,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -560,9 +560,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -577,13 +577,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -628,9 +628,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -645,13 +645,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -693,9 +693,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -710,13 +710,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -761,9 +761,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -778,13 +778,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -847,9 +847,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -864,13 +864,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -911,9 +911,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -928,13 +928,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -975,9 +975,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -992,13 +992,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1036,9 +1036,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1053,13 +1053,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1100,9 +1100,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1117,13 +1117,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1182,9 +1182,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1199,13 +1199,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn promote_replica(
         &self,
         req: crate::model::PromoteReplicaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1246,9 +1246,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1263,13 +1263,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1299,9 +1299,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1316,13 +1316,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1359,9 +1359,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1376,14 +1376,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1425,9 +1424,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1442,13 +1441,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1489,9 +1488,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1506,13 +1505,13 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1553,9 +1552,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1564,24 +1563,25 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1622,9 +1622,9 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1633,25 +1633,26 @@ impl super::stub::CloudFilestoreManager for CloudFilestoreManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/financialservices/v1/Cargo.toml b/src/generated/cloud/financialservices/v1/Cargo.toml
index addb61b803..c97bd4e336 100644
--- a/src/generated/cloud/financialservices/v1/Cargo.toml
+++ b/src/generated/cloud/financialservices/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/financialservices/v1/src/builder.rs b/src/generated/cloud/financialservices/v1/src/builder.rs
index 7b869403d0..ca84705d6b 100644
--- a/src/generated/cloud/financialservices/v1/src/builder.rs
+++ b/src/generated/cloud/financialservices/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod aml {
     /// A builder for [Aml][crate::client::Aml].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_financialservices_v1::*;
     /// # use builder::aml::ClientBuilder;
     /// # use client::Aml;
@@ -30,19 +30,18 @@ pub mod aml {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Aml;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Aml;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod aml {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Aml>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod aml {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -104,7 +103,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,13 +113,13 @@ pub mod aml {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -129,15 +128,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -175,8 +176,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -186,7 +187,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -212,7 +213,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -222,7 +223,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -235,8 +236,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +247,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -273,7 +274,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -288,7 +289,7 @@ pub mod aml {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -305,7 +306,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -378,8 +379,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -389,7 +390,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -416,7 +417,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -431,7 +432,7 @@ pub mod aml {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -448,7 +449,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -523,8 +524,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -534,7 +535,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -561,7 +562,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -576,7 +577,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -588,7 +589,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -631,8 +632,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -642,7 +643,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ImportRegisteredParties;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -674,7 +675,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -689,7 +690,7 @@ pub mod aml {
             (*self.0.stub)
                 .import_registered_parties(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_registered_parties`.
@@ -708,7 +709,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -781,8 +782,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportRegisteredParties {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportRegisteredParties {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -792,7 +793,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ExportRegisteredParties;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -824,7 +825,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -839,7 +840,7 @@ pub mod aml {
             (*self.0.stub)
                 .export_registered_parties(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_registered_parties`.
@@ -858,7 +859,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -925,8 +926,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportRegisteredParties {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportRegisteredParties {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -936,8 +937,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListDatasets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -966,7 +967,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -976,13 +977,13 @@ pub mod aml {
             (*self.0.stub)
                 .list_datasets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDatasetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDatasetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -991,15 +992,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDatasetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDatasetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1037,8 +1040,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDatasets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDatasets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1048,7 +1051,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1074,7 +1077,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1084,7 +1087,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDatasetRequest::name].
@@ -1097,8 +1100,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1108,7 +1111,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CreateDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1135,7 +1138,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1150,7 +1153,7 @@ pub mod aml {
             (*self.0.stub)
                 .create_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_dataset`.
@@ -1167,7 +1170,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1240,8 +1243,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1251,7 +1254,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::UpdateDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1278,7 +1281,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1293,7 +1296,7 @@ pub mod aml {
             (*self.0.stub)
                 .update_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_dataset`.
@@ -1310,7 +1313,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1385,8 +1388,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1396,7 +1399,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeleteDataset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1423,7 +1426,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1438,7 +1441,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_dataset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_dataset`.
@@ -1450,7 +1453,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1493,8 +1496,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDataset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDataset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1504,8 +1507,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListModels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1534,7 +1537,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1544,13 +1547,13 @@ pub mod aml {
             (*self.0.stub)
                 .list_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListModelsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListModelsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1559,15 +1562,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListModelsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListModelsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1605,8 +1610,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1616,7 +1621,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1642,7 +1647,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1652,7 +1657,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetModelRequest::name].
@@ -1665,8 +1670,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1676,7 +1681,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CreateModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1703,7 +1708,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1718,7 +1723,7 @@ pub mod aml {
             (*self.0.stub)
                 .create_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_model`.
@@ -1735,7 +1740,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1808,8 +1813,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1819,7 +1824,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::UpdateModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1846,7 +1851,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1861,7 +1866,7 @@ pub mod aml {
             (*self.0.stub)
                 .update_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_model`.
@@ -1878,7 +1883,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1953,8 +1958,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1964,7 +1969,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ExportModelMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1994,7 +1999,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2009,7 +2014,7 @@ pub mod aml {
             (*self.0.stub)
                 .export_model_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_model_metadata`.
@@ -2028,7 +2033,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2090,8 +2095,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportModelMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportModelMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2101,7 +2106,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeleteModel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2128,7 +2133,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2143,7 +2148,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_model(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_model`.
@@ -2155,7 +2160,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2198,8 +2203,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteModel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteModel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2209,8 +2214,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListEngineConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2242,7 +2247,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2252,14 +2257,16 @@ pub mod aml {
             (*self.0.stub)
                 .list_engine_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEngineConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEngineConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2267,15 +2274,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEngineConfigsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEngineConfigsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2313,8 +2322,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEngineConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEngineConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2324,7 +2333,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetEngineConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2350,7 +2359,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2360,7 +2369,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_engine_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEngineConfigRequest::name].
@@ -2373,8 +2382,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEngineConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEngineConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2384,7 +2393,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CreateEngineConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2414,7 +2423,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2429,7 +2438,7 @@ pub mod aml {
             (*self.0.stub)
                 .create_engine_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_engine_config`.
@@ -2446,7 +2455,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2519,8 +2528,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEngineConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEngineConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2530,7 +2539,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::UpdateEngineConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2560,7 +2569,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2575,7 +2584,7 @@ pub mod aml {
             (*self.0.stub)
                 .update_engine_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_engine_config`.
@@ -2592,7 +2601,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2667,8 +2676,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEngineConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEngineConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2678,7 +2687,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ExportEngineConfigMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2710,7 +2719,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2725,7 +2734,7 @@ pub mod aml {
             (*self.0.stub)
                 .export_engine_config_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_engine_config_metadata`.
@@ -2744,7 +2753,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2806,8 +2815,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportEngineConfigMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportEngineConfigMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2817,7 +2826,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeleteEngineConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2847,7 +2856,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2862,7 +2871,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_engine_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_engine_config`.
@@ -2874,7 +2883,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2917,8 +2926,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEngineConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEngineConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2928,7 +2937,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetEngineVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2957,7 +2966,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2967,7 +2976,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_engine_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEngineVersionRequest::name].
@@ -2980,8 +2989,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEngineVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEngineVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2991,8 +3000,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListEngineVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3024,7 +3033,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3034,14 +3043,16 @@ pub mod aml {
             (*self.0.stub)
                 .list_engine_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEngineVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEngineVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3049,17 +3060,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListEngineVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3097,8 +3108,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEngineVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEngineVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3108,8 +3119,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListPredictionResults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3141,7 +3152,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3151,14 +3162,16 @@ pub mod aml {
             (*self.0.stub)
                 .list_prediction_results(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPredictionResultsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPredictionResultsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3166,17 +3179,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPredictionResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3214,8 +3227,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPredictionResults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPredictionResults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3225,7 +3238,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetPredictionResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3254,7 +3267,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3264,7 +3277,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_prediction_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPredictionResultRequest::name].
@@ -3277,8 +3290,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPredictionResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPredictionResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3288,7 +3301,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CreatePredictionResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3318,7 +3331,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3333,7 +3346,7 @@ pub mod aml {
             (*self.0.stub)
                 .create_prediction_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_prediction_result`.
@@ -3350,7 +3363,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3423,8 +3436,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePredictionResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePredictionResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3434,7 +3447,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::UpdatePredictionResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3464,7 +3477,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3479,7 +3492,7 @@ pub mod aml {
             (*self.0.stub)
                 .update_prediction_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_prediction_result`.
@@ -3496,7 +3509,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3571,8 +3584,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePredictionResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePredictionResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3582,7 +3595,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ExportPredictionResultMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3614,7 +3627,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3629,7 +3642,7 @@ pub mod aml {
             (*self.0.stub)
                 .export_prediction_result_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_prediction_result_metadata`.
@@ -3648,7 +3661,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3710,8 +3723,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportPredictionResultMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportPredictionResultMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3721,7 +3734,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeletePredictionResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3751,7 +3764,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3766,7 +3779,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_prediction_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_prediction_result`.
@@ -3778,7 +3791,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3821,8 +3834,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePredictionResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePredictionResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3832,8 +3845,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListBacktestResults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3865,7 +3878,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3875,14 +3888,16 @@ pub mod aml {
             (*self.0.stub)
                 .list_backtest_results(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBacktestResultsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBacktestResultsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3890,17 +3905,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBacktestResultsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3938,8 +3953,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBacktestResults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBacktestResults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3949,7 +3964,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetBacktestResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3978,7 +3993,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3988,7 +4003,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_backtest_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBacktestResultRequest::name].
@@ -4001,8 +4016,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBacktestResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBacktestResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4012,7 +4027,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CreateBacktestResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4042,7 +4057,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4057,7 +4072,7 @@ pub mod aml {
             (*self.0.stub)
                 .create_backtest_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backtest_result`.
@@ -4074,7 +4089,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4147,8 +4162,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBacktestResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBacktestResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4158,7 +4173,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::UpdateBacktestResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4188,7 +4203,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4203,7 +4218,7 @@ pub mod aml {
             (*self.0.stub)
                 .update_backtest_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backtest_result`.
@@ -4220,7 +4235,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4295,8 +4310,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBacktestResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBacktestResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4306,7 +4321,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ExportBacktestResultMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4338,7 +4353,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4353,7 +4368,7 @@ pub mod aml {
             (*self.0.stub)
                 .export_backtest_result_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_backtest_result_metadata`.
@@ -4372,7 +4387,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4434,8 +4449,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportBacktestResultMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportBacktestResultMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4445,7 +4460,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeleteBacktestResult;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4475,7 +4490,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4490,7 +4505,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_backtest_result(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backtest_result`.
@@ -4502,7 +4517,7 @@ pub mod aml {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4545,8 +4560,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBacktestResult {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBacktestResult {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4556,8 +4571,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4589,7 +4604,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4599,15 +4614,15 @@ pub mod aml {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4616,17 +4631,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4656,8 +4671,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4667,7 +4682,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4696,7 +4711,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4706,7 +4721,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4717,8 +4732,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4728,8 +4743,8 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4763,7 +4778,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4773,15 +4788,15 @@ pub mod aml {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4790,17 +4805,17 @@ pub mod aml {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4836,8 +4851,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4847,7 +4862,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4876,7 +4891,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4886,7 +4901,7 @@ pub mod aml {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4897,8 +4912,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4908,7 +4923,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4939,7 +4954,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4949,7 +4964,7 @@ pub mod aml {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4960,8 +4975,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4971,7 +4986,7 @@ pub mod aml {
     /// # Example
     /// ```
     /// # use google_cloud_financialservices_v1::builder::aml::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_financialservices_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5002,7 +5017,7 @@ pub mod aml {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5012,7 +5027,7 @@ pub mod aml {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5023,8 +5038,8 @@ pub mod aml {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/financialservices/v1/src/client.rs b/src/generated/cloud/financialservices/v1/src/client.rs
index 081bbaf1f2..4beb65e56f 100644
--- a/src/generated/cloud/financialservices/v1/src/client.rs
+++ b/src/generated/cloud/financialservices/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_financialservices_v1::client::Aml;
 /// let client = Aml::builder().build().await?;
 /// // use `client` to make requests to the Financial Services API.
@@ -67,13 +67,13 @@ impl Aml {
     /// Returns a builder for [Aml].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_financialservices_v1::client::Aml;
     /// let client = Aml::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::aml::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::aml::client::Factory)
+        crate::new_client_builder(super::builder::aml::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl Aml {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Aml>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Aml>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl Aml {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Aml> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Aml> {
         super::transport::Aml::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Aml> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Aml> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Aml::new)
diff --git a/src/generated/cloud/financialservices/v1/src/lib.rs b/src/generated/cloud/financialservices/v1/src/lib.rs
index 5dc5d7e478..7178b4dad7 100644
--- a/src/generated/cloud/financialservices/v1/src/lib.rs
+++ b/src/generated/cloud/financialservices/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/financialservices/v1/src/model.rs b/src/generated/cloud/financialservices/v1/src/model.rs
index 6ea62704d2..db03c0ee9f 100644
--- a/src/generated/cloud/financialservices/v1/src/model.rs
+++ b/src/generated/cloud/financialservices/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -715,7 +715,7 @@ impl wkt::message::Message for ListBacktestResultsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBacktestResultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBacktestResultsResponse {
     type PageItem = crate::model::BacktestResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1942,7 +1942,7 @@ impl wkt::message::Message for ListDatasetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDatasetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDatasetsResponse {
     type PageItem = crate::model::Dataset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3267,7 +3267,7 @@ impl wkt::message::Message for ListEngineConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEngineConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEngineConfigsResponse {
     type PageItem = crate::model::EngineConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4193,7 +4193,7 @@ impl wkt::message::Message for ListEngineVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEngineVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEngineVersionsResponse {
     type PageItem = crate::model::EngineVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4748,7 +4748,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6176,7 +6176,7 @@ impl wkt::message::Message for ListModelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListModelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListModelsResponse {
     type PageItem = crate::model::Model;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7347,7 +7347,7 @@ impl wkt::message::Message for ListPredictionResultsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPredictionResultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPredictionResultsResponse {
     type PageItem = crate::model::PredictionResult;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/financialservices/v1/src/stub.rs b/src/generated/cloud/financialservices/v1/src/stub.rs
index b8f37a8a77..e2e13b2426 100644
--- a/src/generated/cloud/financialservices/v1/src/stub.rs
+++ b/src/generated/cloud/financialservices/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn import_registered_parties(
         &self,
         _req: crate::model::ImportRegisteredPartiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn export_registered_parties(
         &self,
         _req: crate::model::ExportRegisteredPartiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_datasets(
         &self,
         _req: crate::model::ListDatasetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDatasetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDatasetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,10 +129,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_dataset(
         &self,
         _req: crate::model::GetDatasetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Dataset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Dataset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -141,9 +139,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn create_dataset(
         &self,
         _req: crate::model::CreateDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +150,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn update_dataset(
         &self,
         _req: crate::model::UpdateDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +161,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_dataset(
         &self,
         _req: crate::model::DeleteDatasetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +172,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_models(
         &self,
         _req: crate::model::ListModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,10 +183,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_model(
         &self,
         _req: crate::model::GetModelRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Model>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Model>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -196,9 +193,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn create_model(
         &self,
         _req: crate::model::CreateModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,9 +204,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn update_model(
         &self,
         _req: crate::model::UpdateModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -218,9 +215,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn export_model_metadata(
         &self,
         _req: crate::model::ExportModelMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -229,9 +226,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_model(
         &self,
         _req: crate::model::DeleteModelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,9 +237,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_engine_configs(
         &self,
         _req: crate::model::ListEngineConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEngineConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEngineConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -251,9 +248,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_engine_config(
         &self,
         _req: crate::model::GetEngineConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EngineConfig>>,
+        Output = crate::Result<crate::Response<crate::model::EngineConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -262,9 +259,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn create_engine_config(
         &self,
         _req: crate::model::CreateEngineConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -273,9 +270,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn update_engine_config(
         &self,
         _req: crate::model::UpdateEngineConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -284,9 +281,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn export_engine_config_metadata(
         &self,
         _req: crate::model::ExportEngineConfigMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -295,9 +292,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_engine_config(
         &self,
         _req: crate::model::DeleteEngineConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -306,9 +303,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_engine_version(
         &self,
         _req: crate::model::GetEngineVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EngineVersion>>,
+        Output = crate::Result<crate::Response<crate::model::EngineVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -317,9 +314,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_engine_versions(
         &self,
         _req: crate::model::ListEngineVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEngineVersionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEngineVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -328,11 +325,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_prediction_results(
         &self,
         _req: crate::model::ListPredictionResultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListPredictionResultsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListPredictionResultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -341,9 +336,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_prediction_result(
         &self,
         _req: crate::model::GetPredictionResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PredictionResult>>,
+        Output = crate::Result<crate::Response<crate::model::PredictionResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -352,9 +347,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn create_prediction_result(
         &self,
         _req: crate::model::CreatePredictionResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -363,9 +358,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn update_prediction_result(
         &self,
         _req: crate::model::UpdatePredictionResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -374,9 +369,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn export_prediction_result_metadata(
         &self,
         _req: crate::model::ExportPredictionResultMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,9 +380,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_prediction_result(
         &self,
         _req: crate::model::DeletePredictionResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -396,9 +391,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_backtest_results(
         &self,
         _req: crate::model::ListBacktestResultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBacktestResultsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBacktestResultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -407,9 +402,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_backtest_result(
         &self,
         _req: crate::model::GetBacktestResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BacktestResult>>,
+        Output = crate::Result<crate::Response<crate::model::BacktestResult>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -418,9 +413,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn create_backtest_result(
         &self,
         _req: crate::model::CreateBacktestResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -429,9 +424,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn update_backtest_result(
         &self,
         _req: crate::model::UpdateBacktestResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -440,9 +435,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn export_backtest_result_metadata(
         &self,
         _req: crate::model::ExportBacktestResultMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -451,9 +446,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_backtest_result(
         &self,
         _req: crate::model::DeleteBacktestResultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -462,10 +457,10 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -475,9 +470,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -486,10 +481,10 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -499,9 +494,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -510,8 +505,8 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -519,8 +514,8 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -530,9 +525,9 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -541,8 +536,8 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/financialservices/v1/src/stub/dynamic.rs b/src/generated/cloud/financialservices/v1/src/stub/dynamic.rs
index 46e5d7a3ea..67507860a6 100644
--- a/src/generated/cloud/financialservices/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/financialservices/v1/src/stub/dynamic.rs
@@ -20,278 +20,276 @@ pub trait Aml: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_registered_parties(
         &self,
         req: crate::model::ImportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_registered_parties(
         &self,
         req: crate::model::ExportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatasetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatasetsResponse>>;
 
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>>;
 
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelsResponse>>;
 
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>>;
 
     async fn create_model(
         &self,
         req: crate::model::CreateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_model_metadata(
         &self,
         req: crate::model::ExportModelMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_engine_configs(
         &self,
         req: crate::model::ListEngineConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEngineConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEngineConfigsResponse>>;
 
     async fn get_engine_config(
         &self,
         req: crate::model::GetEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EngineConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EngineConfig>>;
 
     async fn create_engine_config(
         &self,
         req: crate::model::CreateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_engine_config(
         &self,
         req: crate::model::UpdateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_engine_config_metadata(
         &self,
         req: crate::model::ExportEngineConfigMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_engine_config(
         &self,
         req: crate::model::DeleteEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_engine_version(
         &self,
         req: crate::model::GetEngineVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EngineVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EngineVersion>>;
 
     async fn list_engine_versions(
         &self,
         req: crate::model::ListEngineVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEngineVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEngineVersionsResponse>>;
 
     async fn list_prediction_results(
         &self,
         req: crate::model::ListPredictionResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPredictionResultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPredictionResultsResponse>>;
 
     async fn get_prediction_result(
         &self,
         req: crate::model::GetPredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PredictionResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PredictionResult>>;
 
     async fn create_prediction_result(
         &self,
         req: crate::model::CreatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_prediction_result(
         &self,
         req: crate::model::UpdatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_prediction_result_metadata(
         &self,
         req: crate::model::ExportPredictionResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_prediction_result(
         &self,
         req: crate::model::DeletePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backtest_results(
         &self,
         req: crate::model::ListBacktestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBacktestResultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBacktestResultsResponse>>;
 
     async fn get_backtest_result(
         &self,
         req: crate::model::GetBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BacktestResult>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BacktestResult>>;
 
     async fn create_backtest_result(
         &self,
         req: crate::model::CreateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_backtest_result(
         &self,
         req: crate::model::UpdateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_backtest_result_metadata(
         &self,
         req: crate::model::ExportBacktestResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backtest_result(
         &self,
         req: crate::model::DeleteBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Aml] also implement [Aml].
@@ -301,8 +299,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -310,8 +308,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -319,8 +317,8 @@ impl<T: super::Aml> Aml for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -328,8 +326,8 @@ impl<T: super::Aml> Aml for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -337,8 +335,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -346,8 +344,8 @@ impl<T: super::Aml> Aml for T {
     async fn import_registered_parties(
         &self,
         req: crate::model::ImportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_registered_parties(self, req, options).await
     }
 
@@ -355,8 +353,8 @@ impl<T: super::Aml> Aml for T {
     async fn export_registered_parties(
         &self,
         req: crate::model::ExportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_registered_parties(self, req, options).await
     }
 
@@ -364,8 +362,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDatasetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDatasetsResponse>> {
         T::list_datasets(self, req, options).await
     }
 
@@ -373,8 +371,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Dataset>> {
         T::get_dataset(self, req, options).await
     }
 
@@ -382,8 +380,8 @@ impl<T: super::Aml> Aml for T {
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_dataset(self, req, options).await
     }
 
@@ -391,8 +389,8 @@ impl<T: super::Aml> Aml for T {
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_dataset(self, req, options).await
     }
 
@@ -400,8 +398,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_dataset(self, req, options).await
     }
 
@@ -409,8 +407,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListModelsResponse>> {
         T::list_models(self, req, options).await
     }
 
@@ -418,8 +416,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Model>> {
         T::get_model(self, req, options).await
     }
 
@@ -427,8 +425,8 @@ impl<T: super::Aml> Aml for T {
     async fn create_model(
         &self,
         req: crate::model::CreateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_model(self, req, options).await
     }
 
@@ -436,8 +434,8 @@ impl<T: super::Aml> Aml for T {
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_model(self, req, options).await
     }
 
@@ -445,8 +443,8 @@ impl<T: super::Aml> Aml for T {
     async fn export_model_metadata(
         &self,
         req: crate::model::ExportModelMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_model_metadata(self, req, options).await
     }
 
@@ -454,8 +452,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_model(self, req, options).await
     }
 
@@ -463,8 +461,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_engine_configs(
         &self,
         req: crate::model::ListEngineConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEngineConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEngineConfigsResponse>> {
         T::list_engine_configs(self, req, options).await
     }
 
@@ -472,8 +470,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_engine_config(
         &self,
         req: crate::model::GetEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EngineConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EngineConfig>> {
         T::get_engine_config(self, req, options).await
     }
 
@@ -481,8 +479,8 @@ impl<T: super::Aml> Aml for T {
     async fn create_engine_config(
         &self,
         req: crate::model::CreateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_engine_config(self, req, options).await
     }
 
@@ -490,8 +488,8 @@ impl<T: super::Aml> Aml for T {
     async fn update_engine_config(
         &self,
         req: crate::model::UpdateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_engine_config(self, req, options).await
     }
 
@@ -499,8 +497,8 @@ impl<T: super::Aml> Aml for T {
     async fn export_engine_config_metadata(
         &self,
         req: crate::model::ExportEngineConfigMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_engine_config_metadata(self, req, options).await
     }
 
@@ -508,8 +506,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_engine_config(
         &self,
         req: crate::model::DeleteEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_engine_config(self, req, options).await
     }
 
@@ -517,8 +515,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_engine_version(
         &self,
         req: crate::model::GetEngineVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EngineVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EngineVersion>> {
         T::get_engine_version(self, req, options).await
     }
 
@@ -526,8 +524,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_engine_versions(
         &self,
         req: crate::model::ListEngineVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEngineVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEngineVersionsResponse>> {
         T::list_engine_versions(self, req, options).await
     }
 
@@ -535,8 +533,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_prediction_results(
         &self,
         req: crate::model::ListPredictionResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPredictionResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPredictionResultsResponse>> {
         T::list_prediction_results(self, req, options).await
     }
 
@@ -544,8 +542,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_prediction_result(
         &self,
         req: crate::model::GetPredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PredictionResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PredictionResult>> {
         T::get_prediction_result(self, req, options).await
     }
 
@@ -553,8 +551,8 @@ impl<T: super::Aml> Aml for T {
     async fn create_prediction_result(
         &self,
         req: crate::model::CreatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_prediction_result(self, req, options).await
     }
 
@@ -562,8 +560,8 @@ impl<T: super::Aml> Aml for T {
     async fn update_prediction_result(
         &self,
         req: crate::model::UpdatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_prediction_result(self, req, options).await
     }
 
@@ -571,8 +569,8 @@ impl<T: super::Aml> Aml for T {
     async fn export_prediction_result_metadata(
         &self,
         req: crate::model::ExportPredictionResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_prediction_result_metadata(self, req, options).await
     }
 
@@ -580,8 +578,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_prediction_result(
         &self,
         req: crate::model::DeletePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_prediction_result(self, req, options).await
     }
 
@@ -589,8 +587,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_backtest_results(
         &self,
         req: crate::model::ListBacktestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBacktestResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBacktestResultsResponse>> {
         T::list_backtest_results(self, req, options).await
     }
 
@@ -598,8 +596,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_backtest_result(
         &self,
         req: crate::model::GetBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BacktestResult>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BacktestResult>> {
         T::get_backtest_result(self, req, options).await
     }
 
@@ -607,8 +605,8 @@ impl<T: super::Aml> Aml for T {
     async fn create_backtest_result(
         &self,
         req: crate::model::CreateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backtest_result(self, req, options).await
     }
 
@@ -616,8 +614,8 @@ impl<T: super::Aml> Aml for T {
     async fn update_backtest_result(
         &self,
         req: crate::model::UpdateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backtest_result(self, req, options).await
     }
 
@@ -625,8 +623,8 @@ impl<T: super::Aml> Aml for T {
     async fn export_backtest_result_metadata(
         &self,
         req: crate::model::ExportBacktestResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_backtest_result_metadata(self, req, options).await
     }
 
@@ -634,8 +632,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_backtest_result(
         &self,
         req: crate::model::DeleteBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backtest_result(self, req, options).await
     }
 
@@ -643,9 +641,8 @@ impl<T: super::Aml> Aml for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -653,8 +650,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -662,10 +659,9 @@ impl<T: super::Aml> Aml for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -673,8 +669,8 @@ impl<T: super::Aml> Aml for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -682,8 +678,8 @@ impl<T: super::Aml> Aml for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -691,22 +687,22 @@ impl<T: super::Aml> Aml for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/financialservices/v1/src/tracing.rs b/src/generated/cloud/financialservices/v1/src/tracing.rs
index 6296638710..b258c27a35 100644
--- a/src/generated/cloud/financialservices/v1/src/tracing.rs
+++ b/src/generated/cloud/financialservices/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn import_registered_parties(
         &self,
         req: crate::model::ImportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_registered_parties(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn export_registered_parties(
         &self,
         req: crate::model::ExportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_registered_parties(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatasetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatasetsResponse>> {
         self.inner.list_datasets(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         self.inner.get_dataset(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_dataset(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_dataset(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_dataset(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelsResponse>> {
         self.inner.list_models(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         self.inner.get_model(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn create_model(
         &self,
         req: crate::model::CreateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_model(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_model(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn export_model_metadata(
         &self,
         req: crate::model::ExportModelMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_model_metadata(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_model(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn list_engine_configs(
         &self,
         req: crate::model::ListEngineConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEngineConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEngineConfigsResponse>> {
         self.inner.list_engine_configs(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn get_engine_config(
         &self,
         req: crate::model::GetEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EngineConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EngineConfig>> {
         self.inner.get_engine_config(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn create_engine_config(
         &self,
         req: crate::model::CreateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_engine_config(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn update_engine_config(
         &self,
         req: crate::model::UpdateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_engine_config(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn export_engine_config_metadata(
         &self,
         req: crate::model::ExportEngineConfigMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_engine_config_metadata(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn delete_engine_config(
         &self,
         req: crate::model::DeleteEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_engine_config(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn get_engine_version(
         &self,
         req: crate::model::GetEngineVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EngineVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EngineVersion>> {
         self.inner.get_engine_version(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn list_engine_versions(
         &self,
         req: crate::model::ListEngineVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEngineVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEngineVersionsResponse>> {
         self.inner.list_engine_versions(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn list_prediction_results(
         &self,
         req: crate::model::ListPredictionResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPredictionResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPredictionResultsResponse>> {
         self.inner.list_prediction_results(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn get_prediction_result(
         &self,
         req: crate::model::GetPredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PredictionResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PredictionResult>> {
         self.inner.get_prediction_result(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn create_prediction_result(
         &self,
         req: crate::model::CreatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_prediction_result(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn update_prediction_result(
         &self,
         req: crate::model::UpdatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_prediction_result(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn export_prediction_result_metadata(
         &self,
         req: crate::model::ExportPredictionResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .export_prediction_result_metadata(req, options)
             .await
@@ -322,8 +322,8 @@ where
     async fn delete_prediction_result(
         &self,
         req: crate::model::DeletePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_prediction_result(req, options).await
     }
 
@@ -331,8 +331,8 @@ where
     async fn list_backtest_results(
         &self,
         req: crate::model::ListBacktestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBacktestResultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBacktestResultsResponse>> {
         self.inner.list_backtest_results(req, options).await
     }
 
@@ -340,8 +340,8 @@ where
     async fn get_backtest_result(
         &self,
         req: crate::model::GetBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BacktestResult>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BacktestResult>> {
         self.inner.get_backtest_result(req, options).await
     }
 
@@ -349,8 +349,8 @@ where
     async fn create_backtest_result(
         &self,
         req: crate::model::CreateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backtest_result(req, options).await
     }
 
@@ -358,8 +358,8 @@ where
     async fn update_backtest_result(
         &self,
         req: crate::model::UpdateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backtest_result(req, options).await
     }
 
@@ -367,8 +367,8 @@ where
     async fn export_backtest_result_metadata(
         &self,
         req: crate::model::ExportBacktestResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .export_backtest_result_metadata(req, options)
             .await
@@ -378,8 +378,8 @@ where
     async fn delete_backtest_result(
         &self,
         req: crate::model::DeleteBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backtest_result(req, options).await
     }
 
@@ -387,8 +387,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -396,8 +396,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -405,9 +405,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -415,8 +414,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -424,8 +423,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -433,22 +432,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/financialservices/v1/src/transport.rs b/src/generated/cloud/financialservices/v1/src/transport.rs
index 445a964489..41beccf923 100644
--- a/src/generated/cloud/financialservices/v1/src/transport.rs
+++ b/src/generated/cloud/financialservices/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Aml](super::stub::Aml) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -31,7 +31,7 @@ impl std::fmt::Debug for Aml {
 }
 
 impl Aml {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -41,13 +41,13 @@ impl super::stub::Aml for Aml {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::Aml for Aml {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -152,9 +152,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -169,13 +169,13 @@ impl super::stub::Aml for Aml {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::Aml for Aml {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::Aml for Aml {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -362,9 +362,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -379,13 +379,13 @@ impl super::stub::Aml for Aml {
     async fn import_registered_parties(
         &self,
         req: crate::model::ImportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -426,9 +426,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -443,13 +443,13 @@ impl super::stub::Aml for Aml {
     async fn export_registered_parties(
         &self,
         req: crate::model::ExportRegisteredPartiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -490,9 +490,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -507,13 +507,13 @@ impl super::stub::Aml for Aml {
     async fn list_datasets(
         &self,
         req: crate::model::ListDatasetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDatasetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDatasetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -558,9 +558,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -575,13 +575,13 @@ impl super::stub::Aml for Aml {
     async fn get_dataset(
         &self,
         req: crate::model::GetDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Dataset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Dataset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -626,9 +626,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -643,13 +643,13 @@ impl super::stub::Aml for Aml {
     async fn create_dataset(
         &self,
         req: crate::model::CreateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -692,9 +692,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -709,13 +709,13 @@ impl super::stub::Aml for Aml {
     async fn update_dataset(
         &self,
         req: crate::model::UpdateDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -779,9 +779,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -796,13 +796,13 @@ impl super::stub::Aml for Aml {
     async fn delete_dataset(
         &self,
         req: crate::model::DeleteDatasetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -848,9 +848,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -865,13 +865,13 @@ impl super::stub::Aml for Aml {
     async fn list_models(
         &self,
         req: crate::model::ListModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -916,9 +916,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -933,13 +933,13 @@ impl super::stub::Aml for Aml {
     async fn get_model(
         &self,
         req: crate::model::GetModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Model>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Model>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -984,9 +984,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1001,13 +1001,13 @@ impl super::stub::Aml for Aml {
     async fn create_model(
         &self,
         req: crate::model::CreateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1050,9 +1050,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1067,13 +1067,13 @@ impl super::stub::Aml for Aml {
     async fn update_model(
         &self,
         req: crate::model::UpdateModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1137,9 +1137,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1154,13 +1154,13 @@ impl super::stub::Aml for Aml {
     async fn export_model_metadata(
         &self,
         req: crate::model::ExportModelMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1205,9 +1205,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1222,13 +1222,13 @@ impl super::stub::Aml for Aml {
     async fn delete_model(
         &self,
         req: crate::model::DeleteModelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1274,9 +1274,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1291,13 +1291,13 @@ impl super::stub::Aml for Aml {
     async fn list_engine_configs(
         &self,
         req: crate::model::ListEngineConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEngineConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEngineConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1342,9 +1342,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1359,13 +1359,13 @@ impl super::stub::Aml for Aml {
     async fn get_engine_config(
         &self,
         req: crate::model::GetEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EngineConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EngineConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1410,9 +1410,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1427,13 +1427,13 @@ impl super::stub::Aml for Aml {
     async fn create_engine_config(
         &self,
         req: crate::model::CreateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1476,9 +1476,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1493,13 +1493,13 @@ impl super::stub::Aml for Aml {
     async fn update_engine_config(
         &self,
         req: crate::model::UpdateEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1563,9 +1563,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1580,13 +1580,13 @@ impl super::stub::Aml for Aml {
     async fn export_engine_config_metadata(
         &self,
         req: crate::model::ExportEngineConfigMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1631,9 +1631,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1648,13 +1648,13 @@ impl super::stub::Aml for Aml {
     async fn delete_engine_config(
         &self,
         req: crate::model::DeleteEngineConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1700,9 +1700,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1717,13 +1717,13 @@ impl super::stub::Aml for Aml {
     async fn get_engine_version(
         &self,
         req: crate::model::GetEngineVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EngineVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EngineVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1768,9 +1768,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1785,13 +1785,13 @@ impl super::stub::Aml for Aml {
     async fn list_engine_versions(
         &self,
         req: crate::model::ListEngineVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEngineVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEngineVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1836,9 +1836,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1853,13 +1853,13 @@ impl super::stub::Aml for Aml {
     async fn list_prediction_results(
         &self,
         req: crate::model::ListPredictionResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPredictionResultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPredictionResultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1904,9 +1904,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1921,13 +1921,13 @@ impl super::stub::Aml for Aml {
     async fn get_prediction_result(
         &self,
         req: crate::model::GetPredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PredictionResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PredictionResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1972,9 +1972,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1989,13 +1989,13 @@ impl super::stub::Aml for Aml {
     async fn create_prediction_result(
         &self,
         req: crate::model::CreatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2038,9 +2038,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2055,13 +2055,13 @@ impl super::stub::Aml for Aml {
     async fn update_prediction_result(
         &self,
         req: crate::model::UpdatePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2125,9 +2125,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2142,13 +2142,13 @@ impl super::stub::Aml for Aml {
     async fn export_prediction_result_metadata(
         &self,
         req: crate::model::ExportPredictionResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2193,9 +2193,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2210,13 +2210,13 @@ impl super::stub::Aml for Aml {
     async fn delete_prediction_result(
         &self,
         req: crate::model::DeletePredictionResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2262,9 +2262,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2279,13 +2279,13 @@ impl super::stub::Aml for Aml {
     async fn list_backtest_results(
         &self,
         req: crate::model::ListBacktestResultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBacktestResultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBacktestResultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2330,9 +2330,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2347,13 +2347,13 @@ impl super::stub::Aml for Aml {
     async fn get_backtest_result(
         &self,
         req: crate::model::GetBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BacktestResult>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BacktestResult>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2398,9 +2398,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2415,13 +2415,13 @@ impl super::stub::Aml for Aml {
     async fn create_backtest_result(
         &self,
         req: crate::model::CreateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2464,9 +2464,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2481,13 +2481,13 @@ impl super::stub::Aml for Aml {
     async fn update_backtest_result(
         &self,
         req: crate::model::UpdateBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2551,9 +2551,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2568,13 +2568,13 @@ impl super::stub::Aml for Aml {
     async fn export_backtest_result_metadata(
         &self,
         req: crate::model::ExportBacktestResultMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2619,9 +2619,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2636,13 +2636,13 @@ impl super::stub::Aml for Aml {
     async fn delete_backtest_result(
         &self,
         req: crate::model::DeleteBacktestResultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2688,9 +2688,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2705,13 +2705,13 @@ impl super::stub::Aml for Aml {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2741,9 +2741,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2758,13 +2758,13 @@ impl super::stub::Aml for Aml {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2801,9 +2801,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2818,14 +2818,13 @@ impl super::stub::Aml for Aml {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2867,9 +2866,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2884,13 +2883,13 @@ impl super::stub::Aml for Aml {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2931,9 +2930,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2948,13 +2947,13 @@ impl super::stub::Aml for Aml {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2995,9 +2994,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3006,24 +3005,25 @@ impl super::stub::Aml for Aml {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3064,9 +3064,9 @@ impl super::stub::Aml for Aml {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3075,25 +3075,26 @@ impl super::stub::Aml for Aml {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/functions/v2/Cargo.toml b/src/generated/cloud/functions/v2/Cargo.toml
index 44a40c8be8..37179df04b 100644
--- a/src/generated/cloud/functions/v2/Cargo.toml
+++ b/src/generated/cloud/functions/v2/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/functions/v2/src/builder.rs b/src/generated/cloud/functions/v2/src/builder.rs
index 23907ab728..9781c9f89f 100644
--- a/src/generated/cloud/functions/v2/src/builder.rs
+++ b/src/generated/cloud/functions/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod function_service {
     /// A builder for [FunctionService][crate::client::FunctionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_functions_v2::*;
     /// # use builder::function_service::ClientBuilder;
     /// # use client::FunctionService;
@@ -30,19 +30,18 @@ pub mod function_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::FunctionService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = FunctionService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod function_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::FunctionService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod function_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::GetFunction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod function_service {
             (*self.0.stub)
                 .get_function(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFunctionRequest::name].
@@ -133,8 +132,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFunction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFunction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -144,8 +143,8 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::ListFunctions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -176,7 +175,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -186,13 +185,13 @@ pub mod function_service {
             (*self.0.stub)
                 .list_functions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFunctionsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListFunctionsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -201,15 +200,17 @@ pub mod function_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFunctionsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFunctionsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -247,8 +248,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFunctions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFunctions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -258,7 +259,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::CreateFunction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -287,7 +288,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -302,7 +303,7 @@ pub mod function_service {
             (*self.0.stub)
                 .create_function(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_function`.
@@ -319,7 +320,7 @@ pub mod function_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -384,8 +385,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFunction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFunction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -395,7 +396,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::UpdateFunction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -424,7 +425,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -439,7 +440,7 @@ pub mod function_service {
             (*self.0.stub)
                 .update_function(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_function`.
@@ -456,7 +457,7 @@ pub mod function_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -525,8 +526,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFunction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFunction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -536,7 +537,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::DeleteFunction;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -565,7 +566,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -580,7 +581,7 @@ pub mod function_service {
             (*self.0.stub)
                 .delete_function(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_function`.
@@ -592,7 +593,7 @@ pub mod function_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -629,8 +630,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFunction {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFunction {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -640,7 +641,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::GenerateUploadUrl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -671,7 +672,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -681,7 +682,7 @@ pub mod function_service {
             (*self.0.stub)
                 .generate_upload_url(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GenerateUploadUrlRequest::parent].
@@ -706,8 +707,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateUploadUrl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateUploadUrl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -717,7 +718,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::GenerateDownloadUrl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -748,7 +749,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -758,7 +759,7 @@ pub mod function_service {
             (*self.0.stub)
                 .generate_download_url(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GenerateDownloadUrlRequest::name].
@@ -771,8 +772,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateDownloadUrl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateDownloadUrl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -782,7 +783,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::ListRuntimes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -810,7 +811,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -820,7 +821,7 @@ pub mod function_service {
             (*self.0.stub)
                 .list_runtimes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListRuntimesRequest::parent].
@@ -839,8 +840,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRuntimes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRuntimes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -850,8 +851,8 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -885,7 +886,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -895,15 +896,15 @@ pub mod function_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -912,17 +913,17 @@ pub mod function_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -952,8 +953,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -963,7 +964,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -994,7 +995,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1004,7 +1005,7 @@ pub mod function_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1057,8 +1058,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1068,7 +1069,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1099,7 +1100,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1109,7 +1110,7 @@ pub mod function_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1140,8 +1141,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1151,7 +1152,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1184,7 +1185,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1194,7 +1195,7 @@ pub mod function_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1220,8 +1221,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1231,8 +1232,8 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1268,7 +1269,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1278,15 +1279,15 @@ pub mod function_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1295,17 +1296,17 @@ pub mod function_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1341,8 +1342,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1352,7 +1353,7 @@ pub mod function_service {
     /// # Example
     /// ```
     /// # use google_cloud_functions_v2::builder::function_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_functions_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1383,7 +1384,7 @@ pub mod function_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1393,7 +1394,7 @@ pub mod function_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1404,8 +1405,8 @@ pub mod function_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/functions/v2/src/client.rs b/src/generated/cloud/functions/v2/src/client.rs
index 70c860ea58..1170525e6a 100644
--- a/src/generated/cloud/functions/v2/src/client.rs
+++ b/src/generated/cloud/functions/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_functions_v2::client::FunctionService;
 /// let client = FunctionService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Functions API.
@@ -71,15 +71,13 @@ impl FunctionService {
     /// Returns a builder for [FunctionService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_functions_v2::client::FunctionService;
     /// let client = FunctionService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::function_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::function_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::function_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -97,15 +95,14 @@ impl FunctionService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::FunctionService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::FunctionService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -114,13 +111,13 @@ impl FunctionService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FunctionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FunctionService> {
         super::transport::FunctionService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::FunctionService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::FunctionService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::FunctionService::new)
diff --git a/src/generated/cloud/functions/v2/src/lib.rs b/src/generated/cloud/functions/v2/src/lib.rs
index b37fd42516..3fae29dd18 100644
--- a/src/generated/cloud/functions/v2/src/lib.rs
+++ b/src/generated/cloud/functions/v2/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/functions/v2/src/model.rs b/src/generated/cloud/functions/v2/src/model.rs
index 5f0113a8f8..24b84b3757 100644
--- a/src/generated/cloud/functions/v2/src/model.rs
+++ b/src/generated/cloud/functions/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -3648,7 +3648,7 @@ impl wkt::message::Message for ListFunctionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFunctionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFunctionsResponse {
     type PageItem = crate::model::Function;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/functions/v2/src/stub.rs b/src/generated/cloud/functions/v2/src/stub.rs
index 9b4655c52f..5101588229 100644
--- a/src/generated/cloud/functions/v2/src/stub.rs
+++ b/src/generated/cloud/functions/v2/src/stub.rs
@@ -42,10 +42,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn get_function(
         &self,
         _req: crate::model::GetFunctionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Function>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Function>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -53,9 +52,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn list_functions(
         &self,
         _req: crate::model::ListFunctionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFunctionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFunctionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +63,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn create_function(
         &self,
         _req: crate::model::CreateFunctionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn update_function(
         &self,
         _req: crate::model::UpdateFunctionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn delete_function(
         &self,
         _req: crate::model::DeleteFunctionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn generate_upload_url(
         &self,
         _req: crate::model::GenerateUploadUrlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateUploadUrlResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateUploadUrlResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn generate_download_url(
         &self,
         _req: crate::model::GenerateDownloadUrlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateDownloadUrlResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateDownloadUrlResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn list_runtimes(
         &self,
         _req: crate::model::ListRuntimesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRuntimesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRuntimesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,10 +129,10 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -143,9 +142,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,9 +153,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,10 +164,10 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -178,10 +177,10 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -191,9 +190,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -204,9 +203,9 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -215,8 +214,8 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/functions/v2/src/stub/dynamic.rs b/src/generated/cloud/functions/v2/src/stub/dynamic.rs
index 280bff5ec4..962cf24311 100644
--- a/src/generated/cloud/functions/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/functions/v2/src/stub/dynamic.rs
@@ -20,100 +20,96 @@ pub trait FunctionService: std::fmt::Debug + Send + Sync {
     async fn get_function(
         &self,
         req: crate::model::GetFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Function>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Function>>;
 
     async fn list_functions(
         &self,
         req: crate::model::ListFunctionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFunctionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFunctionsResponse>>;
 
     async fn create_function(
         &self,
         req: crate::model::CreateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_function(
         &self,
         req: crate::model::UpdateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_function(
         &self,
         req: crate::model::DeleteFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_upload_url(
         &self,
         req: crate::model::GenerateUploadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateUploadUrlResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateUploadUrlResponse>>;
 
     async fn generate_download_url(
         &self,
         req: crate::model::GenerateDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateDownloadUrlResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateDownloadUrlResponse>>;
 
     async fn list_runtimes(
         &self,
         req: crate::model::ListRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::FunctionService] also implement [FunctionService].
@@ -123,8 +119,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn get_function(
         &self,
         req: crate::model::GetFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Function>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Function>> {
         T::get_function(self, req, options).await
     }
 
@@ -132,8 +128,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn list_functions(
         &self,
         req: crate::model::ListFunctionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFunctionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFunctionsResponse>> {
         T::list_functions(self, req, options).await
     }
 
@@ -141,8 +137,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn create_function(
         &self,
         req: crate::model::CreateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_function(self, req, options).await
     }
 
@@ -150,8 +146,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn update_function(
         &self,
         req: crate::model::UpdateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_function(self, req, options).await
     }
 
@@ -159,8 +155,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn delete_function(
         &self,
         req: crate::model::DeleteFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_function(self, req, options).await
     }
 
@@ -168,8 +164,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn generate_upload_url(
         &self,
         req: crate::model::GenerateUploadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateUploadUrlResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateUploadUrlResponse>> {
         T::generate_upload_url(self, req, options).await
     }
 
@@ -177,8 +173,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn generate_download_url(
         &self,
         req: crate::model::GenerateDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateDownloadUrlResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateDownloadUrlResponse>> {
         T::generate_download_url(self, req, options).await
     }
 
@@ -186,8 +182,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn list_runtimes(
         &self,
         req: crate::model::ListRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRuntimesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRuntimesResponse>> {
         T::list_runtimes(self, req, options).await
     }
 
@@ -195,9 +191,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -205,8 +200,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -214,8 +209,8 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -223,10 +218,9 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -234,10 +228,9 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -245,22 +238,22 @@ impl<T: super::FunctionService> FunctionService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/functions/v2/src/tracing.rs b/src/generated/cloud/functions/v2/src/tracing.rs
index 5f9e712be3..03e8c26c3f 100644
--- a/src/generated/cloud/functions/v2/src/tracing.rs
+++ b/src/generated/cloud/functions/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_function(
         &self,
         req: crate::model::GetFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Function>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Function>> {
         self.inner.get_function(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_functions(
         &self,
         req: crate::model::ListFunctionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFunctionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFunctionsResponse>> {
         self.inner.list_functions(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_function(
         &self,
         req: crate::model::CreateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_function(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_function(
         &self,
         req: crate::model::UpdateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_function(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_function(
         &self,
         req: crate::model::DeleteFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_function(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn generate_upload_url(
         &self,
         req: crate::model::GenerateUploadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateUploadUrlResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateUploadUrlResponse>> {
         self.inner.generate_upload_url(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn generate_download_url(
         &self,
         req: crate::model::GenerateDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateDownloadUrlResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateDownloadUrlResponse>> {
         self.inner.generate_download_url(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_runtimes(
         &self,
         req: crate::model::ListRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimesResponse>> {
         self.inner.list_runtimes(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -140,9 +140,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -150,9 +149,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -160,22 +158,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/functions/v2/src/transport.rs b/src/generated/cloud/functions/v2/src/transport.rs
index 34e5ec6356..e9bfc14bd5 100644
--- a/src/generated/cloud/functions/v2/src/transport.rs
+++ b/src/generated/cloud/functions/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [FunctionService](super::stub::FunctionService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for FunctionService {
 }
 
 impl FunctionService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn get_function(
         &self,
         req: crate::model::GetFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Function>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Function>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -91,9 +91,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -108,13 +108,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn list_functions(
         &self,
         req: crate::model::ListFunctionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFunctionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFunctionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -155,9 +155,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -172,13 +172,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn create_function(
         &self,
         req: crate::model::CreateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn update_function(
         &self,
         req: crate::model::UpdateFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -298,9 +298,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -315,13 +315,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn delete_function(
         &self,
         req: crate::model::DeleteFunctionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -362,9 +362,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -379,13 +379,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn generate_upload_url(
         &self,
         req: crate::model::GenerateUploadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateUploadUrlResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateUploadUrlResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -422,9 +422,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -439,13 +439,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn generate_download_url(
         &self,
         req: crate::model::GenerateDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateDownloadUrlResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateDownloadUrlResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -486,9 +486,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -503,13 +503,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn list_runtimes(
         &self,
         req: crate::model::ListRuntimesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRuntimesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRuntimesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -547,9 +547,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -564,13 +564,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -600,9 +600,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -617,13 +617,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -664,9 +664,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -681,13 +681,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -740,9 +740,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -757,14 +757,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -805,9 +804,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -822,14 +821,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -871,9 +869,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -888,13 +886,13 @@ impl super::stub::FunctionService for FunctionService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -935,9 +933,9 @@ impl super::stub::FunctionService for FunctionService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -951,15 +949,15 @@ impl super::stub::FunctionService for FunctionService {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkebackup/v1/Cargo.toml b/src/generated/cloud/gkebackup/v1/Cargo.toml
index fbeeff387c..b3b0db4086 100644
--- a/src/generated/cloud/gkebackup/v1/Cargo.toml
+++ b/src/generated/cloud/gkebackup/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/gkebackup/v1/src/builder.rs b/src/generated/cloud/gkebackup/v1/src/builder.rs
index 5be5810490..38f664921a 100644
--- a/src/generated/cloud/gkebackup/v1/src/builder.rs
+++ b/src/generated/cloud/gkebackup/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod backup_for_gke {
     /// A builder for [BackupForGKE][crate::client::BackupForGKE].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkebackup_v1::*;
     /// # use builder::backup_for_gke::ClientBuilder;
     /// # use client::BackupForGKE;
@@ -30,19 +30,18 @@ pub mod backup_for_gke {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::BackupForGKE;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = BackupForGKE;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod backup_for_gke {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::BackupForGKE>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod backup_for_gke {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CreateBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -108,7 +107,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123,7 +122,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .create_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_plan`.
@@ -140,7 +139,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -207,8 +206,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -218,8 +217,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListBackupPlans;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -250,7 +249,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -260,14 +259,16 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_backup_plans(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupPlansResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupPlansResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -275,15 +276,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupPlansResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupPlansResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -321,8 +324,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupPlans {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupPlans {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -332,7 +335,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -360,7 +363,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -370,7 +373,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupPlanRequest::name].
@@ -383,8 +386,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -394,7 +397,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::UpdateBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -426,7 +429,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -441,7 +444,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .update_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_plan`.
@@ -458,7 +461,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -527,8 +530,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -538,7 +541,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteBackupPlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -570,7 +573,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -585,7 +588,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_backup_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_plan`.
@@ -597,7 +600,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -640,8 +643,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupPlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupPlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -651,7 +654,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CreateBackupChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -683,7 +686,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -698,7 +701,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .create_backup_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_channel`.
@@ -715,7 +718,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -780,8 +783,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -791,8 +794,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListBackupChannels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -826,7 +829,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -836,14 +839,16 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_backup_channels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupChannelsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupChannelsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -851,17 +856,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBackupChannelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -899,8 +904,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupChannels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupChannels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -910,7 +915,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetBackupChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -941,7 +946,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -951,7 +956,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_backup_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupChannelRequest::name].
@@ -964,8 +969,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -975,7 +980,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::UpdateBackupChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1007,7 +1012,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1022,7 +1027,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .update_backup_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_channel`.
@@ -1039,7 +1044,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1108,8 +1113,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1119,7 +1124,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteBackupChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1151,7 +1156,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1166,7 +1171,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_backup_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_channel`.
@@ -1178,7 +1183,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1227,8 +1232,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1238,8 +1243,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListBackupPlanBindings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1273,7 +1278,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1283,15 +1288,15 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_backup_plan_bindings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListBackupPlanBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1300,17 +1305,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBackupPlanBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1348,8 +1353,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupPlanBindings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupPlanBindings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1359,7 +1364,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetBackupPlanBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1390,7 +1395,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1400,7 +1405,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_backup_plan_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupPlanBindingRequest::name].
@@ -1413,8 +1418,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupPlanBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupPlanBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1424,7 +1429,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CreateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1453,7 +1458,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1468,7 +1473,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .create_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup`.
@@ -1485,7 +1490,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1546,8 +1551,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1557,8 +1562,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1589,7 +1594,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1599,13 +1604,13 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1614,15 +1619,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1666,8 +1673,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1677,7 +1684,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1705,7 +1712,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1715,7 +1722,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -1728,8 +1735,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1739,7 +1746,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::UpdateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1768,7 +1775,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1783,7 +1790,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .update_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup`.
@@ -1800,7 +1807,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1869,8 +1876,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1880,7 +1887,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1909,7 +1916,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1924,7 +1931,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -1936,7 +1943,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1985,8 +1992,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1996,8 +2003,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListVolumeBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2031,7 +2038,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2041,14 +2048,16 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_volume_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVolumeBackupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListVolumeBackupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2056,15 +2065,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVolumeBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVolumeBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2102,8 +2113,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVolumeBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVolumeBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2113,7 +2124,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetVolumeBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2141,7 +2152,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2151,7 +2162,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_volume_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVolumeBackupRequest::name].
@@ -2164,8 +2175,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVolumeBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVolumeBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2175,7 +2186,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CreateRestorePlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2207,7 +2218,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2222,7 +2233,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .create_restore_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_restore_plan`.
@@ -2239,7 +2250,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2306,8 +2317,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRestorePlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRestorePlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2317,8 +2328,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListRestorePlans;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2352,7 +2363,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2362,14 +2373,16 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_restore_plans(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRestorePlansResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRestorePlansResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2377,15 +2390,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRestorePlansResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRestorePlansResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2423,8 +2438,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRestorePlans {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRestorePlans {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2434,7 +2449,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetRestorePlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2462,7 +2477,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2472,7 +2487,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_restore_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRestorePlanRequest::name].
@@ -2485,8 +2500,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRestorePlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRestorePlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2496,7 +2511,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::UpdateRestorePlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2528,7 +2543,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2543,7 +2558,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .update_restore_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_restore_plan`.
@@ -2560,7 +2575,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2629,8 +2644,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRestorePlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRestorePlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2640,7 +2655,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteRestorePlan;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2672,7 +2687,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2687,7 +2702,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_restore_plan(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_restore_plan`.
@@ -2699,7 +2714,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2748,8 +2763,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRestorePlan {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRestorePlan {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2759,7 +2774,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CreateRestoreChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2791,7 +2806,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2806,7 +2821,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .create_restore_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_restore_channel`.
@@ -2823,7 +2838,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2888,8 +2903,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRestoreChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRestoreChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2899,8 +2914,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListRestoreChannels;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2934,7 +2949,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2944,14 +2959,16 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_restore_channels(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRestoreChannelsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRestoreChannelsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2959,17 +2976,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRestoreChannelsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3007,8 +3024,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRestoreChannels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRestoreChannels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3018,7 +3035,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetRestoreChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3049,7 +3066,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3059,7 +3076,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_restore_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRestoreChannelRequest::name].
@@ -3072,8 +3089,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRestoreChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRestoreChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3083,7 +3100,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::UpdateRestoreChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3115,7 +3132,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3130,7 +3147,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .update_restore_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_restore_channel`.
@@ -3147,7 +3164,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3216,8 +3233,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRestoreChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRestoreChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3227,7 +3244,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteRestoreChannel;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3259,7 +3276,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3274,7 +3291,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_restore_channel(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_restore_channel`.
@@ -3286,7 +3303,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3329,8 +3346,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRestoreChannel {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRestoreChannel {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3340,8 +3357,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListRestorePlanBindings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3377,7 +3394,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3387,15 +3404,15 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_restore_plan_bindings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListRestorePlanBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3404,17 +3421,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListRestorePlanBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3452,8 +3469,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRestorePlanBindings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRestorePlanBindings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3463,7 +3480,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetRestorePlanBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3494,7 +3511,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3504,7 +3521,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_restore_plan_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRestorePlanBindingRequest::name].
@@ -3517,8 +3534,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRestorePlanBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRestorePlanBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3528,7 +3545,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CreateRestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3557,7 +3574,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3572,7 +3589,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .create_restore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_restore`.
@@ -3589,7 +3606,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3656,8 +3673,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateRestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateRestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3667,8 +3684,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListRestores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3699,7 +3716,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3709,13 +3726,13 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_restores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRestoresResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRestoresResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3724,15 +3741,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRestoresResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRestoresResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3770,8 +3789,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRestores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRestores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3781,7 +3800,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetRestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3809,7 +3828,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3819,7 +3838,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_restore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRestoreRequest::name].
@@ -3832,8 +3851,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3843,7 +3862,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::UpdateRestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3872,7 +3891,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3887,7 +3906,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .update_restore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_restore`.
@@ -3904,7 +3923,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3973,8 +3992,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateRestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateRestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3984,7 +4003,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteRestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4013,7 +4032,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4028,7 +4047,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_restore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_restore`.
@@ -4040,7 +4059,7 @@ pub mod backup_for_gke {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4089,8 +4108,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteRestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteRestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4100,8 +4119,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListVolumeRestores;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4135,7 +4154,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4145,14 +4164,16 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_volume_restores(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVolumeRestoresResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListVolumeRestoresResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4160,17 +4181,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListVolumeRestoresResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4208,8 +4229,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVolumeRestores {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVolumeRestores {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4219,7 +4240,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetVolumeRestore;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4250,7 +4271,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4260,7 +4281,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_volume_restore(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVolumeRestoreRequest::name].
@@ -4273,8 +4294,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVolumeRestore {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVolumeRestore {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4284,7 +4305,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetBackupIndexDownloadUrl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4317,7 +4338,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4327,7 +4348,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_backup_index_download_url(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [backup][crate::model::GetBackupIndexDownloadUrlRequest::backup].
@@ -4340,8 +4361,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupIndexDownloadUrl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupIndexDownloadUrl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4351,8 +4372,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4386,7 +4407,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4396,15 +4417,15 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4413,17 +4434,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4453,8 +4474,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4464,7 +4485,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4495,7 +4516,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4505,7 +4526,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4516,8 +4537,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4527,7 +4548,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4558,7 +4579,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4568,7 +4589,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4621,8 +4642,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4632,7 +4653,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4663,7 +4684,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4673,7 +4694,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4704,8 +4725,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4715,7 +4736,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4748,7 +4769,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4758,7 +4779,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4784,8 +4805,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4795,8 +4816,8 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4832,7 +4853,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4842,15 +4863,15 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4859,17 +4880,17 @@ pub mod backup_for_gke {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4905,8 +4926,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4916,7 +4937,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4947,7 +4968,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4957,7 +4978,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4968,8 +4989,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4979,7 +5000,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5012,7 +5033,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5022,7 +5043,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5033,8 +5054,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5044,7 +5065,7 @@ pub mod backup_for_gke {
     /// # Example
     /// ```
     /// # use google_cloud_gkebackup_v1::builder::backup_for_gke::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkebackup_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5077,7 +5098,7 @@ pub mod backup_for_gke {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5087,7 +5108,7 @@ pub mod backup_for_gke {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5098,8 +5119,8 @@ pub mod backup_for_gke {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/gkebackup/v1/src/client.rs b/src/generated/cloud/gkebackup/v1/src/client.rs
index 56b7b7e28b..480c01aa32 100644
--- a/src/generated/cloud/gkebackup/v1/src/client.rs
+++ b/src/generated/cloud/gkebackup/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkebackup_v1::client::BackupForGKE;
 /// let client = BackupForGKE::builder().build().await?;
 /// // use `client` to make requests to the Backup for GKE API.
@@ -67,13 +67,13 @@ impl BackupForGKE {
     /// Returns a builder for [BackupForGKE].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkebackup_v1::client::BackupForGKE;
     /// let client = BackupForGKE::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::backup_for_gke::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::backup_for_gke::client::Factory)
+        crate::new_client_builder(super::builder::backup_for_gke::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl BackupForGKE {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::BackupForGKE>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::BackupForGKE>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl BackupForGKE {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackupForGKE> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackupForGKE> {
         super::transport::BackupForGKE::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::BackupForGKE> {
+    ) -> crate::ClientBuilderResult<impl super::stub::BackupForGKE> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::BackupForGKE::new)
diff --git a/src/generated/cloud/gkebackup/v1/src/lib.rs b/src/generated/cloud/gkebackup/v1/src/lib.rs
index 56b450716e..f3aaadbafe 100644
--- a/src/generated/cloud/gkebackup/v1/src/lib.rs
+++ b/src/generated/cloud/gkebackup/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/gkebackup/v1/src/model.rs b/src/generated/cloud/gkebackup/v1/src/model.rs
index 70bf4c7888..52da8152cf 100644
--- a/src/generated/cloud/gkebackup/v1/src/model.rs
+++ b/src/generated/cloud/gkebackup/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -4779,7 +4779,7 @@ impl wkt::message::Message for ListBackupPlansResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupPlansResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupPlansResponse {
     type PageItem = crate::model::BackupPlan;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5274,7 +5274,7 @@ impl wkt::message::Message for ListBackupChannelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupChannelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupChannelsResponse {
     type PageItem = crate::model::BackupChannel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5689,7 +5689,7 @@ impl wkt::message::Message for ListBackupPlanBindingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupPlanBindingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupPlanBindingsResponse {
     type PageItem = crate::model::BackupPlanBinding;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6041,7 +6041,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6434,7 +6434,7 @@ impl wkt::message::Message for ListVolumeBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVolumeBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVolumeBackupsResponse {
     type PageItem = crate::model::VolumeBackup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6770,7 +6770,7 @@ impl wkt::message::Message for ListRestorePlansResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRestorePlansResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRestorePlansResponse {
     type PageItem = crate::model::RestorePlan;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7281,7 +7281,7 @@ impl wkt::message::Message for ListRestoreChannelsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRestoreChannelsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRestoreChannelsResponse {
     type PageItem = crate::model::RestoreChannel;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7681,7 +7681,7 @@ impl wkt::message::Message for ListRestorePlanBindingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRestorePlanBindingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRestorePlanBindingsResponse {
     type PageItem = crate::model::RestorePlanBinding;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8017,7 +8017,7 @@ impl wkt::message::Message for ListRestoresResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRestoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRestoresResponse {
     type PageItem = crate::model::Restore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8410,7 +8410,7 @@ impl wkt::message::Message for ListVolumeRestoresResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVolumeRestoresResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVolumeRestoresResponse {
     type PageItem = crate::model::VolumeRestore;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/gkebackup/v1/src/stub.rs b/src/generated/cloud/gkebackup/v1/src/stub.rs
index 40a6c82b82..17e99a0532 100644
--- a/src/generated/cloud/gkebackup/v1/src/stub.rs
+++ b/src/generated/cloud/gkebackup/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn create_backup_plan(
         &self,
         _req: crate::model::CreateBackupPlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_backup_plans(
         &self,
         _req: crate::model::ListBackupPlansRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupPlansResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupPlansResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +64,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_backup_plan(
         &self,
         _req: crate::model::GetBackupPlanRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupPlan>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::BackupPlan>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +74,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn update_backup_plan(
         &self,
         _req: crate::model::UpdateBackupPlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_backup_plan(
         &self,
         _req: crate::model::DeleteBackupPlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn create_backup_channel(
         &self,
         _req: crate::model::CreateBackupChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_backup_channels(
         &self,
         _req: crate::model::ListBackupChannelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupChannelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupChannelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_backup_channel(
         &self,
         _req: crate::model::GetBackupChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupChannel>>,
+        Output = crate::Result<crate::Response<crate::model::BackupChannel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +129,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn update_backup_channel(
         &self,
         _req: crate::model::UpdateBackupChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +140,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_backup_channel(
         &self,
         _req: crate::model::DeleteBackupChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,11 +151,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_backup_plan_bindings(
         &self,
         _req: crate::model::ListBackupPlanBindingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListBackupPlanBindingsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListBackupPlanBindingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,9 +162,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_backup_plan_binding(
         &self,
         _req: crate::model::GetBackupPlanBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupPlanBinding>>,
+        Output = crate::Result<crate::Response<crate::model::BackupPlanBinding>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +173,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn create_backup(
         &self,
         _req: crate::model::CreateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,9 +184,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,10 +195,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -209,9 +205,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn update_backup(
         &self,
         _req: crate::model::UpdateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +216,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,9 +227,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_volume_backups(
         &self,
         _req: crate::model::ListVolumeBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVolumeBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVolumeBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -242,9 +238,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_volume_backup(
         &self,
         _req: crate::model::GetVolumeBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VolumeBackup>>,
+        Output = crate::Result<crate::Response<crate::model::VolumeBackup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +249,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn create_restore_plan(
         &self,
         _req: crate::model::CreateRestorePlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,9 +260,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_restore_plans(
         &self,
         _req: crate::model::ListRestorePlansRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRestorePlansResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRestorePlansResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -275,10 +271,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_restore_plan(
         &self,
         _req: crate::model::GetRestorePlanRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RestorePlan>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RestorePlan>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -286,9 +281,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn update_restore_plan(
         &self,
         _req: crate::model::UpdateRestorePlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -297,9 +292,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_restore_plan(
         &self,
         _req: crate::model::DeleteRestorePlanRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -308,9 +303,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn create_restore_channel(
         &self,
         _req: crate::model::CreateRestoreChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -319,9 +314,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_restore_channels(
         &self,
         _req: crate::model::ListRestoreChannelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRestoreChannelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRestoreChannelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -330,9 +325,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_restore_channel(
         &self,
         _req: crate::model::GetRestoreChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RestoreChannel>>,
+        Output = crate::Result<crate::Response<crate::model::RestoreChannel>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -341,9 +336,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn update_restore_channel(
         &self,
         _req: crate::model::UpdateRestoreChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -352,9 +347,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_restore_channel(
         &self,
         _req: crate::model::DeleteRestoreChannelRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -363,11 +358,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_restore_plan_bindings(
         &self,
         _req: crate::model::ListRestorePlanBindingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListRestorePlanBindingsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListRestorePlanBindingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -376,9 +369,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_restore_plan_binding(
         &self,
         _req: crate::model::GetRestorePlanBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RestorePlanBinding>>,
+        Output = crate::Result<crate::Response<crate::model::RestorePlanBinding>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -387,9 +380,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn create_restore(
         &self,
         _req: crate::model::CreateRestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -398,9 +391,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_restores(
         &self,
         _req: crate::model::ListRestoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRestoresResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRestoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,10 +402,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_restore(
         &self,
         _req: crate::model::GetRestoreRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Restore>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Restore>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -420,9 +412,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn update_restore(
         &self,
         _req: crate::model::UpdateRestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -431,9 +423,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_restore(
         &self,
         _req: crate::model::DeleteRestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -442,9 +434,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_volume_restores(
         &self,
         _req: crate::model::ListVolumeRestoresRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVolumeRestoresResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVolumeRestoresResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -453,9 +445,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_volume_restore(
         &self,
         _req: crate::model::GetVolumeRestoreRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VolumeRestore>>,
+        Output = crate::Result<crate::Response<crate::model::VolumeRestore>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -464,11 +456,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_backup_index_download_url(
         &self,
         _req: crate::model::GetBackupIndexDownloadUrlRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GetBackupIndexDownloadUrlResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GetBackupIndexDownloadUrlResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -477,10 +467,10 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -490,9 +480,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -501,9 +491,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -512,9 +502,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -523,10 +513,10 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -536,10 +526,10 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -549,9 +539,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -560,8 +550,8 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -569,8 +559,8 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -580,9 +570,9 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -591,8 +581,8 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/gkebackup/v1/src/stub/dynamic.rs b/src/generated/cloud/gkebackup/v1/src/stub/dynamic.rs
index 87dcad5b38..417f64976b 100644
--- a/src/generated/cloud/gkebackup/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/gkebackup/v1/src/stub/dynamic.rs
@@ -20,304 +20,300 @@ pub trait BackupForGKE: std::fmt::Debug + Send + Sync {
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlansResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlansResponse>>;
 
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlan>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlan>>;
 
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_backup_channel(
         &self,
         req: crate::model::CreateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backup_channels(
         &self,
         req: crate::model::ListBackupChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupChannelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupChannelsResponse>>;
 
     async fn get_backup_channel(
         &self,
         req: crate::model::GetBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupChannel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupChannel>>;
 
     async fn update_backup_channel(
         &self,
         req: crate::model::UpdateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup_channel(
         &self,
         req: crate::model::DeleteBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backup_plan_bindings(
         &self,
         req: crate::model::ListBackupPlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlanBindingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlanBindingsResponse>>;
 
     async fn get_backup_plan_binding(
         &self,
         req: crate::model::GetBackupPlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlanBinding>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlanBinding>>;
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_volume_backups(
         &self,
         req: crate::model::ListVolumeBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumeBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumeBackupsResponse>>;
 
     async fn get_volume_backup(
         &self,
         req: crate::model::GetVolumeBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeBackup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeBackup>>;
 
     async fn create_restore_plan(
         &self,
         req: crate::model::CreateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_restore_plans(
         &self,
         req: crate::model::ListRestorePlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestorePlansResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestorePlansResponse>>;
 
     async fn get_restore_plan(
         &self,
         req: crate::model::GetRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestorePlan>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestorePlan>>;
 
     async fn update_restore_plan(
         &self,
         req: crate::model::UpdateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_restore_plan(
         &self,
         req: crate::model::DeleteRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_restore_channel(
         &self,
         req: crate::model::CreateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_restore_channels(
         &self,
         req: crate::model::ListRestoreChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestoreChannelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestoreChannelsResponse>>;
 
     async fn get_restore_channel(
         &self,
         req: crate::model::GetRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestoreChannel>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestoreChannel>>;
 
     async fn update_restore_channel(
         &self,
         req: crate::model::UpdateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_restore_channel(
         &self,
         req: crate::model::DeleteRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_restore_plan_bindings(
         &self,
         req: crate::model::ListRestorePlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestorePlanBindingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestorePlanBindingsResponse>>;
 
     async fn get_restore_plan_binding(
         &self,
         req: crate::model::GetRestorePlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestorePlanBinding>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestorePlanBinding>>;
 
     async fn create_restore(
         &self,
         req: crate::model::CreateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_restores(
         &self,
         req: crate::model::ListRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestoresResponse>>;
 
     async fn get_restore(
         &self,
         req: crate::model::GetRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Restore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Restore>>;
 
     async fn update_restore(
         &self,
         req: crate::model::UpdateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_restore(
         &self,
         req: crate::model::DeleteRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_volume_restores(
         &self,
         req: crate::model::ListVolumeRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumeRestoresResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumeRestoresResponse>>;
 
     async fn get_volume_restore(
         &self,
         req: crate::model::GetVolumeRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeRestore>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeRestore>>;
 
     async fn get_backup_index_download_url(
         &self,
         req: crate::model::GetBackupIndexDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetBackupIndexDownloadUrlResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetBackupIndexDownloadUrlResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::BackupForGKE] also implement [BackupForGKE].
@@ -327,8 +323,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_plan(self, req, options).await
     }
 
@@ -336,8 +332,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlansResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlansResponse>> {
         T::list_backup_plans(self, req, options).await
     }
 
@@ -345,8 +341,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlan>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlan>> {
         T::get_backup_plan(self, req, options).await
     }
 
@@ -354,8 +350,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_plan(self, req, options).await
     }
 
@@ -363,8 +359,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_plan(self, req, options).await
     }
 
@@ -372,8 +368,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn create_backup_channel(
         &self,
         req: crate::model::CreateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_channel(self, req, options).await
     }
 
@@ -381,8 +377,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_backup_channels(
         &self,
         req: crate::model::ListBackupChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupChannelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupChannelsResponse>> {
         T::list_backup_channels(self, req, options).await
     }
 
@@ -390,8 +386,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_backup_channel(
         &self,
         req: crate::model::GetBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupChannel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupChannel>> {
         T::get_backup_channel(self, req, options).await
     }
 
@@ -399,8 +395,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn update_backup_channel(
         &self,
         req: crate::model::UpdateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_channel(self, req, options).await
     }
 
@@ -408,8 +404,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_backup_channel(
         &self,
         req: crate::model::DeleteBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_channel(self, req, options).await
     }
 
@@ -417,8 +413,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_backup_plan_bindings(
         &self,
         req: crate::model::ListBackupPlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPlanBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPlanBindingsResponse>> {
         T::list_backup_plan_bindings(self, req, options).await
     }
 
@@ -426,8 +422,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_backup_plan_binding(
         &self,
         req: crate::model::GetBackupPlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPlanBinding>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPlanBinding>> {
         T::get_backup_plan_binding(self, req, options).await
     }
 
@@ -435,8 +431,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup(self, req, options).await
     }
 
@@ -444,8 +440,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -453,8 +449,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -462,8 +458,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup(self, req, options).await
     }
 
@@ -471,8 +467,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -480,8 +476,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_volume_backups(
         &self,
         req: crate::model::ListVolumeBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumeBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumeBackupsResponse>> {
         T::list_volume_backups(self, req, options).await
     }
 
@@ -489,8 +485,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_volume_backup(
         &self,
         req: crate::model::GetVolumeBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeBackup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeBackup>> {
         T::get_volume_backup(self, req, options).await
     }
 
@@ -498,8 +494,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn create_restore_plan(
         &self,
         req: crate::model::CreateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_restore_plan(self, req, options).await
     }
 
@@ -507,8 +503,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_restore_plans(
         &self,
         req: crate::model::ListRestorePlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestorePlansResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestorePlansResponse>> {
         T::list_restore_plans(self, req, options).await
     }
 
@@ -516,8 +512,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_restore_plan(
         &self,
         req: crate::model::GetRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestorePlan>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestorePlan>> {
         T::get_restore_plan(self, req, options).await
     }
 
@@ -525,8 +521,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn update_restore_plan(
         &self,
         req: crate::model::UpdateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_restore_plan(self, req, options).await
     }
 
@@ -534,8 +530,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_restore_plan(
         &self,
         req: crate::model::DeleteRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_restore_plan(self, req, options).await
     }
 
@@ -543,8 +539,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn create_restore_channel(
         &self,
         req: crate::model::CreateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_restore_channel(self, req, options).await
     }
 
@@ -552,8 +548,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_restore_channels(
         &self,
         req: crate::model::ListRestoreChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestoreChannelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestoreChannelsResponse>> {
         T::list_restore_channels(self, req, options).await
     }
 
@@ -561,8 +557,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_restore_channel(
         &self,
         req: crate::model::GetRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestoreChannel>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestoreChannel>> {
         T::get_restore_channel(self, req, options).await
     }
 
@@ -570,8 +566,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn update_restore_channel(
         &self,
         req: crate::model::UpdateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_restore_channel(self, req, options).await
     }
 
@@ -579,8 +575,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_restore_channel(
         &self,
         req: crate::model::DeleteRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_restore_channel(self, req, options).await
     }
 
@@ -588,8 +584,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_restore_plan_bindings(
         &self,
         req: crate::model::ListRestorePlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestorePlanBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestorePlanBindingsResponse>> {
         T::list_restore_plan_bindings(self, req, options).await
     }
 
@@ -597,8 +593,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_restore_plan_binding(
         &self,
         req: crate::model::GetRestorePlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestorePlanBinding>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestorePlanBinding>> {
         T::get_restore_plan_binding(self, req, options).await
     }
 
@@ -606,8 +602,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn create_restore(
         &self,
         req: crate::model::CreateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_restore(self, req, options).await
     }
 
@@ -615,8 +611,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_restores(
         &self,
         req: crate::model::ListRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRestoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRestoresResponse>> {
         T::list_restores(self, req, options).await
     }
 
@@ -624,8 +620,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_restore(
         &self,
         req: crate::model::GetRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Restore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Restore>> {
         T::get_restore(self, req, options).await
     }
 
@@ -633,8 +629,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn update_restore(
         &self,
         req: crate::model::UpdateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_restore(self, req, options).await
     }
 
@@ -642,8 +638,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_restore(
         &self,
         req: crate::model::DeleteRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_restore(self, req, options).await
     }
 
@@ -651,8 +647,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_volume_restores(
         &self,
         req: crate::model::ListVolumeRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumeRestoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumeRestoresResponse>> {
         T::list_volume_restores(self, req, options).await
     }
 
@@ -660,8 +656,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_volume_restore(
         &self,
         req: crate::model::GetVolumeRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VolumeRestore>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VolumeRestore>> {
         T::get_volume_restore(self, req, options).await
     }
 
@@ -669,9 +665,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_backup_index_download_url(
         &self,
         req: crate::model::GetBackupIndexDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GetBackupIndexDownloadUrlResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GetBackupIndexDownloadUrlResponse>> {
         T::get_backup_index_download_url(self, req, options).await
     }
 
@@ -679,9 +674,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -689,8 +683,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -698,8 +692,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -707,8 +701,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -716,10 +710,9 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -727,10 +720,9 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -738,8 +730,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -747,8 +739,8 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -756,22 +748,22 @@ impl<T: super::BackupForGKE> BackupForGKE for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/gkebackup/v1/src/tracing.rs b/src/generated/cloud/gkebackup/v1/src/tracing.rs
index 858fe3635f..8e8b2c24dc 100644
--- a/src/generated/cloud/gkebackup/v1/src/tracing.rs
+++ b/src/generated/cloud/gkebackup/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup_plan(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlansResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlansResponse>> {
         self.inner.list_backup_plans(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlan>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlan>> {
         self.inner.get_backup_plan(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup_plan(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup_plan(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn create_backup_channel(
         &self,
         req: crate::model::CreateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup_channel(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn list_backup_channels(
         &self,
         req: crate::model::ListBackupChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupChannelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupChannelsResponse>> {
         self.inner.list_backup_channels(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_backup_channel(
         &self,
         req: crate::model::GetBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupChannel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupChannel>> {
         self.inner.get_backup_channel(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_backup_channel(
         &self,
         req: crate::model::UpdateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup_channel(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_backup_channel(
         &self,
         req: crate::model::DeleteBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup_channel(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_backup_plan_bindings(
         &self,
         req: crate::model::ListBackupPlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlanBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlanBindingsResponse>> {
         self.inner.list_backup_plan_bindings(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_backup_plan_binding(
         &self,
         req: crate::model::GetBackupPlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlanBinding>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlanBinding>> {
         self.inner.get_backup_plan_binding(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn list_volume_backups(
         &self,
         req: crate::model::ListVolumeBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumeBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumeBackupsResponse>> {
         self.inner.list_volume_backups(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn get_volume_backup(
         &self,
         req: crate::model::GetVolumeBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeBackup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeBackup>> {
         self.inner.get_volume_backup(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn create_restore_plan(
         &self,
         req: crate::model::CreateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_restore_plan(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn list_restore_plans(
         &self,
         req: crate::model::ListRestorePlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestorePlansResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestorePlansResponse>> {
         self.inner.list_restore_plans(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn get_restore_plan(
         &self,
         req: crate::model::GetRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestorePlan>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestorePlan>> {
         self.inner.get_restore_plan(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn update_restore_plan(
         &self,
         req: crate::model::UpdateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_restore_plan(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn delete_restore_plan(
         &self,
         req: crate::model::DeleteRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_restore_plan(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn create_restore_channel(
         &self,
         req: crate::model::CreateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_restore_channel(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn list_restore_channels(
         &self,
         req: crate::model::ListRestoreChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestoreChannelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestoreChannelsResponse>> {
         self.inner.list_restore_channels(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn get_restore_channel(
         &self,
         req: crate::model::GetRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestoreChannel>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestoreChannel>> {
         self.inner.get_restore_channel(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn update_restore_channel(
         &self,
         req: crate::model::UpdateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_restore_channel(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn delete_restore_channel(
         &self,
         req: crate::model::DeleteRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_restore_channel(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn list_restore_plan_bindings(
         &self,
         req: crate::model::ListRestorePlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestorePlanBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestorePlanBindingsResponse>> {
         self.inner.list_restore_plan_bindings(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn get_restore_plan_binding(
         &self,
         req: crate::model::GetRestorePlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestorePlanBinding>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestorePlanBinding>> {
         self.inner.get_restore_plan_binding(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn create_restore(
         &self,
         req: crate::model::CreateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_restore(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn list_restores(
         &self,
         req: crate::model::ListRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestoresResponse>> {
         self.inner.list_restores(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn get_restore(
         &self,
         req: crate::model::GetRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Restore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Restore>> {
         self.inner.get_restore(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn update_restore(
         &self,
         req: crate::model::UpdateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_restore(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn delete_restore(
         &self,
         req: crate::model::DeleteRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_restore(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn list_volume_restores(
         &self,
         req: crate::model::ListVolumeRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumeRestoresResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumeRestoresResponse>> {
         self.inner.list_volume_restores(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn get_volume_restore(
         &self,
         req: crate::model::GetVolumeRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeRestore>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeRestore>> {
         self.inner.get_volume_restore(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn get_backup_index_download_url(
         &self,
         req: crate::model::GetBackupIndexDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetBackupIndexDownloadUrlResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetBackupIndexDownloadUrlResponse>> {
         self.inner.get_backup_index_download_url(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -401,8 +401,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -410,8 +410,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -419,8 +419,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -428,9 +428,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -438,9 +437,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -448,8 +446,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -457,8 +455,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -466,22 +464,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkebackup/v1/src/transport.rs b/src/generated/cloud/gkebackup/v1/src/transport.rs
index 1b246d05e5..7a961c0e8e 100644
--- a/src/generated/cloud/gkebackup/v1/src/transport.rs
+++ b/src/generated/cloud/gkebackup/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [BackupForGKE](super::stub::BackupForGKE) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for BackupForGKE {
 }
 
 impl BackupForGKE {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn create_backup_plan(
         &self,
         req: crate::model::CreateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_backup_plans(
         &self,
         req: crate::model::ListBackupPlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlansResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlansResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -151,9 +151,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -168,13 +168,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_backup_plan(
         &self,
         req: crate::model::GetBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlan>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlan>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn update_backup_plan(
         &self,
         req: crate::model::UpdateBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_backup_plan(
         &self,
         req: crate::model::DeleteBackupPlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -362,9 +362,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -379,13 +379,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn create_backup_channel(
         &self,
         req: crate::model::CreateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -423,9 +423,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -440,13 +440,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_backup_channels(
         &self,
         req: crate::model::ListBackupChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupChannelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupChannelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -487,9 +487,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -504,13 +504,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_backup_channel(
         &self,
         req: crate::model::GetBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupChannel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupChannel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -551,9 +551,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -568,13 +568,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn update_backup_channel(
         &self,
         req: crate::model::UpdateBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -633,9 +633,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -650,13 +650,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_backup_channel(
         &self,
         req: crate::model::DeleteBackupChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -699,9 +699,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -716,13 +716,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_backup_plan_bindings(
         &self,
         req: crate::model::ListBackupPlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPlanBindingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPlanBindingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -767,9 +767,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -784,13 +784,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_backup_plan_binding(
         &self,
         req: crate::model::GetBackupPlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPlanBinding>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPlanBinding>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -835,9 +835,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -852,13 +852,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -900,9 +900,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -917,13 +917,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -970,9 +970,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -987,13 +987,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1038,9 +1038,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1055,13 +1055,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1124,9 +1124,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1141,13 +1141,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1194,9 +1194,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1211,13 +1211,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_volume_backups(
         &self,
         req: crate::model::ListVolumeBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumeBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumeBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1266,9 +1266,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1283,13 +1283,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_volume_backup(
         &self,
         req: crate::model::GetVolumeBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeBackup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeBackup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1338,9 +1338,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1355,13 +1355,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn create_restore_plan(
         &self,
         req: crate::model::CreateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1399,9 +1399,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1416,13 +1416,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_restore_plans(
         &self,
         req: crate::model::ListRestorePlansRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestorePlansResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestorePlansResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1463,9 +1463,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1480,13 +1480,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_restore_plan(
         &self,
         req: crate::model::GetRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestorePlan>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestorePlan>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1527,9 +1527,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1544,13 +1544,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn update_restore_plan(
         &self,
         req: crate::model::UpdateRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1609,9 +1609,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1626,13 +1626,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_restore_plan(
         &self,
         req: crate::model::DeleteRestorePlanRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1675,9 +1675,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1692,13 +1692,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn create_restore_channel(
         &self,
         req: crate::model::CreateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1736,9 +1736,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1753,13 +1753,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_restore_channels(
         &self,
         req: crate::model::ListRestoreChannelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestoreChannelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestoreChannelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1800,9 +1800,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1817,13 +1817,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_restore_channel(
         &self,
         req: crate::model::GetRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestoreChannel>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestoreChannel>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1864,9 +1864,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1881,13 +1881,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn update_restore_channel(
         &self,
         req: crate::model::UpdateRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1946,9 +1946,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1963,13 +1963,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_restore_channel(
         &self,
         req: crate::model::DeleteRestoreChannelRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2011,9 +2011,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2028,13 +2028,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_restore_plan_bindings(
         &self,
         req: crate::model::ListRestorePlanBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestorePlanBindingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestorePlanBindingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2079,9 +2079,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2096,13 +2096,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_restore_plan_binding(
         &self,
         req: crate::model::GetRestorePlanBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestorePlanBinding>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestorePlanBinding>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2147,9 +2147,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2164,13 +2164,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn create_restore(
         &self,
         req: crate::model::CreateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2212,9 +2212,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2229,13 +2229,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_restores(
         &self,
         req: crate::model::ListRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRestoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRestoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2280,9 +2280,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2297,13 +2297,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_restore(
         &self,
         req: crate::model::GetRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Restore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Restore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2348,9 +2348,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2365,13 +2365,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn update_restore(
         &self,
         req: crate::model::UpdateRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2434,9 +2434,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2451,13 +2451,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_restore(
         &self,
         req: crate::model::DeleteRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2504,9 +2504,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2521,13 +2521,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_volume_restores(
         &self,
         req: crate::model::ListVolumeRestoresRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumeRestoresResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumeRestoresResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2576,9 +2576,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2593,13 +2593,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_volume_restore(
         &self,
         req: crate::model::GetVolumeRestoreRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VolumeRestore>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VolumeRestore>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2648,9 +2648,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2665,13 +2665,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_backup_index_download_url(
         &self,
         req: crate::model::GetBackupIndexDownloadUrlRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GetBackupIndexDownloadUrlResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GetBackupIndexDownloadUrlResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2716,9 +2716,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2733,13 +2733,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2769,9 +2769,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2786,13 +2786,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2829,9 +2829,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2846,13 +2846,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3102,9 +3102,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3119,13 +3119,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3447,9 +3447,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3464,14 +3464,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3721,9 +3720,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3738,14 +3737,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3787,9 +3785,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3804,13 +3802,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3851,9 +3849,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3868,13 +3866,13 @@ impl super::stub::BackupForGKE for BackupForGKE {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3915,9 +3913,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3926,24 +3924,25 @@ impl super::stub::BackupForGKE for BackupForGKE {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3984,9 +3983,9 @@ impl super::stub::BackupForGKE for BackupForGKE {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3995,25 +3994,26 @@ impl super::stub::BackupForGKE for BackupForGKE {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml b/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml
index 237b772c81..46648b75a1 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml
+++ b/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/builder.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/builder.rs
index e43623c778..ca353caf8c 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/builder.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod gateway_control {
     /// A builder for [GatewayControl][crate::client::GatewayControl].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkeconnect_gateway_v1::*;
     /// # use builder::gateway_control::ClientBuilder;
     /// # use client::GatewayControl;
@@ -30,19 +30,18 @@ pub mod gateway_control {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GatewayControl;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GatewayControl;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod gateway_control {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GatewayControl>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod gateway_control {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod gateway_control {
     /// # Example
     /// ```
     /// # use google_cloud_gkeconnect_gateway_v1::builder::gateway_control::GenerateCredentials;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkeconnect_gateway_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod gateway_control {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod gateway_control {
             (*self.0.stub)
                 .generate_credentials(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GenerateCredentialsRequest::name].
@@ -159,8 +158,8 @@ pub mod gateway_control {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateCredentials {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateCredentials {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/client.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/client.rs
index 8f8ed640a3..add099b8e3 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/client.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkeconnect_gateway_v1::client::GatewayControl;
 /// let client = GatewayControl::builder().build().await?;
 /// // use `client` to make requests to the Connect Gateway API.
@@ -66,13 +66,13 @@ impl GatewayControl {
     /// Returns a builder for [GatewayControl].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkeconnect_gateway_v1::client::GatewayControl;
     /// let client = GatewayControl::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::gateway_control::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::gateway_control::client::Factory)
+        crate::new_client_builder(super::builder::gateway_control::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl GatewayControl {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GatewayControl>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GatewayControl>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl GatewayControl {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GatewayControl> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GatewayControl> {
         super::transport::GatewayControl::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GatewayControl> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GatewayControl> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GatewayControl::new)
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/lib.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/lib.rs
index 4c987ff42c..e7a5bbab7f 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/lib.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs
index 80b03d1d01..af733b2b64 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/stub.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/stub.rs
index 204459845e..48f018924e 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/stub.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait GatewayControl: std::fmt::Debug + Send + Sync {
     fn generate_credentials(
         &self,
         _req: crate::model::GenerateCredentialsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateCredentialsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateCredentialsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/stub/dynamic.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/stub/dynamic.rs
index 956da928b0..cd5e215c10 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/stub/dynamic.rs
@@ -20,8 +20,8 @@ pub trait GatewayControl: std::fmt::Debug + Send + Sync {
     async fn generate_credentials(
         &self,
         req: crate::model::GenerateCredentialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateCredentialsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateCredentialsResponse>>;
 }
 
 /// All implementations of [super::GatewayControl] also implement [GatewayControl].
@@ -31,8 +31,8 @@ impl<T: super::GatewayControl> GatewayControl for T {
     async fn generate_credentials(
         &self,
         req: crate::model::GenerateCredentialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateCredentialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateCredentialsResponse>> {
         T::generate_credentials(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/tracing.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/tracing.rs
index e8b711ab3b..8e8ac7911f 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/tracing.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn generate_credentials(
         &self,
         req: crate::model::GenerateCredentialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateCredentialsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateCredentialsResponse>> {
         self.inner.generate_credentials(req, options).await
     }
 }
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs
index c2be207753..b130b3ac0b 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [GatewayControl](super::stub::GatewayControl) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for GatewayControl {
 }
 
 impl GatewayControl {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::GatewayControl for GatewayControl {
     async fn generate_credentials(
         &self,
         req: crate::model::GenerateCredentialsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateCredentialsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateCredentialsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -94,9 +94,9 @@ impl super::stub::GatewayControl for GatewayControl {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/gkehub/v1/Cargo.toml b/src/generated/cloud/gkehub/v1/Cargo.toml
index 45c801975b..068bfebcef 100644
--- a/src/generated/cloud/gkehub/v1/Cargo.toml
+++ b/src/generated/cloud/gkehub/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace                                     = true
 bytes.workspace                                           = true
-gax.workspace                                             = true
 gaxi                                                      = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace                                = true
 google-cloud-gkehub-configmanagement-v1.workspace         = true
 google-cloud-gkehub-multiclusteringress-v1.workspace      = true
 google-cloud-gkehub-rbacrolebindingactuation-v1.workspace = true
diff --git a/src/generated/cloud/gkehub/v1/src/builder.rs b/src/generated/cloud/gkehub/v1/src/builder.rs
index 6a89c22757..a459c063b1 100644
--- a/src/generated/cloud/gkehub/v1/src/builder.rs
+++ b/src/generated/cloud/gkehub/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod gke_hub {
     /// A builder for [GkeHub][crate::client::GkeHub].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkehub_v1::*;
     /// # use builder::gke_hub::ClientBuilder;
     /// # use client::GkeHub;
@@ -30,19 +30,18 @@ pub mod gke_hub {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GkeHub;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GkeHub;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod gke_hub {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GkeHub>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod gke_hub {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListMemberships;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -104,7 +103,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,14 +113,16 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_memberships(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMembershipsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMembershipsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -129,15 +130,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListMembershipsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListMembershipsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -175,8 +178,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMemberships {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMemberships {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -186,8 +189,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListBoundMemberships;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -219,7 +222,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -229,14 +232,16 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_bound_memberships(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBoundMembershipsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBoundMembershipsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -244,17 +249,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBoundMembershipsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -286,8 +291,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBoundMemberships {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBoundMemberships {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -297,8 +302,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListFeatures;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -327,7 +332,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -337,13 +342,13 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_features(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFeaturesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListFeaturesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -352,15 +357,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFeaturesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFeaturesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -402,8 +409,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFeatures {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFeatures {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -413,7 +420,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetMembership;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -439,7 +446,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -449,7 +456,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_membership(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMembershipRequest::name].
@@ -462,8 +469,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMembership {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMembership {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -473,7 +480,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -499,7 +506,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -509,7 +516,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFeatureRequest::name].
@@ -526,8 +533,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -537,7 +544,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateMembership;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -567,7 +574,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -582,7 +589,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_membership(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_membership`.
@@ -599,7 +606,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -672,8 +679,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMembership {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMembership {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -683,7 +690,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -710,7 +717,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -725,7 +732,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_feature`.
@@ -742,7 +749,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -807,8 +814,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -818,7 +825,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteMembership;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -848,7 +855,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -863,7 +870,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_membership(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_membership`.
@@ -875,7 +882,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -924,8 +931,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMembership {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMembership {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -935,7 +942,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -962,7 +969,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -977,7 +984,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_feature`.
@@ -989,7 +996,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1036,8 +1043,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1047,7 +1054,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateMembership;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1077,7 +1084,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1092,7 +1099,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_membership(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_membership`.
@@ -1109,7 +1116,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1196,8 +1203,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMembership {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMembership {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1207,7 +1214,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateFeature;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1234,7 +1241,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1249,7 +1256,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_feature(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_feature`.
@@ -1266,7 +1273,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1343,8 +1350,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFeature {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFeature {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1354,7 +1361,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GenerateConnectManifest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1385,7 +1392,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1395,7 +1402,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .generate_connect_manifest(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GenerateConnectManifestRequest::name].
@@ -1444,8 +1451,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateConnectManifest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateConnectManifest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1455,7 +1462,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateFleet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1482,7 +1489,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1497,7 +1504,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_fleet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_fleet`.
@@ -1514,7 +1521,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1573,8 +1580,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFleet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFleet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1584,7 +1591,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetFleet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1610,7 +1617,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1620,7 +1627,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_fleet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFleetRequest::name].
@@ -1633,8 +1640,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFleet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFleet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1644,7 +1651,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateFleet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1671,7 +1678,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1686,7 +1693,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_fleet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_fleet`.
@@ -1703,7 +1710,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1776,8 +1783,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFleet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFleet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1787,7 +1794,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteFleet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1814,7 +1821,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1829,7 +1836,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_fleet(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_fleet`.
@@ -1841,7 +1848,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1878,8 +1885,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFleet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFleet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1889,8 +1896,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListFleets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1919,7 +1926,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1929,13 +1936,13 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_fleets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFleetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListFleetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1944,15 +1951,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFleetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFleetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1978,8 +1987,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFleets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFleets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1989,7 +1998,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetScopeNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2018,7 +2027,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2028,7 +2037,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_scope_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetScopeNamespaceRequest::name].
@@ -2041,8 +2050,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetScopeNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetScopeNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2052,7 +2061,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateScopeNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2082,7 +2091,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2097,7 +2106,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_scope_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_scope_namespace`.
@@ -2114,7 +2123,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2181,8 +2190,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateScopeNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateScopeNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2192,7 +2201,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateScopeNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2222,7 +2231,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2237,7 +2246,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_scope_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_scope_namespace`.
@@ -2254,7 +2263,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2327,8 +2336,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateScopeNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateScopeNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2338,7 +2347,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteScopeNamespace;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2368,7 +2377,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2383,7 +2392,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_scope_namespace(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_scope_namespace`.
@@ -2395,7 +2404,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2432,8 +2441,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteScopeNamespace {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteScopeNamespace {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2443,8 +2452,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListScopeNamespaces;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2476,7 +2485,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2486,14 +2495,16 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_scope_namespaces(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListScopeNamespacesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListScopeNamespacesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2501,17 +2512,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListScopeNamespacesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2537,8 +2548,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListScopeNamespaces {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListScopeNamespaces {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2548,7 +2559,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetScopeRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2579,7 +2590,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2589,7 +2600,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_scope_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetScopeRBACRoleBindingRequest::name].
@@ -2602,8 +2613,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetScopeRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetScopeRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2613,7 +2624,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateScopeRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2645,7 +2656,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2660,7 +2671,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_scope_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_scope_rbac_role_binding`.
@@ -2677,7 +2688,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2744,8 +2755,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateScopeRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateScopeRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2755,7 +2766,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateScopeRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2787,7 +2798,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2802,7 +2813,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_scope_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_scope_rbac_role_binding`.
@@ -2819,7 +2830,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2892,8 +2903,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateScopeRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateScopeRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2903,7 +2914,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteScopeRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2935,7 +2946,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2950,7 +2961,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_scope_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_scope_rbac_role_binding`.
@@ -2962,7 +2973,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2999,8 +3010,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteScopeRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteScopeRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3010,8 +3021,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListScopeRBACRoleBindings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3045,7 +3056,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3055,15 +3066,15 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_scope_rbac_role_bindings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListScopeRBACRoleBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3072,17 +3083,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListScopeRBACRoleBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3108,8 +3119,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListScopeRBACRoleBindings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListScopeRBACRoleBindings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3119,7 +3130,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3145,7 +3156,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3155,7 +3166,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetScopeRequest::name].
@@ -3168,8 +3179,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3179,7 +3190,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3206,7 +3217,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3221,7 +3232,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_scope`.
@@ -3238,7 +3249,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3305,8 +3316,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3316,7 +3327,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3343,7 +3354,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3358,7 +3369,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_scope`.
@@ -3375,7 +3386,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3448,8 +3459,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3459,7 +3470,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteScope;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3486,7 +3497,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3501,7 +3512,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_scope(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_scope`.
@@ -3513,7 +3524,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3550,8 +3561,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteScope {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteScope {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3561,8 +3572,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListScopes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3591,7 +3602,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3601,13 +3612,13 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_scopes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListScopesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListScopesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3616,15 +3627,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListScopesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListScopesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3650,8 +3663,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListScopes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListScopes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3661,8 +3674,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListPermittedScopes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3694,7 +3707,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3704,14 +3717,16 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_permitted_scopes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPermittedScopesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPermittedScopesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3719,17 +3734,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPermittedScopesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3755,8 +3770,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPermittedScopes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPermittedScopes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3766,7 +3781,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetMembershipBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3795,7 +3810,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3805,7 +3820,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_membership_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMembershipBindingRequest::name].
@@ -3818,8 +3833,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMembershipBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMembershipBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3829,7 +3844,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateMembershipBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3861,7 +3876,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3876,7 +3891,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_membership_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_membership_binding`.
@@ -3895,7 +3910,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3962,8 +3977,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMembershipBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMembershipBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3973,7 +3988,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateMembershipBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4005,7 +4020,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4020,7 +4035,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_membership_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_membership_binding`.
@@ -4039,7 +4054,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4112,8 +4127,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMembershipBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMembershipBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4123,7 +4138,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteMembershipBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4155,7 +4170,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4170,7 +4185,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_membership_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_membership_binding`.
@@ -4182,7 +4197,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4219,8 +4234,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMembershipBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMembershipBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4230,8 +4245,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListMembershipBindings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4263,7 +4278,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4273,15 +4288,15 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_membership_bindings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListMembershipBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4290,17 +4305,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMembershipBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4332,8 +4347,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMembershipBindings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMembershipBindings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4343,7 +4358,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetMembershipRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4374,7 +4389,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4384,7 +4399,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_membership_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMembershipRBACRoleBindingRequest::name].
@@ -4397,8 +4412,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMembershipRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMembershipRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4408,7 +4423,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CreateMembershipRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4440,7 +4455,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4455,7 +4470,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .create_membership_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_membership_rbac_role_binding`.
@@ -4472,7 +4487,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4539,8 +4554,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMembershipRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMembershipRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4550,7 +4565,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::UpdateMembershipRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4582,7 +4597,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4597,7 +4612,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .update_membership_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_membership_rbac_role_binding`.
@@ -4614,7 +4629,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4687,8 +4702,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMembershipRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMembershipRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4698,7 +4713,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteMembershipRBACRoleBinding;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4730,7 +4745,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4745,7 +4760,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_membership_rbac_role_binding(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_membership_rbac_role_binding`.
@@ -4757,7 +4772,7 @@ pub mod gke_hub {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4794,8 +4809,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMembershipRBACRoleBinding {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMembershipRBACRoleBinding {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4805,8 +4820,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListMembershipRBACRoleBindings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4840,7 +4855,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4850,15 +4865,15 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_membership_rbac_role_bindings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListMembershipRBACRoleBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4867,17 +4882,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMembershipRBACRoleBindingsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4903,8 +4918,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMembershipRBACRoleBindings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMembershipRBACRoleBindings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4914,7 +4929,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GenerateMembershipRBACRoleBindingYAML;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4945,7 +4960,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4957,7 +4972,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .generate_membership_rbac_role_binding_yaml(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GenerateMembershipRBACRoleBindingYAMLRequest::parent].
@@ -5000,8 +5015,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateMembershipRBACRoleBindingYAML {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateMembershipRBACRoleBindingYAML {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5011,8 +5026,8 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5046,7 +5061,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5056,15 +5071,15 @@ pub mod gke_hub {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5073,17 +5088,17 @@ pub mod gke_hub {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5119,8 +5134,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5130,7 +5145,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5159,7 +5174,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5169,7 +5184,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5180,8 +5195,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5191,7 +5206,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5222,7 +5237,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5232,7 +5247,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5243,8 +5258,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5254,7 +5269,7 @@ pub mod gke_hub {
     /// # Example
     /// ```
     /// # use google_cloud_gkehub_v1::builder::gke_hub::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkehub_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5285,7 +5300,7 @@ pub mod gke_hub {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5295,7 +5310,7 @@ pub mod gke_hub {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5306,8 +5321,8 @@ pub mod gke_hub {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/gkehub/v1/src/client.rs b/src/generated/cloud/gkehub/v1/src/client.rs
index 0dc6cff143..edce4c8326 100644
--- a/src/generated/cloud/gkehub/v1/src/client.rs
+++ b/src/generated/cloud/gkehub/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkehub_v1::client::GkeHub;
 /// let client = GkeHub::builder().build().await?;
 /// // use `client` to make requests to the GKE Hub.
@@ -85,13 +85,13 @@ impl GkeHub {
     /// Returns a builder for [GkeHub].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkehub_v1::client::GkeHub;
     /// let client = GkeHub::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::gke_hub::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::gke_hub::client::Factory)
+        crate::new_client_builder(super::builder::gke_hub::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -109,14 +109,14 @@ impl GkeHub {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GkeHub>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GkeHub>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -125,13 +125,13 @@ impl GkeHub {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GkeHub> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GkeHub> {
         super::transport::GkeHub::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GkeHub> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GkeHub> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GkeHub::new)
diff --git a/src/generated/cloud/gkehub/v1/src/lib.rs b/src/generated/cloud/gkehub/v1/src/lib.rs
index c05878f543..7eff4bf830 100644
--- a/src/generated/cloud/gkehub/v1/src/lib.rs
+++ b/src/generated/cloud/gkehub/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/gkehub/v1/src/model.rs b/src/generated/cloud/gkehub/v1/src/model.rs
index 78f35ba4ec..e16778b12d 100644
--- a/src/generated/cloud/gkehub/v1/src/model.rs
+++ b/src/generated/cloud/gkehub/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_gkehub_configmanagement_v1;
 extern crate google_cloud_gkehub_multiclusteringress_v1;
 extern crate google_cloud_gkehub_rbacrolebindingactuation_v1;
@@ -6971,7 +6971,7 @@ impl wkt::message::Message for ListScopeNamespacesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListScopeNamespacesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListScopeNamespacesResponse {
     type PageItem = crate::model::Namespace;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7374,7 +7374,7 @@ impl wkt::message::Message for ListScopeRBACRoleBindingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListScopeRBACRoleBindingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListScopeRBACRoleBindingsResponse {
     type PageItem = crate::model::RBACRoleBinding;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7767,7 +7767,7 @@ impl wkt::message::Message for ListScopesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListScopesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListScopesResponse {
     type PageItem = crate::model::Scope;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7911,7 +7911,7 @@ impl wkt::message::Message for ListPermittedScopesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPermittedScopesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPermittedScopesResponse {
     type PageItem = crate::model::Scope;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8342,7 +8342,7 @@ impl wkt::message::Message for ListMembershipBindingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMembershipBindingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMembershipBindingsResponse {
     type PageItem = crate::model::MembershipBinding;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8886,7 +8886,9 @@ impl wkt::message::Message for ListMembershipRBACRoleBindingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMembershipRBACRoleBindingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListMembershipRBACRoleBindingsResponse
+{
     type PageItem = crate::model::RBACRoleBinding;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9116,7 +9118,7 @@ impl wkt::message::Message for ListMembershipsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMembershipsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMembershipsResponse {
     type PageItem = crate::model::Membership;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9334,7 +9336,7 @@ impl wkt::message::Message for ListBoundMembershipsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBoundMembershipsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBoundMembershipsResponse {
     type PageItem = crate::model::Membership;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10193,7 +10195,7 @@ impl wkt::message::Message for ListFeaturesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFeaturesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFeaturesResponse {
     type PageItem = crate::model::Feature;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10960,7 +10962,7 @@ impl wkt::message::Message for ListFleetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFleetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFleetsResponse {
     type PageItem = crate::model::Fleet;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/gkehub/v1/src/stub.rs b/src/generated/cloud/gkehub/v1/src/stub.rs
index 2b878a2bdb..519f17a4e4 100644
--- a/src/generated/cloud/gkehub/v1/src/stub.rs
+++ b/src/generated/cloud/gkehub/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_memberships(
         &self,
         _req: crate::model::ListMembershipsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMembershipsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMembershipsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_bound_memberships(
         &self,
         _req: crate::model::ListBoundMembershipsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBoundMembershipsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBoundMembershipsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_features(
         &self,
         _req: crate::model::ListFeaturesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFeaturesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +75,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_membership(
         &self,
         _req: crate::model::GetMembershipRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Membership>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Membership>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,10 +85,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_feature(
         &self,
         _req: crate::model::GetFeatureRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Feature>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Feature>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -97,9 +95,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_membership(
         &self,
         _req: crate::model::CreateMembershipRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +106,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_feature(
         &self,
         _req: crate::model::CreateFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +117,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_membership(
         &self,
         _req: crate::model::DeleteMembershipRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +128,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_feature(
         &self,
         _req: crate::model::DeleteFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +139,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_membership(
         &self,
         _req: crate::model::UpdateMembershipRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +150,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_feature(
         &self,
         _req: crate::model::UpdateFeatureRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,11 +161,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn generate_connect_manifest(
         &self,
         _req: crate::model::GenerateConnectManifestRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateConnectManifestResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateConnectManifestResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +172,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_fleet(
         &self,
         _req: crate::model::CreateFleetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,10 +183,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_fleet(
         &self,
         _req: crate::model::GetFleetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Fleet>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Fleet>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -198,9 +193,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_fleet(
         &self,
         _req: crate::model::UpdateFleetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -209,9 +204,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_fleet(
         &self,
         _req: crate::model::DeleteFleetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -220,9 +215,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_fleets(
         &self,
         _req: crate::model::ListFleetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFleetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFleetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -231,10 +226,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_scope_namespace(
         &self,
         _req: crate::model::GetScopeNamespaceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Namespace>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Namespace>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -242,9 +236,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_scope_namespace(
         &self,
         _req: crate::model::CreateScopeNamespaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +247,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_scope_namespace(
         &self,
         _req: crate::model::UpdateScopeNamespaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,9 +258,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_scope_namespace(
         &self,
         _req: crate::model::DeleteScopeNamespaceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -275,9 +269,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_scope_namespaces(
         &self,
         _req: crate::model::ListScopeNamespacesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListScopeNamespacesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListScopeNamespacesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -286,9 +280,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_scope_rbac_role_binding(
         &self,
         _req: crate::model::GetScopeRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RBACRoleBinding>>,
+        Output = crate::Result<crate::Response<crate::model::RBACRoleBinding>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -297,9 +291,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_scope_rbac_role_binding(
         &self,
         _req: crate::model::CreateScopeRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -308,9 +302,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_scope_rbac_role_binding(
         &self,
         _req: crate::model::UpdateScopeRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -319,9 +313,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_scope_rbac_role_binding(
         &self,
         _req: crate::model::DeleteScopeRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -330,11 +324,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_scope_rbac_role_bindings(
         &self,
         _req: crate::model::ListScopeRBACRoleBindingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListScopeRBACRoleBindingsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListScopeRBACRoleBindingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -343,10 +335,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_scope(
         &self,
         _req: crate::model::GetScopeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Scope>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Scope>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -354,9 +345,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_scope(
         &self,
         _req: crate::model::CreateScopeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -365,9 +356,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_scope(
         &self,
         _req: crate::model::UpdateScopeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -376,9 +367,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_scope(
         &self,
         _req: crate::model::DeleteScopeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -387,9 +378,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_scopes(
         &self,
         _req: crate::model::ListScopesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListScopesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListScopesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -398,9 +389,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_permitted_scopes(
         &self,
         _req: crate::model::ListPermittedScopesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPermittedScopesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPermittedScopesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,9 +400,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_membership_binding(
         &self,
         _req: crate::model::GetMembershipBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MembershipBinding>>,
+        Output = crate::Result<crate::Response<crate::model::MembershipBinding>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -420,9 +411,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_membership_binding(
         &self,
         _req: crate::model::CreateMembershipBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -431,9 +422,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_membership_binding(
         &self,
         _req: crate::model::UpdateMembershipBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -442,9 +433,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_membership_binding(
         &self,
         _req: crate::model::DeleteMembershipBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -453,11 +444,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_membership_bindings(
         &self,
         _req: crate::model::ListMembershipBindingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListMembershipBindingsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListMembershipBindingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -466,9 +455,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_membership_rbac_role_binding(
         &self,
         _req: crate::model::GetMembershipRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RBACRoleBinding>>,
+        Output = crate::Result<crate::Response<crate::model::RBACRoleBinding>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -477,9 +466,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn create_membership_rbac_role_binding(
         &self,
         _req: crate::model::CreateMembershipRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -488,9 +477,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn update_membership_rbac_role_binding(
         &self,
         _req: crate::model::UpdateMembershipRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -499,9 +488,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_membership_rbac_role_binding(
         &self,
         _req: crate::model::DeleteMembershipRBACRoleBindingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -510,10 +499,10 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_membership_rbac_role_bindings(
         &self,
         _req: crate::model::ListMembershipRBACRoleBindingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListMembershipRBACRoleBindingsResponse>,
+            crate::Response<crate::model::ListMembershipRBACRoleBindingsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -523,10 +512,10 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn generate_membership_rbac_role_binding_yaml(
         &self,
         _req: crate::model::GenerateMembershipRBACRoleBindingYAMLRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>,
+            crate::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -536,10 +525,10 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -549,9 +538,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -560,8 +549,8 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -569,8 +558,8 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -580,9 +569,9 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -591,8 +580,8 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/gkehub/v1/src/stub/dynamic.rs b/src/generated/cloud/gkehub/v1/src/stub/dynamic.rs
index 4911e82108..4c00bc897a 100644
--- a/src/generated/cloud/gkehub/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/gkehub/v1/src/stub/dynamic.rs
@@ -20,304 +20,300 @@ pub trait GkeHub: std::fmt::Debug + Send + Sync {
     async fn list_memberships(
         &self,
         req: crate::model::ListMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMembershipsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMembershipsResponse>>;
 
     async fn list_bound_memberships(
         &self,
         req: crate::model::ListBoundMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBoundMembershipsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBoundMembershipsResponse>>;
 
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturesResponse>>;
 
     async fn get_membership(
         &self,
         req: crate::model::GetMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Membership>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Membership>>;
 
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>>;
 
     async fn create_membership(
         &self,
         req: crate::model::CreateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_membership(
         &self,
         req: crate::model::DeleteMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_membership(
         &self,
         req: crate::model::UpdateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_connect_manifest(
         &self,
         req: crate::model::GenerateConnectManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateConnectManifestResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateConnectManifestResponse>>;
 
     async fn create_fleet(
         &self,
         req: crate::model::CreateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_fleet(
         &self,
         req: crate::model::GetFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Fleet>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Fleet>>;
 
     async fn update_fleet(
         &self,
         req: crate::model::UpdateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_fleet(
         &self,
         req: crate::model::DeleteFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_fleets(
         &self,
         req: crate::model::ListFleetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFleetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFleetsResponse>>;
 
     async fn get_scope_namespace(
         &self,
         req: crate::model::GetScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Namespace>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Namespace>>;
 
     async fn create_scope_namespace(
         &self,
         req: crate::model::CreateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_scope_namespace(
         &self,
         req: crate::model::UpdateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_scope_namespace(
         &self,
         req: crate::model::DeleteScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_scope_namespaces(
         &self,
         req: crate::model::ListScopeNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListScopeNamespacesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListScopeNamespacesResponse>>;
 
     async fn get_scope_rbac_role_binding(
         &self,
         req: crate::model::GetScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RBACRoleBinding>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RBACRoleBinding>>;
 
     async fn create_scope_rbac_role_binding(
         &self,
         req: crate::model::CreateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_scope_rbac_role_binding(
         &self,
         req: crate::model::UpdateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_scope_rbac_role_binding(
         &self,
         req: crate::model::DeleteScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_scope_rbac_role_bindings(
         &self,
         req: crate::model::ListScopeRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListScopeRBACRoleBindingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListScopeRBACRoleBindingsResponse>>;
 
     async fn get_scope(
         &self,
         req: crate::model::GetScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Scope>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Scope>>;
 
     async fn create_scope(
         &self,
         req: crate::model::CreateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_scope(
         &self,
         req: crate::model::UpdateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_scope(
         &self,
         req: crate::model::DeleteScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_scopes(
         &self,
         req: crate::model::ListScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListScopesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListScopesResponse>>;
 
     async fn list_permitted_scopes(
         &self,
         req: crate::model::ListPermittedScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPermittedScopesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPermittedScopesResponse>>;
 
     async fn get_membership_binding(
         &self,
         req: crate::model::GetMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MembershipBinding>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MembershipBinding>>;
 
     async fn create_membership_binding(
         &self,
         req: crate::model::CreateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_membership_binding(
         &self,
         req: crate::model::UpdateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_membership_binding(
         &self,
         req: crate::model::DeleteMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_membership_bindings(
         &self,
         req: crate::model::ListMembershipBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMembershipBindingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMembershipBindingsResponse>>;
 
     async fn get_membership_rbac_role_binding(
         &self,
         req: crate::model::GetMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RBACRoleBinding>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RBACRoleBinding>>;
 
     async fn create_membership_rbac_role_binding(
         &self,
         req: crate::model::CreateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_membership_rbac_role_binding(
         &self,
         req: crate::model::UpdateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_membership_rbac_role_binding(
         &self,
         req: crate::model::DeleteMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_membership_rbac_role_bindings(
         &self,
         req: crate::model::ListMembershipRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMembershipRBACRoleBindingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMembershipRBACRoleBindingsResponse>>;
 
     async fn generate_membership_rbac_role_binding_yaml(
         &self,
         req: crate::model::GenerateMembershipRBACRoleBindingYAMLRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::GkeHub] also implement [GkeHub].
@@ -327,8 +323,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_memberships(
         &self,
         req: crate::model::ListMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMembershipsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMembershipsResponse>> {
         T::list_memberships(self, req, options).await
     }
 
@@ -336,8 +332,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_bound_memberships(
         &self,
         req: crate::model::ListBoundMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBoundMembershipsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBoundMembershipsResponse>> {
         T::list_bound_memberships(self, req, options).await
     }
 
@@ -345,8 +341,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFeaturesResponse>> {
         T::list_features(self, req, options).await
     }
 
@@ -354,8 +350,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_membership(
         &self,
         req: crate::model::GetMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Membership>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Membership>> {
         T::get_membership(self, req, options).await
     }
 
@@ -363,8 +359,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Feature>> {
         T::get_feature(self, req, options).await
     }
 
@@ -372,8 +368,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_membership(
         &self,
         req: crate::model::CreateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_membership(self, req, options).await
     }
 
@@ -381,8 +377,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_feature(self, req, options).await
     }
 
@@ -390,8 +386,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_membership(
         &self,
         req: crate::model::DeleteMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_membership(self, req, options).await
     }
 
@@ -399,8 +395,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_feature(self, req, options).await
     }
 
@@ -408,8 +404,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_membership(
         &self,
         req: crate::model::UpdateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_membership(self, req, options).await
     }
 
@@ -417,8 +413,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_feature(self, req, options).await
     }
 
@@ -426,8 +422,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn generate_connect_manifest(
         &self,
         req: crate::model::GenerateConnectManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateConnectManifestResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateConnectManifestResponse>> {
         T::generate_connect_manifest(self, req, options).await
     }
 
@@ -435,8 +431,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_fleet(
         &self,
         req: crate::model::CreateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_fleet(self, req, options).await
     }
 
@@ -444,8 +440,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_fleet(
         &self,
         req: crate::model::GetFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Fleet>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Fleet>> {
         T::get_fleet(self, req, options).await
     }
 
@@ -453,8 +449,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_fleet(
         &self,
         req: crate::model::UpdateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_fleet(self, req, options).await
     }
 
@@ -462,8 +458,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_fleet(
         &self,
         req: crate::model::DeleteFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_fleet(self, req, options).await
     }
 
@@ -471,8 +467,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_fleets(
         &self,
         req: crate::model::ListFleetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFleetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFleetsResponse>> {
         T::list_fleets(self, req, options).await
     }
 
@@ -480,8 +476,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_scope_namespace(
         &self,
         req: crate::model::GetScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Namespace>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Namespace>> {
         T::get_scope_namespace(self, req, options).await
     }
 
@@ -489,8 +485,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_scope_namespace(
         &self,
         req: crate::model::CreateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_scope_namespace(self, req, options).await
     }
 
@@ -498,8 +494,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_scope_namespace(
         &self,
         req: crate::model::UpdateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_scope_namespace(self, req, options).await
     }
 
@@ -507,8 +503,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_scope_namespace(
         &self,
         req: crate::model::DeleteScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_scope_namespace(self, req, options).await
     }
 
@@ -516,8 +512,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_scope_namespaces(
         &self,
         req: crate::model::ListScopeNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListScopeNamespacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListScopeNamespacesResponse>> {
         T::list_scope_namespaces(self, req, options).await
     }
 
@@ -525,8 +521,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_scope_rbac_role_binding(
         &self,
         req: crate::model::GetScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RBACRoleBinding>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RBACRoleBinding>> {
         T::get_scope_rbac_role_binding(self, req, options).await
     }
 
@@ -534,8 +530,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_scope_rbac_role_binding(
         &self,
         req: crate::model::CreateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_scope_rbac_role_binding(self, req, options).await
     }
 
@@ -543,8 +539,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_scope_rbac_role_binding(
         &self,
         req: crate::model::UpdateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_scope_rbac_role_binding(self, req, options).await
     }
 
@@ -552,8 +548,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_scope_rbac_role_binding(
         &self,
         req: crate::model::DeleteScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_scope_rbac_role_binding(self, req, options).await
     }
 
@@ -561,9 +557,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_scope_rbac_role_bindings(
         &self,
         req: crate::model::ListScopeRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListScopeRBACRoleBindingsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListScopeRBACRoleBindingsResponse>> {
         T::list_scope_rbac_role_bindings(self, req, options).await
     }
 
@@ -571,8 +566,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_scope(
         &self,
         req: crate::model::GetScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Scope>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Scope>> {
         T::get_scope(self, req, options).await
     }
 
@@ -580,8 +575,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_scope(
         &self,
         req: crate::model::CreateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_scope(self, req, options).await
     }
 
@@ -589,8 +584,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_scope(
         &self,
         req: crate::model::UpdateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_scope(self, req, options).await
     }
 
@@ -598,8 +593,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_scope(
         &self,
         req: crate::model::DeleteScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_scope(self, req, options).await
     }
 
@@ -607,8 +602,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_scopes(
         &self,
         req: crate::model::ListScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListScopesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListScopesResponse>> {
         T::list_scopes(self, req, options).await
     }
 
@@ -616,8 +611,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_permitted_scopes(
         &self,
         req: crate::model::ListPermittedScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPermittedScopesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPermittedScopesResponse>> {
         T::list_permitted_scopes(self, req, options).await
     }
 
@@ -625,8 +620,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_membership_binding(
         &self,
         req: crate::model::GetMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MembershipBinding>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MembershipBinding>> {
         T::get_membership_binding(self, req, options).await
     }
 
@@ -634,8 +629,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_membership_binding(
         &self,
         req: crate::model::CreateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_membership_binding(self, req, options).await
     }
 
@@ -643,8 +638,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_membership_binding(
         &self,
         req: crate::model::UpdateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_membership_binding(self, req, options).await
     }
 
@@ -652,8 +647,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_membership_binding(
         &self,
         req: crate::model::DeleteMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_membership_binding(self, req, options).await
     }
 
@@ -661,8 +656,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_membership_bindings(
         &self,
         req: crate::model::ListMembershipBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMembershipBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMembershipBindingsResponse>> {
         T::list_membership_bindings(self, req, options).await
     }
 
@@ -670,8 +665,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_membership_rbac_role_binding(
         &self,
         req: crate::model::GetMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RBACRoleBinding>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RBACRoleBinding>> {
         T::get_membership_rbac_role_binding(self, req, options).await
     }
 
@@ -679,8 +674,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn create_membership_rbac_role_binding(
         &self,
         req: crate::model::CreateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_membership_rbac_role_binding(self, req, options).await
     }
 
@@ -688,8 +683,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn update_membership_rbac_role_binding(
         &self,
         req: crate::model::UpdateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_membership_rbac_role_binding(self, req, options).await
     }
 
@@ -697,8 +692,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_membership_rbac_role_binding(
         &self,
         req: crate::model::DeleteMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_membership_rbac_role_binding(self, req, options).await
     }
 
@@ -706,9 +701,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_membership_rbac_role_bindings(
         &self,
         req: crate::model::ListMembershipRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMembershipRBACRoleBindingsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMembershipRBACRoleBindingsResponse>> {
         T::list_membership_rbac_role_bindings(self, req, options).await
     }
 
@@ -716,10 +710,9 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn generate_membership_rbac_role_binding_yaml(
         &self,
         req: crate::model::GenerateMembershipRBACRoleBindingYAMLRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>>
+    {
         T::generate_membership_rbac_role_binding_yaml(self, req, options).await
     }
 
@@ -727,10 +720,9 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -738,8 +730,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -747,8 +739,8 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -756,22 +748,22 @@ impl<T: super::GkeHub> GkeHub for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/gkehub/v1/src/tracing.rs b/src/generated/cloud/gkehub/v1/src/tracing.rs
index 099ff447aa..3de224fa6c 100644
--- a/src/generated/cloud/gkehub/v1/src/tracing.rs
+++ b/src/generated/cloud/gkehub/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_memberships(
         &self,
         req: crate::model::ListMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMembershipsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMembershipsResponse>> {
         self.inner.list_memberships(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_bound_memberships(
         &self,
         req: crate::model::ListBoundMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBoundMembershipsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBoundMembershipsResponse>> {
         self.inner.list_bound_memberships(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturesResponse>> {
         self.inner.list_features(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_membership(
         &self,
         req: crate::model::GetMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Membership>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Membership>> {
         self.inner.get_membership(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         self.inner.get_feature(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn create_membership(
         &self,
         req: crate::model::CreateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_membership(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_feature(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn delete_membership(
         &self,
         req: crate::model::DeleteMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_membership(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_feature(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn update_membership(
         &self,
         req: crate::model::UpdateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_membership(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_feature(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn generate_connect_manifest(
         &self,
         req: crate::model::GenerateConnectManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateConnectManifestResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateConnectManifestResponse>> {
         self.inner.generate_connect_manifest(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn create_fleet(
         &self,
         req: crate::model::CreateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_fleet(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn get_fleet(
         &self,
         req: crate::model::GetFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Fleet>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Fleet>> {
         self.inner.get_fleet(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn update_fleet(
         &self,
         req: crate::model::UpdateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_fleet(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn delete_fleet(
         &self,
         req: crate::model::DeleteFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_fleet(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn list_fleets(
         &self,
         req: crate::model::ListFleetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFleetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFleetsResponse>> {
         self.inner.list_fleets(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn get_scope_namespace(
         &self,
         req: crate::model::GetScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Namespace>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Namespace>> {
         self.inner.get_scope_namespace(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn create_scope_namespace(
         &self,
         req: crate::model::CreateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_scope_namespace(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn update_scope_namespace(
         &self,
         req: crate::model::UpdateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_scope_namespace(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn delete_scope_namespace(
         &self,
         req: crate::model::DeleteScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_scope_namespace(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn list_scope_namespaces(
         &self,
         req: crate::model::ListScopeNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListScopeNamespacesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListScopeNamespacesResponse>> {
         self.inner.list_scope_namespaces(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn get_scope_rbac_role_binding(
         &self,
         req: crate::model::GetScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RBACRoleBinding>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RBACRoleBinding>> {
         self.inner.get_scope_rbac_role_binding(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn create_scope_rbac_role_binding(
         &self,
         req: crate::model::CreateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_scope_rbac_role_binding(req, options)
             .await
@@ -259,8 +259,8 @@ where
     async fn update_scope_rbac_role_binding(
         &self,
         req: crate::model::UpdateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_scope_rbac_role_binding(req, options)
             .await
@@ -270,8 +270,8 @@ where
     async fn delete_scope_rbac_role_binding(
         &self,
         req: crate::model::DeleteScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_scope_rbac_role_binding(req, options)
             .await
@@ -281,8 +281,8 @@ where
     async fn list_scope_rbac_role_bindings(
         &self,
         req: crate::model::ListScopeRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListScopeRBACRoleBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListScopeRBACRoleBindingsResponse>> {
         self.inner.list_scope_rbac_role_bindings(req, options).await
     }
 
@@ -290,8 +290,8 @@ where
     async fn get_scope(
         &self,
         req: crate::model::GetScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Scope>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Scope>> {
         self.inner.get_scope(req, options).await
     }
 
@@ -299,8 +299,8 @@ where
     async fn create_scope(
         &self,
         req: crate::model::CreateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_scope(req, options).await
     }
 
@@ -308,8 +308,8 @@ where
     async fn update_scope(
         &self,
         req: crate::model::UpdateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_scope(req, options).await
     }
 
@@ -317,8 +317,8 @@ where
     async fn delete_scope(
         &self,
         req: crate::model::DeleteScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_scope(req, options).await
     }
 
@@ -326,8 +326,8 @@ where
     async fn list_scopes(
         &self,
         req: crate::model::ListScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListScopesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListScopesResponse>> {
         self.inner.list_scopes(req, options).await
     }
 
@@ -335,8 +335,8 @@ where
     async fn list_permitted_scopes(
         &self,
         req: crate::model::ListPermittedScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPermittedScopesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPermittedScopesResponse>> {
         self.inner.list_permitted_scopes(req, options).await
     }
 
@@ -344,8 +344,8 @@ where
     async fn get_membership_binding(
         &self,
         req: crate::model::GetMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MembershipBinding>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MembershipBinding>> {
         self.inner.get_membership_binding(req, options).await
     }
 
@@ -353,8 +353,8 @@ where
     async fn create_membership_binding(
         &self,
         req: crate::model::CreateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_membership_binding(req, options).await
     }
 
@@ -362,8 +362,8 @@ where
     async fn update_membership_binding(
         &self,
         req: crate::model::UpdateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_membership_binding(req, options).await
     }
 
@@ -371,8 +371,8 @@ where
     async fn delete_membership_binding(
         &self,
         req: crate::model::DeleteMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_membership_binding(req, options).await
     }
 
@@ -380,8 +380,8 @@ where
     async fn list_membership_bindings(
         &self,
         req: crate::model::ListMembershipBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMembershipBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMembershipBindingsResponse>> {
         self.inner.list_membership_bindings(req, options).await
     }
 
@@ -389,8 +389,8 @@ where
     async fn get_membership_rbac_role_binding(
         &self,
         req: crate::model::GetMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RBACRoleBinding>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RBACRoleBinding>> {
         self.inner
             .get_membership_rbac_role_binding(req, options)
             .await
@@ -400,8 +400,8 @@ where
     async fn create_membership_rbac_role_binding(
         &self,
         req: crate::model::CreateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_membership_rbac_role_binding(req, options)
             .await
@@ -411,8 +411,8 @@ where
     async fn update_membership_rbac_role_binding(
         &self,
         req: crate::model::UpdateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_membership_rbac_role_binding(req, options)
             .await
@@ -422,8 +422,8 @@ where
     async fn delete_membership_rbac_role_binding(
         &self,
         req: crate::model::DeleteMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_membership_rbac_role_binding(req, options)
             .await
@@ -433,8 +433,8 @@ where
     async fn list_membership_rbac_role_bindings(
         &self,
         req: crate::model::ListMembershipRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMembershipRBACRoleBindingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMembershipRBACRoleBindingsResponse>> {
         self.inner
             .list_membership_rbac_role_bindings(req, options)
             .await
@@ -444,9 +444,8 @@ where
     async fn generate_membership_rbac_role_binding_yaml(
         &self,
         req: crate::model::GenerateMembershipRBACRoleBindingYAMLRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>> {
         self.inner
             .generate_membership_rbac_role_binding_yaml(req, options)
             .await
@@ -456,9 +455,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -466,8 +464,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -475,8 +473,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -484,22 +482,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkehub/v1/src/transport.rs b/src/generated/cloud/gkehub/v1/src/transport.rs
index d374383f83..e9913ea25b 100644
--- a/src/generated/cloud/gkehub/v1/src/transport.rs
+++ b/src/generated/cloud/gkehub/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [GkeHub](super::stub::GkeHub) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for GkeHub {
 }
 
 impl GkeHub {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_memberships(
         &self,
         req: crate::model::ListMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMembershipsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMembershipsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_bound_memberships(
         &self,
         req: crate::model::ListBoundMembershipsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBoundMembershipsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBoundMembershipsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -157,9 +157,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -174,13 +174,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_features(
         &self,
         req: crate::model::ListFeaturesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFeaturesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFeaturesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -223,9 +223,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -240,13 +240,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_membership(
         &self,
         req: crate::model::GetMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Membership>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Membership>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -287,9 +287,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -304,13 +304,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_feature(
         &self,
         req: crate::model::GetFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Feature>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Feature>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -353,9 +353,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -370,13 +370,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_membership(
         &self,
         req: crate::model::CreateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -415,9 +415,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -432,13 +432,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_feature(
         &self,
         req: crate::model::CreateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -477,9 +477,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -494,13 +494,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_membership(
         &self,
         req: crate::model::DeleteMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -543,9 +543,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -560,13 +560,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_feature(
         &self,
         req: crate::model::DeleteFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -609,9 +609,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -626,13 +626,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_membership(
         &self,
         req: crate::model::UpdateMembershipRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -686,9 +686,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -703,13 +703,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_feature(
         &self,
         req: crate::model::UpdateFeatureRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -763,9 +763,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -780,13 +780,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn generate_connect_manifest(
         &self,
         req: crate::model::GenerateConnectManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateConnectManifestResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateConnectManifestResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -834,9 +834,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -851,13 +851,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_fleet(
         &self,
         req: crate::model::CreateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -894,9 +894,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -911,13 +911,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_fleet(
         &self,
         req: crate::model::GetFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Fleet>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Fleet>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -958,9 +958,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -975,13 +975,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_fleet(
         &self,
         req: crate::model::UpdateFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1040,9 +1040,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1057,13 +1057,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_fleet(
         &self,
         req: crate::model::DeleteFleetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1104,9 +1104,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1121,13 +1121,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_fleets(
         &self,
         req: crate::model::ListFleetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFleetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFleetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1201,9 +1201,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1218,13 +1218,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_scope_namespace(
         &self,
         req: crate::model::GetScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Namespace>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Namespace>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1269,9 +1269,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1286,13 +1286,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_scope_namespace(
         &self,
         req: crate::model::CreateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1334,9 +1334,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1351,13 +1351,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_scope_namespace(
         &self,
         req: crate::model::UpdateScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1420,9 +1420,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1437,13 +1437,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_scope_namespace(
         &self,
         req: crate::model::DeleteScopeNamespaceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1488,9 +1488,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1505,13 +1505,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_scope_namespaces(
         &self,
         req: crate::model::ListScopeNamespacesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListScopeNamespacesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListScopeNamespacesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1554,9 +1554,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1571,13 +1571,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_scope_rbac_role_binding(
         &self,
         req: crate::model::GetScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RBACRoleBinding>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RBACRoleBinding>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1622,9 +1622,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1639,13 +1639,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_scope_rbac_role_binding(
         &self,
         req: crate::model::CreateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1687,9 +1687,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1704,13 +1704,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_scope_rbac_role_binding(
         &self,
         req: crate::model::UpdateScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1773,9 +1773,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1790,13 +1790,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_scope_rbac_role_binding(
         &self,
         req: crate::model::DeleteScopeRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1841,9 +1841,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1858,13 +1858,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_scope_rbac_role_bindings(
         &self,
         req: crate::model::ListScopeRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListScopeRBACRoleBindingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListScopeRBACRoleBindingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1907,9 +1907,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1924,13 +1924,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_scope(
         &self,
         req: crate::model::GetScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Scope>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Scope>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1971,9 +1971,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1988,13 +1988,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_scope(
         &self,
         req: crate::model::CreateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2032,9 +2032,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2049,13 +2049,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_scope(
         &self,
         req: crate::model::UpdateScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2114,9 +2114,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2131,13 +2131,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_scope(
         &self,
         req: crate::model::DeleteScopeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2178,9 +2178,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2195,13 +2195,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_scopes(
         &self,
         req: crate::model::ListScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListScopesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListScopesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2240,9 +2240,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2257,13 +2257,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_permitted_scopes(
         &self,
         req: crate::model::ListPermittedScopesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPermittedScopesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPermittedScopesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2302,9 +2302,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2319,13 +2319,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_membership_binding(
         &self,
         req: crate::model::GetMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MembershipBinding>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MembershipBinding>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2370,9 +2370,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2387,13 +2387,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_membership_binding(
         &self,
         req: crate::model::CreateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2435,9 +2435,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2452,13 +2452,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_membership_binding(
         &self,
         req: crate::model::UpdateMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2521,9 +2521,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2538,13 +2538,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_membership_binding(
         &self,
         req: crate::model::DeleteMembershipBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2589,9 +2589,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2606,13 +2606,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_membership_bindings(
         &self,
         req: crate::model::ListMembershipBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMembershipBindingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMembershipBindingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2656,9 +2656,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2673,13 +2673,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_membership_rbac_role_binding(
         &self,
         req: crate::model::GetMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RBACRoleBinding>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RBACRoleBinding>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2724,9 +2724,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2741,13 +2741,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn create_membership_rbac_role_binding(
         &self,
         req: crate::model::CreateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2789,9 +2789,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2806,13 +2806,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn update_membership_rbac_role_binding(
         &self,
         req: crate::model::UpdateMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2875,9 +2875,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2892,13 +2892,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_membership_rbac_role_binding(
         &self,
         req: crate::model::DeleteMembershipRBACRoleBindingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2943,9 +2943,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2960,13 +2960,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_membership_rbac_role_bindings(
         &self,
         req: crate::model::ListMembershipRBACRoleBindingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMembershipRBACRoleBindingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMembershipRBACRoleBindingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3009,9 +3009,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3026,14 +3026,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn generate_membership_rbac_role_binding_yaml(
         &self,
         req: crate::model::GenerateMembershipRBACRoleBindingYAMLRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateMembershipRBACRoleBindingYAMLResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3075,9 +3074,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3092,14 +3091,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3141,9 +3139,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3158,13 +3156,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3205,9 +3203,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3222,13 +3220,13 @@ impl super::stub::GkeHub for GkeHub {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3269,9 +3267,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3280,24 +3278,25 @@ impl super::stub::GkeHub for GkeHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3338,9 +3337,9 @@ impl super::stub::GkeHub for GkeHub {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3349,25 +3348,26 @@ impl super::stub::GkeHub for GkeHub {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkemulticloud/v1/Cargo.toml b/src/generated/cloud/gkemulticloud/v1/Cargo.toml
index 93afdd275a..f5309c28b5 100644
--- a/src/generated/cloud/gkemulticloud/v1/Cargo.toml
+++ b/src/generated/cloud/gkemulticloud/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 google-cloud-type.workspace        = true
diff --git a/src/generated/cloud/gkemulticloud/v1/src/builder.rs b/src/generated/cloud/gkemulticloud/v1/src/builder.rs
index 7d96c62c9d..367b6d14b9 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/builder.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod attached_clusters {
     /// A builder for [AttachedClusters][crate::client::AttachedClusters].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkemulticloud_v1::*;
     /// # use builder::attached_clusters::ClientBuilder;
     /// # use client::AttachedClusters;
@@ -30,19 +30,18 @@ pub mod attached_clusters {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AttachedClusters;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AttachedClusters;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod attached_clusters {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AttachedClusters>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod attached_clusters {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::CreateAttachedCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -108,7 +107,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123,7 +122,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .create_attached_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_attached_cluster`.
@@ -140,7 +139,7 @@ pub mod attached_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -213,8 +212,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAttachedCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAttachedCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -224,7 +223,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::UpdateAttachedCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -256,7 +255,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -271,7 +270,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .update_attached_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_attached_cluster`.
@@ -288,7 +287,7 @@ pub mod attached_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -367,8 +366,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAttachedCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAttachedCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -378,7 +377,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::ImportAttachedCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -410,7 +409,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -425,7 +424,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .import_attached_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_attached_cluster`.
@@ -442,7 +441,7 @@ pub mod attached_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -527,8 +526,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportAttachedCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportAttachedCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -538,7 +537,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::GetAttachedCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -569,7 +568,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -579,7 +578,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .get_attached_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAttachedClusterRequest::name].
@@ -592,8 +591,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAttachedCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAttachedCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -603,8 +602,8 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::ListAttachedClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -638,7 +637,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -648,14 +647,16 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .list_attached_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAttachedClustersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAttachedClustersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -663,17 +664,17 @@ pub mod attached_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAttachedClustersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -699,8 +700,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAttachedClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAttachedClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -710,7 +711,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::DeleteAttachedCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -742,7 +743,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -757,7 +758,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .delete_attached_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_attached_cluster`.
@@ -769,7 +770,7 @@ pub mod attached_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -830,8 +831,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAttachedCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAttachedCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -841,7 +842,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::GetAttachedServerConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -874,7 +875,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -884,7 +885,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .get_attached_server_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAttachedServerConfigRequest::name].
@@ -897,8 +898,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAttachedServerConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAttachedServerConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -908,7 +909,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::GenerateAttachedClusterInstallManifest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -943,7 +944,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -955,7 +956,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .generate_attached_cluster_install_manifest(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::GenerateAttachedClusterInstallManifestRequest::parent].
@@ -1002,8 +1003,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAttachedClusterInstallManifest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAttachedClusterInstallManifest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1013,7 +1014,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::GenerateAttachedClusterAgentToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1046,7 +1047,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1056,7 +1057,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .generate_attached_cluster_agent_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [attached_cluster][crate::model::GenerateAttachedClusterAgentTokenRequest::attached_cluster].
@@ -1123,8 +1124,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAttachedClusterAgentToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAttachedClusterAgentToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1134,8 +1135,8 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1171,7 +1172,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1181,15 +1182,15 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1198,17 +1199,17 @@ pub mod attached_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1244,8 +1245,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1255,7 +1256,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1286,7 +1287,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1296,7 +1297,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1307,8 +1308,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1318,7 +1319,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1351,7 +1352,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1361,7 +1362,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1372,8 +1373,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1383,7 +1384,7 @@ pub mod attached_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::attached_clusters::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1416,7 +1417,7 @@ pub mod attached_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1426,7 +1427,7 @@ pub mod attached_clusters {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1437,8 +1438,8 @@ pub mod attached_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1450,7 +1451,7 @@ pub mod aws_clusters {
     /// A builder for [AwsClusters][crate::client::AwsClusters].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkemulticloud_v1::*;
     /// # use builder::aws_clusters::ClientBuilder;
     /// # use client::AwsClusters;
@@ -1460,19 +1461,18 @@ pub mod aws_clusters {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AwsClusters;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AwsClusters;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1483,7 +1483,7 @@ pub mod aws_clusters {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AwsClusters>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1496,7 +1496,7 @@ pub mod aws_clusters {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1506,7 +1506,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::CreateAwsCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1538,7 +1538,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1553,7 +1553,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .create_aws_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_aws_cluster`.
@@ -1570,7 +1570,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1643,8 +1643,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAwsCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAwsCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1654,7 +1654,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::UpdateAwsCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1686,7 +1686,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1701,7 +1701,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .update_aws_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_aws_cluster`.
@@ -1718,7 +1718,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1797,8 +1797,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAwsCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAwsCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1808,7 +1808,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GetAwsCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1836,7 +1836,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1846,7 +1846,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .get_aws_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAwsClusterRequest::name].
@@ -1859,8 +1859,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAwsCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAwsCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1870,8 +1870,8 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::ListAwsClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1902,7 +1902,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1912,14 +1912,16 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .list_aws_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAwsClustersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAwsClustersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1927,15 +1929,17 @@ pub mod aws_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAwsClustersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAwsClustersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1961,8 +1965,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAwsClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAwsClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1972,7 +1976,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::DeleteAwsCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2004,7 +2008,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2019,7 +2023,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .delete_aws_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_aws_cluster`.
@@ -2031,7 +2035,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2092,8 +2096,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAwsCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAwsCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2103,7 +2107,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GenerateAwsClusterAgentToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2136,7 +2140,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2146,7 +2150,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .generate_aws_cluster_agent_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [aws_cluster][crate::model::GenerateAwsClusterAgentTokenRequest::aws_cluster].
@@ -2219,8 +2223,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAwsClusterAgentToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAwsClusterAgentToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2230,7 +2234,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GenerateAwsAccessToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2261,7 +2265,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2271,7 +2275,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .generate_aws_access_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [aws_cluster][crate::model::GenerateAwsAccessTokenRequest::aws_cluster].
@@ -2284,8 +2288,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAwsAccessToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAwsAccessToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2295,7 +2299,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::CreateAwsNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2327,7 +2331,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2342,7 +2346,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .create_aws_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_aws_node_pool`.
@@ -2359,7 +2363,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2432,8 +2436,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAwsNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAwsNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2443,7 +2447,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::UpdateAwsNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2475,7 +2479,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2490,7 +2494,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .update_aws_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_aws_node_pool`.
@@ -2507,7 +2511,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2586,8 +2590,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAwsNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAwsNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2597,7 +2601,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::RollbackAwsNodePoolUpdate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2631,7 +2635,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2646,7 +2650,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .rollback_aws_node_pool_update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `rollback_aws_node_pool_update`.
@@ -2663,7 +2667,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2706,8 +2710,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RollbackAwsNodePoolUpdate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RollbackAwsNodePoolUpdate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2717,7 +2721,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GetAwsNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2745,7 +2749,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2755,7 +2759,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .get_aws_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAwsNodePoolRequest::name].
@@ -2768,8 +2772,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAwsNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAwsNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2779,8 +2783,8 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::ListAwsNodePools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2814,7 +2818,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2824,14 +2828,16 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .list_aws_node_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAwsNodePoolsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAwsNodePoolsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2839,15 +2845,17 @@ pub mod aws_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAwsNodePoolsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAwsNodePoolsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2873,8 +2881,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAwsNodePools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAwsNodePools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2884,7 +2892,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::DeleteAwsNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2916,7 +2924,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2931,7 +2939,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .delete_aws_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_aws_node_pool`.
@@ -2943,7 +2951,7 @@ pub mod aws_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3004,8 +3012,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAwsNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAwsNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3015,7 +3023,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GetAwsOpenIdConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3046,7 +3054,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3056,7 +3064,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .get_aws_open_id_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [aws_cluster][crate::model::GetAwsOpenIdConfigRequest::aws_cluster].
@@ -3069,8 +3077,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAwsOpenIdConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAwsOpenIdConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3080,7 +3088,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GetAwsJsonWebKeys;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3111,7 +3119,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3121,7 +3129,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .get_aws_json_web_keys(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [aws_cluster][crate::model::GetAwsJsonWebKeysRequest::aws_cluster].
@@ -3134,8 +3142,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAwsJsonWebKeys {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAwsJsonWebKeys {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3145,7 +3153,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GetAwsServerConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3176,7 +3184,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3186,7 +3194,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .get_aws_server_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAwsServerConfigRequest::name].
@@ -3199,8 +3207,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAwsServerConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAwsServerConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3210,8 +3218,8 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3247,7 +3255,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3257,15 +3265,15 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3274,17 +3282,17 @@ pub mod aws_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3320,8 +3328,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3331,7 +3339,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3362,7 +3370,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3372,7 +3380,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -3383,8 +3391,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3394,7 +3402,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3427,7 +3435,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3437,7 +3445,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -3448,8 +3456,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3459,7 +3467,7 @@ pub mod aws_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::aws_clusters::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3492,7 +3500,7 @@ pub mod aws_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3502,7 +3510,7 @@ pub mod aws_clusters {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3513,8 +3521,8 @@ pub mod aws_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3526,7 +3534,7 @@ pub mod azure_clusters {
     /// A builder for [AzureClusters][crate::client::AzureClusters].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkemulticloud_v1::*;
     /// # use builder::azure_clusters::ClientBuilder;
     /// # use client::AzureClusters;
@@ -3536,19 +3544,18 @@ pub mod azure_clusters {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AzureClusters;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AzureClusters;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3559,7 +3566,7 @@ pub mod azure_clusters {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AzureClusters>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3572,7 +3579,7 @@ pub mod azure_clusters {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3582,7 +3589,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::CreateAzureClient;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3614,7 +3621,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3629,7 +3636,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .create_azure_client(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_azure_client`.
@@ -3646,7 +3653,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3719,8 +3726,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAzureClient {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAzureClient {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3730,7 +3737,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetAzureClient;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3758,7 +3765,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3768,7 +3775,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_azure_client(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAzureClientRequest::name].
@@ -3781,8 +3788,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAzureClient {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAzureClient {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3792,8 +3799,8 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::ListAzureClients;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3827,7 +3834,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3837,14 +3844,16 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .list_azure_clients(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAzureClientsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAzureClientsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3852,15 +3861,17 @@ pub mod azure_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAzureClientsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAzureClientsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3886,8 +3897,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAzureClients {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAzureClients {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3897,7 +3908,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::DeleteAzureClient;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3929,7 +3940,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3944,7 +3955,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .delete_azure_client(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_azure_client`.
@@ -3956,7 +3967,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4005,8 +4016,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAzureClient {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAzureClient {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4016,7 +4027,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::CreateAzureCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4048,7 +4059,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4063,7 +4074,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .create_azure_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_azure_cluster`.
@@ -4080,7 +4091,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4153,8 +4164,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAzureCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAzureCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4164,7 +4175,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::UpdateAzureCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4196,7 +4207,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4211,7 +4222,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .update_azure_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_azure_cluster`.
@@ -4228,7 +4239,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4307,8 +4318,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAzureCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAzureCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4318,7 +4329,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetAzureCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4346,7 +4357,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4356,7 +4367,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_azure_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAzureClusterRequest::name].
@@ -4369,8 +4380,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAzureCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAzureCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4380,8 +4391,8 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::ListAzureClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4415,7 +4426,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4425,14 +4436,16 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .list_azure_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAzureClustersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAzureClustersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4440,15 +4453,17 @@ pub mod azure_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAzureClustersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAzureClustersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4474,8 +4489,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAzureClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAzureClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4485,7 +4500,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::DeleteAzureCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4517,7 +4532,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4532,7 +4547,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .delete_azure_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_azure_cluster`.
@@ -4544,7 +4559,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4605,8 +4620,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAzureCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAzureCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4616,7 +4631,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GenerateAzureClusterAgentToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4649,7 +4664,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4659,7 +4674,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .generate_azure_cluster_agent_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [azure_cluster][crate::model::GenerateAzureClusterAgentTokenRequest::azure_cluster].
@@ -4732,8 +4747,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAzureClusterAgentToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAzureClusterAgentToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4743,7 +4758,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GenerateAzureAccessToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4776,7 +4791,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4786,7 +4801,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .generate_azure_access_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [azure_cluster][crate::model::GenerateAzureAccessTokenRequest::azure_cluster].
@@ -4799,8 +4814,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateAzureAccessToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateAzureAccessToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4810,7 +4825,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::CreateAzureNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4842,7 +4857,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4857,7 +4872,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .create_azure_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_azure_node_pool`.
@@ -4874,7 +4889,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4947,8 +4962,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAzureNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAzureNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4958,7 +4973,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::UpdateAzureNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4990,7 +5005,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5005,7 +5020,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .update_azure_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_azure_node_pool`.
@@ -5022,7 +5037,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5101,8 +5116,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAzureNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAzureNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5112,7 +5127,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetAzureNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5143,7 +5158,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5153,7 +5168,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_azure_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAzureNodePoolRequest::name].
@@ -5166,8 +5181,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAzureNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAzureNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5177,8 +5192,8 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::ListAzureNodePools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5212,7 +5227,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5222,14 +5237,16 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .list_azure_node_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAzureNodePoolsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListAzureNodePoolsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -5237,17 +5254,17 @@ pub mod azure_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListAzureNodePoolsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5273,8 +5290,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAzureNodePools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAzureNodePools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5284,7 +5301,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::DeleteAzureNodePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5316,7 +5333,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5331,7 +5348,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .delete_azure_node_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_azure_node_pool`.
@@ -5343,7 +5360,7 @@ pub mod azure_clusters {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5404,8 +5421,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAzureNodePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAzureNodePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5415,7 +5432,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetAzureOpenIdConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5446,7 +5463,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5456,7 +5473,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_azure_open_id_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [azure_cluster][crate::model::GetAzureOpenIdConfigRequest::azure_cluster].
@@ -5469,8 +5486,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAzureOpenIdConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAzureOpenIdConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5480,7 +5497,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetAzureJsonWebKeys;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5511,7 +5528,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5521,7 +5538,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_azure_json_web_keys(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [azure_cluster][crate::model::GetAzureJsonWebKeysRequest::azure_cluster].
@@ -5534,8 +5551,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAzureJsonWebKeys {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAzureJsonWebKeys {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5545,7 +5562,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetAzureServerConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5576,7 +5593,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5586,7 +5603,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_azure_server_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAzureServerConfigRequest::name].
@@ -5599,8 +5616,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAzureServerConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAzureServerConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5610,8 +5627,8 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5647,7 +5664,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5657,15 +5674,15 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5674,17 +5691,17 @@ pub mod azure_clusters {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5720,8 +5737,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5731,7 +5748,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5762,7 +5779,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5772,7 +5789,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5783,8 +5800,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5794,7 +5811,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5827,7 +5844,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5837,7 +5854,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5848,8 +5865,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5859,7 +5876,7 @@ pub mod azure_clusters {
     /// # Example
     /// ```
     /// # use google_cloud_gkemulticloud_v1::builder::azure_clusters::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkemulticloud_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5892,7 +5909,7 @@ pub mod azure_clusters {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5902,7 +5919,7 @@ pub mod azure_clusters {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5913,8 +5930,8 @@ pub mod azure_clusters {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/gkemulticloud/v1/src/client.rs b/src/generated/cloud/gkemulticloud/v1/src/client.rs
index ce12576d2a..303510a579 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/client.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkemulticloud_v1::client::AttachedClusters;
 /// let client = AttachedClusters::builder().build().await?;
 /// // use `client` to make requests to the GKE Multi-Cloud API.
@@ -68,15 +68,13 @@ impl AttachedClusters {
     /// Returns a builder for [AttachedClusters].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkemulticloud_v1::client::AttachedClusters;
     /// let client = AttachedClusters::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::attached_clusters::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::attached_clusters::client::Factory,
-        )
+        crate::new_client_builder(super::builder::attached_clusters::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -94,14 +92,14 @@ impl AttachedClusters {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AttachedClusters>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AttachedClusters>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -111,13 +109,13 @@ impl AttachedClusters {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AttachedClusters> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AttachedClusters> {
         super::transport::AttachedClusters::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AttachedClusters> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AttachedClusters> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AttachedClusters::new)
@@ -300,7 +298,7 @@ impl AttachedClusters {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkemulticloud_v1::client::AwsClusters;
 /// let client = AwsClusters::builder().build().await?;
 /// // use `client` to make requests to the GKE Multi-Cloud API.
@@ -348,13 +346,13 @@ impl AwsClusters {
     /// Returns a builder for [AwsClusters].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkemulticloud_v1::client::AwsClusters;
     /// let client = AwsClusters::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::aws_clusters::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::aws_clusters::client::Factory)
+        crate::new_client_builder(super::builder::aws_clusters::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -372,14 +370,14 @@ impl AwsClusters {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AwsClusters>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AwsClusters>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -388,13 +386,13 @@ impl AwsClusters {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AwsClusters> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AwsClusters> {
         super::transport::AwsClusters::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AwsClusters> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AwsClusters> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AwsClusters::new)
@@ -676,7 +674,7 @@ impl AwsClusters {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkemulticloud_v1::client::AzureClusters;
 /// let client = AzureClusters::builder().build().await?;
 /// // use `client` to make requests to the GKE Multi-Cloud API.
@@ -724,13 +722,13 @@ impl AzureClusters {
     /// Returns a builder for [AzureClusters].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkemulticloud_v1::client::AzureClusters;
     /// let client = AzureClusters::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::azure_clusters::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::azure_clusters::client::Factory)
+        crate::new_client_builder(super::builder::azure_clusters::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -748,14 +746,14 @@ impl AzureClusters {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AzureClusters>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AzureClusters>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -764,13 +762,13 @@ impl AzureClusters {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AzureClusters> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AzureClusters> {
         super::transport::AzureClusters::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AzureClusters> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AzureClusters> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AzureClusters::new)
diff --git a/src/generated/cloud/gkemulticloud/v1/src/lib.rs b/src/generated/cloud/gkemulticloud/v1/src/lib.rs
index ba794eccc2..00e7e149fa 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/lib.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/lib.rs
@@ -48,8 +48,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -84,3 +84,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/gkemulticloud/v1/src/model.rs b/src/generated/cloud/gkemulticloud/v1/src/model.rs
index f522c19598..560af8c5d5 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/model.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate google_cloud_type;
@@ -2754,7 +2754,7 @@ impl wkt::message::Message for ListAttachedClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAttachedClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAttachedClustersResponse {
     type PageItem = crate::model::AttachedCluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7687,7 +7687,7 @@ impl wkt::message::Message for ListAwsClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAwsClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAwsClustersResponse {
     type PageItem = crate::model::AwsCluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -8354,7 +8354,7 @@ impl wkt::message::Message for ListAwsNodePoolsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAwsNodePoolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAwsNodePoolsResponse {
     type PageItem = crate::model::AwsNodePool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13072,7 +13072,7 @@ impl wkt::message::Message for ListAzureClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAzureClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAzureClustersResponse {
     type PageItem = crate::model::AzureCluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13656,7 +13656,7 @@ impl wkt::message::Message for ListAzureNodePoolsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAzureNodePoolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAzureNodePoolsResponse {
     type PageItem = crate::model::AzureNodePool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -14238,7 +14238,7 @@ impl wkt::message::Message for ListAzureClientsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAzureClientsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAzureClientsResponse {
     type PageItem = crate::model::AzureClient;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/gkemulticloud/v1/src/stub.rs b/src/generated/cloud/gkemulticloud/v1/src/stub.rs
index 7d34c9e725..6856bd30ab 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/stub.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn create_attached_cluster(
         &self,
         _req: crate::model::CreateAttachedClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn update_attached_cluster(
         &self,
         _req: crate::model::UpdateAttachedClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn import_attached_cluster(
         &self,
         _req: crate::model::ImportAttachedClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn get_attached_cluster(
         &self,
         _req: crate::model::GetAttachedClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AttachedCluster>>,
+        Output = crate::Result<crate::Response<crate::model::AttachedCluster>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn list_attached_clusters(
         &self,
         _req: crate::model::ListAttachedClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAttachedClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAttachedClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn delete_attached_cluster(
         &self,
         _req: crate::model::DeleteAttachedClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +108,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn get_attached_server_config(
         &self,
         _req: crate::model::GetAttachedServerConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AttachedServerConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AttachedServerConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,10 +119,10 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn generate_attached_cluster_install_manifest(
         &self,
         _req: crate::model::GenerateAttachedClusterInstallManifestRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>,
+            crate::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -132,10 +132,10 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn generate_attached_cluster_agent_token(
         &self,
         _req: crate::model::GenerateAttachedClusterAgentTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>,
+            crate::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -145,10 +145,10 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -158,9 +158,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -169,8 +169,8 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -178,8 +178,8 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -189,9 +189,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -200,9 +200,9 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -222,9 +222,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn create_aws_cluster(
         &self,
         _req: crate::model::CreateAwsClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -233,9 +233,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn update_aws_cluster(
         &self,
         _req: crate::model::UpdateAwsClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -244,10 +244,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn get_aws_cluster(
         &self,
         _req: crate::model::GetAwsClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AwsCluster>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AwsCluster>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -255,9 +254,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn list_aws_clusters(
         &self,
         _req: crate::model::ListAwsClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAwsClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAwsClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -266,9 +265,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn delete_aws_cluster(
         &self,
         _req: crate::model::DeleteAwsClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -277,11 +276,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn generate_aws_cluster_agent_token(
         &self,
         _req: crate::model::GenerateAwsClusterAgentTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateAwsClusterAgentTokenResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateAwsClusterAgentTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -290,11 +287,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn generate_aws_access_token(
         &self,
         _req: crate::model::GenerateAwsAccessTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateAwsAccessTokenResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateAwsAccessTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -303,9 +298,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn create_aws_node_pool(
         &self,
         _req: crate::model::CreateAwsNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -314,9 +309,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn update_aws_node_pool(
         &self,
         _req: crate::model::UpdateAwsNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -325,9 +320,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn rollback_aws_node_pool_update(
         &self,
         _req: crate::model::RollbackAwsNodePoolUpdateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -336,10 +331,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn get_aws_node_pool(
         &self,
         _req: crate::model::GetAwsNodePoolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AwsNodePool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AwsNodePool>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -347,9 +341,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn list_aws_node_pools(
         &self,
         _req: crate::model::ListAwsNodePoolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAwsNodePoolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAwsNodePoolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -358,9 +352,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn delete_aws_node_pool(
         &self,
         _req: crate::model::DeleteAwsNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -369,9 +363,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn get_aws_open_id_config(
         &self,
         _req: crate::model::GetAwsOpenIdConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AwsOpenIdConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AwsOpenIdConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -380,9 +374,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn get_aws_json_web_keys(
         &self,
         _req: crate::model::GetAwsJsonWebKeysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AwsJsonWebKeys>>,
+        Output = crate::Result<crate::Response<crate::model::AwsJsonWebKeys>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -391,9 +385,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn get_aws_server_config(
         &self,
         _req: crate::model::GetAwsServerConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AwsServerConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AwsServerConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -402,10 +396,10 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -415,9 +409,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -426,8 +420,8 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -435,8 +429,8 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -446,9 +440,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -457,9 +451,9 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -479,9 +473,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn create_azure_client(
         &self,
         _req: crate::model::CreateAzureClientRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -490,10 +484,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_azure_client(
         &self,
         _req: crate::model::GetAzureClientRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AzureClient>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::AzureClient>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -501,9 +494,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn list_azure_clients(
         &self,
         _req: crate::model::ListAzureClientsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAzureClientsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAzureClientsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -512,9 +505,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn delete_azure_client(
         &self,
         _req: crate::model::DeleteAzureClientRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -523,9 +516,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn create_azure_cluster(
         &self,
         _req: crate::model::CreateAzureClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -534,9 +527,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn update_azure_cluster(
         &self,
         _req: crate::model::UpdateAzureClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -545,9 +538,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_azure_cluster(
         &self,
         _req: crate::model::GetAzureClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AzureCluster>>,
+        Output = crate::Result<crate::Response<crate::model::AzureCluster>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -556,9 +549,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn list_azure_clusters(
         &self,
         _req: crate::model::ListAzureClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAzureClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAzureClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -567,9 +560,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn delete_azure_cluster(
         &self,
         _req: crate::model::DeleteAzureClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -578,10 +571,10 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn generate_azure_cluster_agent_token(
         &self,
         _req: crate::model::GenerateAzureClusterAgentTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::GenerateAzureClusterAgentTokenResponse>,
+            crate::Response<crate::model::GenerateAzureClusterAgentTokenResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -591,11 +584,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn generate_azure_access_token(
         &self,
         _req: crate::model::GenerateAzureAccessTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateAzureAccessTokenResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateAzureAccessTokenResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -604,9 +595,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn create_azure_node_pool(
         &self,
         _req: crate::model::CreateAzureNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -615,9 +606,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn update_azure_node_pool(
         &self,
         _req: crate::model::UpdateAzureNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -626,9 +617,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_azure_node_pool(
         &self,
         _req: crate::model::GetAzureNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AzureNodePool>>,
+        Output = crate::Result<crate::Response<crate::model::AzureNodePool>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -637,9 +628,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn list_azure_node_pools(
         &self,
         _req: crate::model::ListAzureNodePoolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAzureNodePoolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAzureNodePoolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -648,9 +639,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn delete_azure_node_pool(
         &self,
         _req: crate::model::DeleteAzureNodePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -659,9 +650,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_azure_open_id_config(
         &self,
         _req: crate::model::GetAzureOpenIdConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AzureOpenIdConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AzureOpenIdConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -670,9 +661,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_azure_json_web_keys(
         &self,
         _req: crate::model::GetAzureJsonWebKeysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AzureJsonWebKeys>>,
+        Output = crate::Result<crate::Response<crate::model::AzureJsonWebKeys>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -681,9 +672,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_azure_server_config(
         &self,
         _req: crate::model::GetAzureServerConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AzureServerConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AzureServerConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -692,10 +683,10 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -705,9 +696,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -716,8 +707,8 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -725,8 +716,8 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -736,9 +727,9 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -747,8 +738,8 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/gkemulticloud/v1/src/stub/dynamic.rs b/src/generated/cloud/gkemulticloud/v1/src/stub/dynamic.rs
index d56d32782c..8682499fe3 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/stub/dynamic.rs
@@ -20,96 +20,90 @@ pub trait AttachedClusters: std::fmt::Debug + Send + Sync {
     async fn create_attached_cluster(
         &self,
         req: crate::model::CreateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_attached_cluster(
         &self,
         req: crate::model::UpdateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_attached_cluster(
         &self,
         req: crate::model::ImportAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_attached_cluster(
         &self,
         req: crate::model::GetAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AttachedCluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AttachedCluster>>;
 
     async fn list_attached_clusters(
         &self,
         req: crate::model::ListAttachedClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAttachedClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAttachedClustersResponse>>;
 
     async fn delete_attached_cluster(
         &self,
         req: crate::model::DeleteAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_attached_server_config(
         &self,
         req: crate::model::GetAttachedServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AttachedServerConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AttachedServerConfig>>;
 
     async fn generate_attached_cluster_install_manifest(
         &self,
         req: crate::model::GenerateAttachedClusterInstallManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>>;
 
     async fn generate_attached_cluster_agent_token(
         &self,
         req: crate::model::GenerateAttachedClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AttachedClusters] also implement [AttachedClusters].
@@ -119,8 +113,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn create_attached_cluster(
         &self,
         req: crate::model::CreateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_attached_cluster(self, req, options).await
     }
 
@@ -128,8 +122,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn update_attached_cluster(
         &self,
         req: crate::model::UpdateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_attached_cluster(self, req, options).await
     }
 
@@ -137,8 +131,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn import_attached_cluster(
         &self,
         req: crate::model::ImportAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_attached_cluster(self, req, options).await
     }
 
@@ -146,8 +140,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn get_attached_cluster(
         &self,
         req: crate::model::GetAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AttachedCluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AttachedCluster>> {
         T::get_attached_cluster(self, req, options).await
     }
 
@@ -155,8 +149,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn list_attached_clusters(
         &self,
         req: crate::model::ListAttachedClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAttachedClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAttachedClustersResponse>> {
         T::list_attached_clusters(self, req, options).await
     }
 
@@ -164,8 +158,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn delete_attached_cluster(
         &self,
         req: crate::model::DeleteAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_attached_cluster(self, req, options).await
     }
 
@@ -173,8 +167,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn get_attached_server_config(
         &self,
         req: crate::model::GetAttachedServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AttachedServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AttachedServerConfig>> {
         T::get_attached_server_config(self, req, options).await
     }
 
@@ -182,10 +176,9 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn generate_attached_cluster_install_manifest(
         &self,
         req: crate::model::GenerateAttachedClusterInstallManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>>
+    {
         T::generate_attached_cluster_install_manifest(self, req, options).await
     }
 
@@ -193,10 +186,9 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn generate_attached_cluster_agent_token(
         &self,
         req: crate::model::GenerateAttachedClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>>
+    {
         T::generate_attached_cluster_agent_token(self, req, options).await
     }
 
@@ -204,10 +196,9 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -215,8 +206,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -224,8 +215,8 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -233,22 +224,22 @@ impl<T: super::AttachedClusters> AttachedClusters for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -259,134 +250,132 @@ pub trait AwsClusters: std::fmt::Debug + Send + Sync {
     async fn create_aws_cluster(
         &self,
         req: crate::model::CreateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_aws_cluster(
         &self,
         req: crate::model::UpdateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_aws_cluster(
         &self,
         req: crate::model::GetAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsCluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsCluster>>;
 
     async fn list_aws_clusters(
         &self,
         req: crate::model::ListAwsClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAwsClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAwsClustersResponse>>;
 
     async fn delete_aws_cluster(
         &self,
         req: crate::model::DeleteAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_aws_cluster_agent_token(
         &self,
         req: crate::model::GenerateAwsClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAwsClusterAgentTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAwsClusterAgentTokenResponse>>;
 
     async fn generate_aws_access_token(
         &self,
         req: crate::model::GenerateAwsAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAwsAccessTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAwsAccessTokenResponse>>;
 
     async fn create_aws_node_pool(
         &self,
         req: crate::model::CreateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_aws_node_pool(
         &self,
         req: crate::model::UpdateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn rollback_aws_node_pool_update(
         &self,
         req: crate::model::RollbackAwsNodePoolUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_aws_node_pool(
         &self,
         req: crate::model::GetAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsNodePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsNodePool>>;
 
     async fn list_aws_node_pools(
         &self,
         req: crate::model::ListAwsNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAwsNodePoolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAwsNodePoolsResponse>>;
 
     async fn delete_aws_node_pool(
         &self,
         req: crate::model::DeleteAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_aws_open_id_config(
         &self,
         req: crate::model::GetAwsOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsOpenIdConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsOpenIdConfig>>;
 
     async fn get_aws_json_web_keys(
         &self,
         req: crate::model::GetAwsJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsJsonWebKeys>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsJsonWebKeys>>;
 
     async fn get_aws_server_config(
         &self,
         req: crate::model::GetAwsServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsServerConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsServerConfig>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AwsClusters] also implement [AwsClusters].
@@ -396,8 +385,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn create_aws_cluster(
         &self,
         req: crate::model::CreateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_aws_cluster(self, req, options).await
     }
 
@@ -405,8 +394,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn update_aws_cluster(
         &self,
         req: crate::model::UpdateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_aws_cluster(self, req, options).await
     }
 
@@ -414,8 +403,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn get_aws_cluster(
         &self,
         req: crate::model::GetAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsCluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsCluster>> {
         T::get_aws_cluster(self, req, options).await
     }
 
@@ -423,8 +412,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn list_aws_clusters(
         &self,
         req: crate::model::ListAwsClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAwsClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAwsClustersResponse>> {
         T::list_aws_clusters(self, req, options).await
     }
 
@@ -432,8 +421,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn delete_aws_cluster(
         &self,
         req: crate::model::DeleteAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_aws_cluster(self, req, options).await
     }
 
@@ -441,9 +430,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn generate_aws_cluster_agent_token(
         &self,
         req: crate::model::GenerateAwsClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAwsClusterAgentTokenResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAwsClusterAgentTokenResponse>> {
         T::generate_aws_cluster_agent_token(self, req, options).await
     }
 
@@ -451,8 +439,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn generate_aws_access_token(
         &self,
         req: crate::model::GenerateAwsAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAwsAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAwsAccessTokenResponse>> {
         T::generate_aws_access_token(self, req, options).await
     }
 
@@ -460,8 +448,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn create_aws_node_pool(
         &self,
         req: crate::model::CreateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_aws_node_pool(self, req, options).await
     }
 
@@ -469,8 +457,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn update_aws_node_pool(
         &self,
         req: crate::model::UpdateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_aws_node_pool(self, req, options).await
     }
 
@@ -478,8 +466,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn rollback_aws_node_pool_update(
         &self,
         req: crate::model::RollbackAwsNodePoolUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::rollback_aws_node_pool_update(self, req, options).await
     }
 
@@ -487,8 +475,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn get_aws_node_pool(
         &self,
         req: crate::model::GetAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsNodePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsNodePool>> {
         T::get_aws_node_pool(self, req, options).await
     }
 
@@ -496,8 +484,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn list_aws_node_pools(
         &self,
         req: crate::model::ListAwsNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAwsNodePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAwsNodePoolsResponse>> {
         T::list_aws_node_pools(self, req, options).await
     }
 
@@ -505,8 +493,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn delete_aws_node_pool(
         &self,
         req: crate::model::DeleteAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_aws_node_pool(self, req, options).await
     }
 
@@ -514,8 +502,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn get_aws_open_id_config(
         &self,
         req: crate::model::GetAwsOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsOpenIdConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsOpenIdConfig>> {
         T::get_aws_open_id_config(self, req, options).await
     }
 
@@ -523,8 +511,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn get_aws_json_web_keys(
         &self,
         req: crate::model::GetAwsJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsJsonWebKeys>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsJsonWebKeys>> {
         T::get_aws_json_web_keys(self, req, options).await
     }
 
@@ -532,8 +520,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn get_aws_server_config(
         &self,
         req: crate::model::GetAwsServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AwsServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AwsServerConfig>> {
         T::get_aws_server_config(self, req, options).await
     }
 
@@ -541,10 +529,9 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -552,8 +539,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -561,8 +548,8 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -570,22 +557,22 @@ impl<T: super::AwsClusters> AwsClusters for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -596,152 +583,150 @@ pub trait AzureClusters: std::fmt::Debug + Send + Sync {
     async fn create_azure_client(
         &self,
         req: crate::model::CreateAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_azure_client(
         &self,
         req: crate::model::GetAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureClient>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureClient>>;
 
     async fn list_azure_clients(
         &self,
         req: crate::model::ListAzureClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAzureClientsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAzureClientsResponse>>;
 
     async fn delete_azure_client(
         &self,
         req: crate::model::DeleteAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_azure_cluster(
         &self,
         req: crate::model::CreateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_azure_cluster(
         &self,
         req: crate::model::UpdateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_azure_cluster(
         &self,
         req: crate::model::GetAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureCluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureCluster>>;
 
     async fn list_azure_clusters(
         &self,
         req: crate::model::ListAzureClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAzureClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAzureClustersResponse>>;
 
     async fn delete_azure_cluster(
         &self,
         req: crate::model::DeleteAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn generate_azure_cluster_agent_token(
         &self,
         req: crate::model::GenerateAzureClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAzureClusterAgentTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAzureClusterAgentTokenResponse>>;
 
     async fn generate_azure_access_token(
         &self,
         req: crate::model::GenerateAzureAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAzureAccessTokenResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAzureAccessTokenResponse>>;
 
     async fn create_azure_node_pool(
         &self,
         req: crate::model::CreateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_azure_node_pool(
         &self,
         req: crate::model::UpdateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_azure_node_pool(
         &self,
         req: crate::model::GetAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureNodePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureNodePool>>;
 
     async fn list_azure_node_pools(
         &self,
         req: crate::model::ListAzureNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAzureNodePoolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAzureNodePoolsResponse>>;
 
     async fn delete_azure_node_pool(
         &self,
         req: crate::model::DeleteAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_azure_open_id_config(
         &self,
         req: crate::model::GetAzureOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureOpenIdConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureOpenIdConfig>>;
 
     async fn get_azure_json_web_keys(
         &self,
         req: crate::model::GetAzureJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureJsonWebKeys>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureJsonWebKeys>>;
 
     async fn get_azure_server_config(
         &self,
         req: crate::model::GetAzureServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureServerConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureServerConfig>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::AzureClusters] also implement [AzureClusters].
@@ -751,8 +736,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn create_azure_client(
         &self,
         req: crate::model::CreateAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_azure_client(self, req, options).await
     }
 
@@ -760,8 +745,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_azure_client(
         &self,
         req: crate::model::GetAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureClient>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureClient>> {
         T::get_azure_client(self, req, options).await
     }
 
@@ -769,8 +754,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn list_azure_clients(
         &self,
         req: crate::model::ListAzureClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAzureClientsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAzureClientsResponse>> {
         T::list_azure_clients(self, req, options).await
     }
 
@@ -778,8 +763,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn delete_azure_client(
         &self,
         req: crate::model::DeleteAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_azure_client(self, req, options).await
     }
 
@@ -787,8 +772,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn create_azure_cluster(
         &self,
         req: crate::model::CreateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_azure_cluster(self, req, options).await
     }
 
@@ -796,8 +781,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn update_azure_cluster(
         &self,
         req: crate::model::UpdateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_azure_cluster(self, req, options).await
     }
 
@@ -805,8 +790,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_azure_cluster(
         &self,
         req: crate::model::GetAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureCluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureCluster>> {
         T::get_azure_cluster(self, req, options).await
     }
 
@@ -814,8 +799,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn list_azure_clusters(
         &self,
         req: crate::model::ListAzureClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAzureClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAzureClustersResponse>> {
         T::list_azure_clusters(self, req, options).await
     }
 
@@ -823,8 +808,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn delete_azure_cluster(
         &self,
         req: crate::model::DeleteAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_azure_cluster(self, req, options).await
     }
 
@@ -832,9 +817,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn generate_azure_cluster_agent_token(
         &self,
         req: crate::model::GenerateAzureClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAzureClusterAgentTokenResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAzureClusterAgentTokenResponse>> {
         T::generate_azure_cluster_agent_token(self, req, options).await
     }
 
@@ -842,9 +826,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn generate_azure_access_token(
         &self,
         req: crate::model::GenerateAzureAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateAzureAccessTokenResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateAzureAccessTokenResponse>> {
         T::generate_azure_access_token(self, req, options).await
     }
 
@@ -852,8 +835,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn create_azure_node_pool(
         &self,
         req: crate::model::CreateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_azure_node_pool(self, req, options).await
     }
 
@@ -861,8 +844,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn update_azure_node_pool(
         &self,
         req: crate::model::UpdateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_azure_node_pool(self, req, options).await
     }
 
@@ -870,8 +853,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_azure_node_pool(
         &self,
         req: crate::model::GetAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureNodePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureNodePool>> {
         T::get_azure_node_pool(self, req, options).await
     }
 
@@ -879,8 +862,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn list_azure_node_pools(
         &self,
         req: crate::model::ListAzureNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAzureNodePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAzureNodePoolsResponse>> {
         T::list_azure_node_pools(self, req, options).await
     }
 
@@ -888,8 +871,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn delete_azure_node_pool(
         &self,
         req: crate::model::DeleteAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_azure_node_pool(self, req, options).await
     }
 
@@ -897,8 +880,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_azure_open_id_config(
         &self,
         req: crate::model::GetAzureOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureOpenIdConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureOpenIdConfig>> {
         T::get_azure_open_id_config(self, req, options).await
     }
 
@@ -906,8 +889,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_azure_json_web_keys(
         &self,
         req: crate::model::GetAzureJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureJsonWebKeys>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureJsonWebKeys>> {
         T::get_azure_json_web_keys(self, req, options).await
     }
 
@@ -915,8 +898,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_azure_server_config(
         &self,
         req: crate::model::GetAzureServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AzureServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AzureServerConfig>> {
         T::get_azure_server_config(self, req, options).await
     }
 
@@ -924,10 +907,9 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -935,8 +917,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -944,8 +926,8 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -953,22 +935,22 @@ impl<T: super::AzureClusters> AzureClusters for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/gkemulticloud/v1/src/tracing.rs b/src/generated/cloud/gkemulticloud/v1/src/tracing.rs
index 5c3bc5b04a..91fcc3c90f 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/tracing.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_attached_cluster(
         &self,
         req: crate::model::CreateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_attached_cluster(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn update_attached_cluster(
         &self,
         req: crate::model::UpdateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_attached_cluster(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn import_attached_cluster(
         &self,
         req: crate::model::ImportAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_attached_cluster(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_attached_cluster(
         &self,
         req: crate::model::GetAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AttachedCluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AttachedCluster>> {
         self.inner.get_attached_cluster(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_attached_clusters(
         &self,
         req: crate::model::ListAttachedClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAttachedClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAttachedClustersResponse>> {
         self.inner.list_attached_clusters(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_attached_cluster(
         &self,
         req: crate::model::DeleteAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_attached_cluster(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_attached_server_config(
         &self,
         req: crate::model::GetAttachedServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AttachedServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AttachedServerConfig>> {
         self.inner.get_attached_server_config(req, options).await
     }
 
@@ -104,9 +104,8 @@ where
     async fn generate_attached_cluster_install_manifest(
         &self,
         req: crate::model::GenerateAttachedClusterInstallManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>> {
         self.inner
             .generate_attached_cluster_install_manifest(req, options)
             .await
@@ -116,9 +115,8 @@ where
     async fn generate_attached_cluster_agent_token(
         &self,
         req: crate::model::GenerateAttachedClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>> {
         self.inner
             .generate_attached_cluster_agent_token(req, options)
             .await
@@ -128,9 +126,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -138,8 +135,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -147,8 +144,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -156,22 +153,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -202,8 +199,8 @@ where
     async fn create_aws_cluster(
         &self,
         req: crate::model::CreateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_aws_cluster(req, options).await
     }
 
@@ -211,8 +208,8 @@ where
     async fn update_aws_cluster(
         &self,
         req: crate::model::UpdateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_aws_cluster(req, options).await
     }
 
@@ -220,8 +217,8 @@ where
     async fn get_aws_cluster(
         &self,
         req: crate::model::GetAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsCluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsCluster>> {
         self.inner.get_aws_cluster(req, options).await
     }
 
@@ -229,8 +226,8 @@ where
     async fn list_aws_clusters(
         &self,
         req: crate::model::ListAwsClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAwsClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAwsClustersResponse>> {
         self.inner.list_aws_clusters(req, options).await
     }
 
@@ -238,8 +235,8 @@ where
     async fn delete_aws_cluster(
         &self,
         req: crate::model::DeleteAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_aws_cluster(req, options).await
     }
 
@@ -247,8 +244,8 @@ where
     async fn generate_aws_cluster_agent_token(
         &self,
         req: crate::model::GenerateAwsClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAwsClusterAgentTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAwsClusterAgentTokenResponse>> {
         self.inner
             .generate_aws_cluster_agent_token(req, options)
             .await
@@ -258,8 +255,8 @@ where
     async fn generate_aws_access_token(
         &self,
         req: crate::model::GenerateAwsAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAwsAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAwsAccessTokenResponse>> {
         self.inner.generate_aws_access_token(req, options).await
     }
 
@@ -267,8 +264,8 @@ where
     async fn create_aws_node_pool(
         &self,
         req: crate::model::CreateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_aws_node_pool(req, options).await
     }
 
@@ -276,8 +273,8 @@ where
     async fn update_aws_node_pool(
         &self,
         req: crate::model::UpdateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_aws_node_pool(req, options).await
     }
 
@@ -285,8 +282,8 @@ where
     async fn rollback_aws_node_pool_update(
         &self,
         req: crate::model::RollbackAwsNodePoolUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.rollback_aws_node_pool_update(req, options).await
     }
 
@@ -294,8 +291,8 @@ where
     async fn get_aws_node_pool(
         &self,
         req: crate::model::GetAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsNodePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsNodePool>> {
         self.inner.get_aws_node_pool(req, options).await
     }
 
@@ -303,8 +300,8 @@ where
     async fn list_aws_node_pools(
         &self,
         req: crate::model::ListAwsNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAwsNodePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAwsNodePoolsResponse>> {
         self.inner.list_aws_node_pools(req, options).await
     }
 
@@ -312,8 +309,8 @@ where
     async fn delete_aws_node_pool(
         &self,
         req: crate::model::DeleteAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_aws_node_pool(req, options).await
     }
 
@@ -321,8 +318,8 @@ where
     async fn get_aws_open_id_config(
         &self,
         req: crate::model::GetAwsOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsOpenIdConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsOpenIdConfig>> {
         self.inner.get_aws_open_id_config(req, options).await
     }
 
@@ -330,8 +327,8 @@ where
     async fn get_aws_json_web_keys(
         &self,
         req: crate::model::GetAwsJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsJsonWebKeys>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsJsonWebKeys>> {
         self.inner.get_aws_json_web_keys(req, options).await
     }
 
@@ -339,8 +336,8 @@ where
     async fn get_aws_server_config(
         &self,
         req: crate::model::GetAwsServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsServerConfig>> {
         self.inner.get_aws_server_config(req, options).await
     }
 
@@ -348,9 +345,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -358,8 +354,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -367,8 +363,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -376,22 +372,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -422,8 +418,8 @@ where
     async fn create_azure_client(
         &self,
         req: crate::model::CreateAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_azure_client(req, options).await
     }
 
@@ -431,8 +427,8 @@ where
     async fn get_azure_client(
         &self,
         req: crate::model::GetAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureClient>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureClient>> {
         self.inner.get_azure_client(req, options).await
     }
 
@@ -440,8 +436,8 @@ where
     async fn list_azure_clients(
         &self,
         req: crate::model::ListAzureClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAzureClientsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAzureClientsResponse>> {
         self.inner.list_azure_clients(req, options).await
     }
 
@@ -449,8 +445,8 @@ where
     async fn delete_azure_client(
         &self,
         req: crate::model::DeleteAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_azure_client(req, options).await
     }
 
@@ -458,8 +454,8 @@ where
     async fn create_azure_cluster(
         &self,
         req: crate::model::CreateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_azure_cluster(req, options).await
     }
 
@@ -467,8 +463,8 @@ where
     async fn update_azure_cluster(
         &self,
         req: crate::model::UpdateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_azure_cluster(req, options).await
     }
 
@@ -476,8 +472,8 @@ where
     async fn get_azure_cluster(
         &self,
         req: crate::model::GetAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureCluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureCluster>> {
         self.inner.get_azure_cluster(req, options).await
     }
 
@@ -485,8 +481,8 @@ where
     async fn list_azure_clusters(
         &self,
         req: crate::model::ListAzureClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAzureClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAzureClustersResponse>> {
         self.inner.list_azure_clusters(req, options).await
     }
 
@@ -494,8 +490,8 @@ where
     async fn delete_azure_cluster(
         &self,
         req: crate::model::DeleteAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_azure_cluster(req, options).await
     }
 
@@ -503,8 +499,8 @@ where
     async fn generate_azure_cluster_agent_token(
         &self,
         req: crate::model::GenerateAzureClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAzureClusterAgentTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAzureClusterAgentTokenResponse>> {
         self.inner
             .generate_azure_cluster_agent_token(req, options)
             .await
@@ -514,8 +510,8 @@ where
     async fn generate_azure_access_token(
         &self,
         req: crate::model::GenerateAzureAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAzureAccessTokenResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAzureAccessTokenResponse>> {
         self.inner.generate_azure_access_token(req, options).await
     }
 
@@ -523,8 +519,8 @@ where
     async fn create_azure_node_pool(
         &self,
         req: crate::model::CreateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_azure_node_pool(req, options).await
     }
 
@@ -532,8 +528,8 @@ where
     async fn update_azure_node_pool(
         &self,
         req: crate::model::UpdateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_azure_node_pool(req, options).await
     }
 
@@ -541,8 +537,8 @@ where
     async fn get_azure_node_pool(
         &self,
         req: crate::model::GetAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureNodePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureNodePool>> {
         self.inner.get_azure_node_pool(req, options).await
     }
 
@@ -550,8 +546,8 @@ where
     async fn list_azure_node_pools(
         &self,
         req: crate::model::ListAzureNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAzureNodePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAzureNodePoolsResponse>> {
         self.inner.list_azure_node_pools(req, options).await
     }
 
@@ -559,8 +555,8 @@ where
     async fn delete_azure_node_pool(
         &self,
         req: crate::model::DeleteAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_azure_node_pool(req, options).await
     }
 
@@ -568,8 +564,8 @@ where
     async fn get_azure_open_id_config(
         &self,
         req: crate::model::GetAzureOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureOpenIdConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureOpenIdConfig>> {
         self.inner.get_azure_open_id_config(req, options).await
     }
 
@@ -577,8 +573,8 @@ where
     async fn get_azure_json_web_keys(
         &self,
         req: crate::model::GetAzureJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureJsonWebKeys>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureJsonWebKeys>> {
         self.inner.get_azure_json_web_keys(req, options).await
     }
 
@@ -586,8 +582,8 @@ where
     async fn get_azure_server_config(
         &self,
         req: crate::model::GetAzureServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureServerConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureServerConfig>> {
         self.inner.get_azure_server_config(req, options).await
     }
 
@@ -595,9 +591,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -605,8 +600,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -614,8 +609,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -623,22 +618,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkemulticloud/v1/src/transport.rs b/src/generated/cloud/gkemulticloud/v1/src/transport.rs
index 026d2a775b..2e86e4707d 100644
--- a/src/generated/cloud/gkemulticloud/v1/src/transport.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [AttachedClusters](super::stub::AttachedClusters) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for AttachedClusters {
 }
 
 impl AttachedClusters {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn create_attached_cluster(
         &self,
         req: crate::model::CreateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn update_attached_cluster(
         &self,
         req: crate::model::UpdateAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -171,9 +171,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -188,13 +188,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn import_attached_cluster(
         &self,
         req: crate::model::ImportAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -231,9 +231,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -248,13 +248,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn get_attached_cluster(
         &self,
         req: crate::model::GetAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AttachedCluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AttachedCluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -295,9 +295,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312,13 +312,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn list_attached_clusters(
         &self,
         req: crate::model::ListAttachedClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAttachedClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAttachedClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -357,9 +357,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -374,13 +374,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn delete_attached_cluster(
         &self,
         req: crate::model::DeleteAttachedClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn get_attached_server_config(
         &self,
         req: crate::model::GetAttachedServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AttachedServerConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AttachedServerConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -487,9 +487,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -504,14 +504,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn generate_attached_cluster_install_manifest(
         &self,
         req: crate::model::GenerateAttachedClusterInstallManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAttachedClusterInstallManifestResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -562,9 +561,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -579,14 +578,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn generate_attached_cluster_agent_token(
         &self,
         req: crate::model::GenerateAttachedClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAttachedClusterAgentTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -627,9 +625,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -644,14 +642,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -693,9 +690,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -710,13 +707,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -757,9 +754,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -774,13 +771,13 @@ impl super::stub::AttachedClusters for AttachedClusters {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -821,9 +818,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -832,24 +829,25 @@ impl super::stub::AttachedClusters for AttachedClusters {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -890,9 +888,9 @@ impl super::stub::AttachedClusters for AttachedClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -901,25 +899,26 @@ impl super::stub::AttachedClusters for AttachedClusters {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -939,7 +938,7 @@ impl std::fmt::Debug for AwsClusters {
 }
 
 impl AwsClusters {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -949,13 +948,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn create_aws_cluster(
         &self,
         req: crate::model::CreateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -994,9 +993,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1011,13 +1010,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn update_aws_cluster(
         &self,
         req: crate::model::UpdateAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1077,9 +1076,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1094,13 +1093,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn get_aws_cluster(
         &self,
         req: crate::model::GetAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsCluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsCluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1141,9 +1140,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1158,13 +1157,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn list_aws_clusters(
         &self,
         req: crate::model::ListAwsClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAwsClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAwsClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1203,9 +1202,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1220,13 +1219,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn delete_aws_cluster(
         &self,
         req: crate::model::DeleteAwsClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1271,9 +1270,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1288,13 +1287,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn generate_aws_cluster_agent_token(
         &self,
         req: crate::model::GenerateAwsClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAwsClusterAgentTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAwsClusterAgentTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1335,9 +1334,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1352,13 +1351,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn generate_aws_access_token(
         &self,
         req: crate::model::GenerateAwsAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAwsAccessTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAwsAccessTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1399,9 +1398,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1416,13 +1415,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn create_aws_node_pool(
         &self,
         req: crate::model::CreateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1465,9 +1464,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1482,13 +1481,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn update_aws_node_pool(
         &self,
         req: crate::model::UpdateAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1552,9 +1551,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1569,13 +1568,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn rollback_aws_node_pool_update(
         &self,
         req: crate::model::RollbackAwsNodePoolUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1620,9 +1619,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1637,13 +1636,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn get_aws_node_pool(
         &self,
         req: crate::model::GetAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsNodePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsNodePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1688,9 +1687,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1705,13 +1704,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn list_aws_node_pools(
         &self,
         req: crate::model::ListAwsNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAwsNodePoolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAwsNodePoolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1754,9 +1753,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1771,13 +1770,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn delete_aws_node_pool(
         &self,
         req: crate::model::DeleteAwsNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1826,9 +1825,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1843,13 +1842,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn get_aws_open_id_config(
         &self,
         req: crate::model::GetAwsOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsOpenIdConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsOpenIdConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1890,9 +1889,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1907,13 +1906,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn get_aws_json_web_keys(
         &self,
         req: crate::model::GetAwsJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsJsonWebKeys>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsJsonWebKeys>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1954,9 +1953,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1971,13 +1970,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn get_aws_server_config(
         &self,
         req: crate::model::GetAwsServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AwsServerConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AwsServerConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2016,9 +2015,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2033,14 +2032,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2082,9 +2080,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2099,13 +2097,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2146,9 +2144,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2163,13 +2161,13 @@ impl super::stub::AwsClusters for AwsClusters {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2210,9 +2208,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2221,24 +2219,25 @@ impl super::stub::AwsClusters for AwsClusters {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2279,9 +2278,9 @@ impl super::stub::AwsClusters for AwsClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2290,25 +2289,26 @@ impl super::stub::AwsClusters for AwsClusters {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2328,7 +2328,7 @@ impl std::fmt::Debug for AzureClusters {
 }
 
 impl AzureClusters {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2338,13 +2338,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn create_azure_client(
         &self,
         req: crate::model::CreateAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2383,9 +2383,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2400,13 +2400,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_azure_client(
         &self,
         req: crate::model::GetAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureClient>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureClient>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2447,9 +2447,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2464,13 +2464,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn list_azure_clients(
         &self,
         req: crate::model::ListAzureClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAzureClientsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAzureClientsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2509,9 +2509,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2526,13 +2526,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn delete_azure_client(
         &self,
         req: crate::model::DeleteAzureClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2575,9 +2575,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2592,13 +2592,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn create_azure_cluster(
         &self,
         req: crate::model::CreateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2637,9 +2637,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2654,13 +2654,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn update_azure_cluster(
         &self,
         req: crate::model::UpdateAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2720,9 +2720,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2737,13 +2737,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_azure_cluster(
         &self,
         req: crate::model::GetAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureCluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureCluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2784,9 +2784,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2801,13 +2801,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn list_azure_clusters(
         &self,
         req: crate::model::ListAzureClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAzureClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAzureClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2846,9 +2846,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2863,13 +2863,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn delete_azure_cluster(
         &self,
         req: crate::model::DeleteAzureClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2914,9 +2914,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2931,13 +2931,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn generate_azure_cluster_agent_token(
         &self,
         req: crate::model::GenerateAzureClusterAgentTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAzureClusterAgentTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAzureClusterAgentTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2978,9 +2978,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2995,13 +2995,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn generate_azure_access_token(
         &self,
         req: crate::model::GenerateAzureAccessTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateAzureAccessTokenResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateAzureAccessTokenResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3042,9 +3042,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3059,13 +3059,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn create_azure_node_pool(
         &self,
         req: crate::model::CreateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3108,9 +3108,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3125,13 +3125,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn update_azure_node_pool(
         &self,
         req: crate::model::UpdateAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3195,9 +3195,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3212,13 +3212,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_azure_node_pool(
         &self,
         req: crate::model::GetAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureNodePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureNodePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3263,9 +3263,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3280,13 +3280,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn list_azure_node_pools(
         &self,
         req: crate::model::ListAzureNodePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAzureNodePoolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAzureNodePoolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3329,9 +3329,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3346,13 +3346,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn delete_azure_node_pool(
         &self,
         req: crate::model::DeleteAzureNodePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3401,9 +3401,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3418,13 +3418,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_azure_open_id_config(
         &self,
         req: crate::model::GetAzureOpenIdConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureOpenIdConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureOpenIdConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3465,9 +3465,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3482,13 +3482,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_azure_json_web_keys(
         &self,
         req: crate::model::GetAzureJsonWebKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureJsonWebKeys>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureJsonWebKeys>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3529,9 +3529,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3546,13 +3546,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_azure_server_config(
         &self,
         req: crate::model::GetAzureServerConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AzureServerConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AzureServerConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3591,9 +3591,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3608,14 +3608,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3657,9 +3656,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3674,13 +3673,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3721,9 +3720,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3738,13 +3737,13 @@ impl super::stub::AzureClusters for AzureClusters {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3785,9 +3784,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3796,24 +3795,25 @@ impl super::stub::AzureClusters for AzureClusters {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3854,9 +3854,9 @@ impl super::stub::AzureClusters for AzureClusters {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3865,25 +3865,26 @@ impl super::stub::AzureClusters for AzureClusters {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/gkerecommender/v1/Cargo.toml b/src/generated/cloud/gkerecommender/v1/Cargo.toml
index a7c6b1f6ab..de21371631 100644
--- a/src/generated/cloud/gkerecommender/v1/Cargo.toml
+++ b/src/generated/cloud/gkerecommender/v1/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/gkerecommender/v1/src/builder.rs b/src/generated/cloud/gkerecommender/v1/src/builder.rs
index 81b2f9ba19..70a2871fdc 100644
--- a/src/generated/cloud/gkerecommender/v1/src/builder.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod gke_inference_quickstart {
     /// A builder for [GkeInferenceQuickstart][crate::client::GkeInferenceQuickstart].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkerecommender_v1::*;
     /// # use builder::gke_inference_quickstart::ClientBuilder;
     /// # use client::GkeInferenceQuickstart;
@@ -30,19 +30,18 @@ pub mod gke_inference_quickstart {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GkeInferenceQuickstart;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GkeInferenceQuickstart;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod gke_inference_quickstart {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GkeInferenceQuickstart>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod gke_inference_quickstart {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod gke_inference_quickstart {
     /// # Example
     /// ```
     /// # use google_cloud_gkerecommender_v1::builder::gke_inference_quickstart::FetchModels;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkerecommender_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -104,7 +103,7 @@ pub mod gke_inference_quickstart {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,7 +113,7 @@ pub mod gke_inference_quickstart {
             (*self.0.stub)
                 .fetch_models(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [page_size][crate::model::FetchModelsRequest::page_size].
@@ -155,8 +154,8 @@ pub mod gke_inference_quickstart {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchModels {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchModels {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -166,7 +165,7 @@ pub mod gke_inference_quickstart {
     /// # Example
     /// ```
     /// # use google_cloud_gkerecommender_v1::builder::gke_inference_quickstart::FetchModelServers;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkerecommender_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -197,7 +196,7 @@ pub mod gke_inference_quickstart {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -207,7 +206,7 @@ pub mod gke_inference_quickstart {
             (*self.0.stub)
                 .fetch_model_servers(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model][crate::model::FetchModelServersRequest::model].
@@ -256,8 +255,8 @@ pub mod gke_inference_quickstart {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchModelServers {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchModelServers {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -267,7 +266,7 @@ pub mod gke_inference_quickstart {
     /// # Example
     /// ```
     /// # use google_cloud_gkerecommender_v1::builder::gke_inference_quickstart::FetchModelServerVersions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkerecommender_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -300,7 +299,7 @@ pub mod gke_inference_quickstart {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -310,7 +309,7 @@ pub mod gke_inference_quickstart {
             (*self.0.stub)
                 .fetch_model_server_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model][crate::model::FetchModelServerVersionsRequest::model].
@@ -367,8 +366,8 @@ pub mod gke_inference_quickstart {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchModelServerVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchModelServerVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -378,8 +377,8 @@ pub mod gke_inference_quickstart {
     /// # Example
     /// ```
     /// # use google_cloud_gkerecommender_v1::builder::gke_inference_quickstart::FetchProfiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gkerecommender_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -410,7 +409,7 @@ pub mod gke_inference_quickstart {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -420,13 +419,13 @@ pub mod gke_inference_quickstart {
             (*self.0.stub)
                 .fetch_profiles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::FetchProfilesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::FetchProfilesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone().unwrap_or_default();
@@ -435,15 +434,17 @@ pub mod gke_inference_quickstart {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::FetchProfilesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::FetchProfilesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -521,8 +522,8 @@ pub mod gke_inference_quickstart {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchProfiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchProfiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -532,7 +533,7 @@ pub mod gke_inference_quickstart {
     /// # Example
     /// ```
     /// # use google_cloud_gkerecommender_v1::builder::gke_inference_quickstart::GenerateOptimizedManifest;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkerecommender_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -565,7 +566,7 @@ pub mod gke_inference_quickstart {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -575,7 +576,7 @@ pub mod gke_inference_quickstart {
             (*self.0.stub)
                 .generate_optimized_manifest(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model_server_info][crate::model::GenerateOptimizedManifestRequest::model_server_info].
@@ -652,8 +653,8 @@ pub mod gke_inference_quickstart {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateOptimizedManifest {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateOptimizedManifest {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -663,7 +664,7 @@ pub mod gke_inference_quickstart {
     /// # Example
     /// ```
     /// # use google_cloud_gkerecommender_v1::builder::gke_inference_quickstart::FetchBenchmarkingData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gkerecommender_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -694,7 +695,7 @@ pub mod gke_inference_quickstart {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -704,7 +705,7 @@ pub mod gke_inference_quickstart {
             (*self.0.stub)
                 .fetch_benchmarking_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [model_server_info][crate::model::FetchBenchmarkingDataRequest::model_server_info].
@@ -743,8 +744,8 @@ pub mod gke_inference_quickstart {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for FetchBenchmarkingData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for FetchBenchmarkingData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/gkerecommender/v1/src/client.rs b/src/generated/cloud/gkerecommender/v1/src/client.rs
index 9dcacf33ab..72e8c213de 100644
--- a/src/generated/cloud/gkerecommender/v1/src/client.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gkerecommender_v1::client::GkeInferenceQuickstart;
 /// let client = GkeInferenceQuickstart::builder().build().await?;
 /// // use `client` to make requests to the GKE Recommender API.
@@ -69,15 +69,13 @@ impl GkeInferenceQuickstart {
     /// Returns a builder for [GkeInferenceQuickstart].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gkerecommender_v1::client::GkeInferenceQuickstart;
     /// let client = GkeInferenceQuickstart::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::gke_inference_quickstart::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::gke_inference_quickstart::client::Factory,
-        )
+        crate::new_client_builder(super::builder::gke_inference_quickstart::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -95,14 +93,14 @@ impl GkeInferenceQuickstart {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GkeInferenceQuickstart>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GkeInferenceQuickstart>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -112,13 +110,13 @@ impl GkeInferenceQuickstart {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GkeInferenceQuickstart> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GkeInferenceQuickstart> {
         super::transport::GkeInferenceQuickstart::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GkeInferenceQuickstart> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GkeInferenceQuickstart> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GkeInferenceQuickstart::new)
diff --git a/src/generated/cloud/gkerecommender/v1/src/lib.rs b/src/generated/cloud/gkerecommender/v1/src/lib.rs
index c3efb42179..ea923c0b28 100644
--- a/src/generated/cloud/gkerecommender/v1/src/lib.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/gkerecommender/v1/src/model.rs b/src/generated/cloud/gkerecommender/v1/src/model.rs
index 1b732c65c2..4223899672 100644
--- a/src/generated/cloud/gkerecommender/v1/src/model.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -1632,7 +1632,7 @@ impl wkt::message::Message for FetchProfilesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for FetchProfilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for FetchProfilesResponse {
     type PageItem = crate::model::Profile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/gkerecommender/v1/src/stub.rs b/src/generated/cloud/gkerecommender/v1/src/stub.rs
index 83023d8c1a..404205d6fc 100644
--- a/src/generated/cloud/gkerecommender/v1/src/stub.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     fn fetch_models(
         &self,
         _req: crate::model::FetchModelsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchModelsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchModelsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     fn fetch_model_servers(
         &self,
         _req: crate::model::FetchModelServersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchModelServersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchModelServersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,11 +64,9 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     fn fetch_model_server_versions(
         &self,
         _req: crate::model::FetchModelServerVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchModelServerVersionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchModelServerVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     fn fetch_profiles(
         &self,
         _req: crate::model::FetchProfilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FetchProfilesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::FetchProfilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,11 +86,9 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     fn generate_optimized_manifest(
         &self,
         _req: crate::model::GenerateOptimizedManifestRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::GenerateOptimizedManifestResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::GenerateOptimizedManifestResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -101,11 +97,9 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     fn fetch_benchmarking_data(
         &self,
         _req: crate::model::FetchBenchmarkingDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::FetchBenchmarkingDataResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::FetchBenchmarkingDataResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/gkerecommender/v1/src/stub/dynamic.rs b/src/generated/cloud/gkerecommender/v1/src/stub/dynamic.rs
index 05ed9faa81..125d1c3a98 100644
--- a/src/generated/cloud/gkerecommender/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/stub/dynamic.rs
@@ -20,38 +20,38 @@ pub trait GkeInferenceQuickstart: std::fmt::Debug + Send + Sync {
     async fn fetch_models(
         &self,
         req: crate::model::FetchModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchModelsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchModelsResponse>>;
 
     async fn fetch_model_servers(
         &self,
         req: crate::model::FetchModelServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchModelServersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchModelServersResponse>>;
 
     async fn fetch_model_server_versions(
         &self,
         req: crate::model::FetchModelServerVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchModelServerVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchModelServerVersionsResponse>>;
 
     async fn fetch_profiles(
         &self,
         req: crate::model::FetchProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchProfilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchProfilesResponse>>;
 
     async fn generate_optimized_manifest(
         &self,
         req: crate::model::GenerateOptimizedManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateOptimizedManifestResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateOptimizedManifestResponse>>;
 
     async fn fetch_benchmarking_data(
         &self,
         req: crate::model::FetchBenchmarkingDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchBenchmarkingDataResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchBenchmarkingDataResponse>>;
 }
 
 /// All implementations of [super::GkeInferenceQuickstart] also implement [GkeInferenceQuickstart].
@@ -61,8 +61,8 @@ impl<T: super::GkeInferenceQuickstart> GkeInferenceQuickstart for T {
     async fn fetch_models(
         &self,
         req: crate::model::FetchModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchModelsResponse>> {
         T::fetch_models(self, req, options).await
     }
 
@@ -70,8 +70,8 @@ impl<T: super::GkeInferenceQuickstart> GkeInferenceQuickstart for T {
     async fn fetch_model_servers(
         &self,
         req: crate::model::FetchModelServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchModelServersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchModelServersResponse>> {
         T::fetch_model_servers(self, req, options).await
     }
 
@@ -79,9 +79,8 @@ impl<T: super::GkeInferenceQuickstart> GkeInferenceQuickstart for T {
     async fn fetch_model_server_versions(
         &self,
         req: crate::model::FetchModelServerVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchModelServerVersionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchModelServerVersionsResponse>> {
         T::fetch_model_server_versions(self, req, options).await
     }
 
@@ -89,8 +88,8 @@ impl<T: super::GkeInferenceQuickstart> GkeInferenceQuickstart for T {
     async fn fetch_profiles(
         &self,
         req: crate::model::FetchProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchProfilesResponse>> {
         T::fetch_profiles(self, req, options).await
     }
 
@@ -98,9 +97,8 @@ impl<T: super::GkeInferenceQuickstart> GkeInferenceQuickstart for T {
     async fn generate_optimized_manifest(
         &self,
         req: crate::model::GenerateOptimizedManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateOptimizedManifestResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateOptimizedManifestResponse>> {
         T::generate_optimized_manifest(self, req, options).await
     }
 
@@ -108,8 +106,8 @@ impl<T: super::GkeInferenceQuickstart> GkeInferenceQuickstart for T {
     async fn fetch_benchmarking_data(
         &self,
         req: crate::model::FetchBenchmarkingDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FetchBenchmarkingDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FetchBenchmarkingDataResponse>> {
         T::fetch_benchmarking_data(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/gkerecommender/v1/src/tracing.rs b/src/generated/cloud/gkerecommender/v1/src/tracing.rs
index ea23af5643..fec1ff76f6 100644
--- a/src/generated/cloud/gkerecommender/v1/src/tracing.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn fetch_models(
         &self,
         req: crate::model::FetchModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchModelsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchModelsResponse>> {
         self.inner.fetch_models(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn fetch_model_servers(
         &self,
         req: crate::model::FetchModelServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchModelServersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchModelServersResponse>> {
         self.inner.fetch_model_servers(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn fetch_model_server_versions(
         &self,
         req: crate::model::FetchModelServerVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchModelServerVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchModelServerVersionsResponse>> {
         self.inner.fetch_model_server_versions(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn fetch_profiles(
         &self,
         req: crate::model::FetchProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchProfilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchProfilesResponse>> {
         self.inner.fetch_profiles(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn generate_optimized_manifest(
         &self,
         req: crate::model::GenerateOptimizedManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateOptimizedManifestResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateOptimizedManifestResponse>> {
         self.inner.generate_optimized_manifest(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn fetch_benchmarking_data(
         &self,
         req: crate::model::FetchBenchmarkingDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchBenchmarkingDataResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchBenchmarkingDataResponse>> {
         self.inner.fetch_benchmarking_data(req, options).await
     }
 }
diff --git a/src/generated/cloud/gkerecommender/v1/src/transport.rs b/src/generated/cloud/gkerecommender/v1/src/transport.rs
index 267849162f..03c27fd792 100644
--- a/src/generated/cloud/gkerecommender/v1/src/transport.rs
+++ b/src/generated/cloud/gkerecommender/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [GkeInferenceQuickstart](super::stub::GkeInferenceQuickstart) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for GkeInferenceQuickstart {
 }
 
 impl GkeInferenceQuickstart {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,11 +43,11 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
     async fn fetch_models(
         &self,
         req: crate::model::FetchModelsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchModelsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchModelsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/models:fetch".to_string();
@@ -70,9 +70,9 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -87,11 +87,11 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
     async fn fetch_model_servers(
         &self,
         req: crate::model::FetchModelServersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchModelServersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchModelServersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/modelServers:fetch".to_string();
@@ -115,9 +115,9 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -132,11 +132,11 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
     async fn fetch_model_server_versions(
         &self,
         req: crate::model::FetchModelServerVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchModelServerVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchModelServerVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/modelServerVersions:fetch".to_string();
@@ -161,9 +161,9 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -178,11 +178,11 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
     async fn fetch_profiles(
         &self,
         req: crate::model::FetchProfilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchProfilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchProfilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/profiles:fetch".to_string();
@@ -197,9 +197,9 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -214,11 +214,11 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
     async fn generate_optimized_manifest(
         &self,
         req: crate::model::GenerateOptimizedManifestRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateOptimizedManifestResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateOptimizedManifestResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/optimizedManifest:generate".to_string();
@@ -233,9 +233,9 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -250,11 +250,11 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
     async fn fetch_benchmarking_data(
         &self,
         req: crate::model::FetchBenchmarkingDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FetchBenchmarkingDataResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FetchBenchmarkingDataResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v1/benchmarkingData:fetch".to_string();
@@ -269,9 +269,9 @@ impl super::stub::GkeInferenceQuickstart for GkeInferenceQuickstart {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/gsuiteaddons/v1/Cargo.toml b/src/generated/cloud/gsuiteaddons/v1/Cargo.toml
index b0892da57e..83081e8a0a 100644
--- a/src/generated/cloud/gsuiteaddons/v1/Cargo.toml
+++ b/src/generated/cloud/gsuiteaddons/v1/Cargo.toml
@@ -40,7 +40,6 @@ all-features = true
 [dependencies]
 async-trait.workspace                            = true
 bytes.workspace                                  = true
-gax.workspace                                    = true
 gaxi                                             = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-apps-script-type-calendar.workspace = true
 google-cloud-apps-script-type-docs.workspace     = true
@@ -49,6 +48,7 @@ google-cloud-apps-script-type-gmail.workspace    = true
 google-cloud-apps-script-type-sheets.workspace   = true
 google-cloud-apps-script-type-slides.workspace   = true
 google-cloud-apps-script-type.workspace          = true
+google-cloud-gax.workspace                       = true
 lazy_static.workspace                            = true
 serde.workspace                                  = true
 serde_json.workspace                             = true
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/builder.rs b/src/generated/cloud/gsuiteaddons/v1/src/builder.rs
index fca8b9c8e4..1566601e2a 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/builder.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod g_suite_add_ons {
     /// A builder for [GSuiteAddOns][crate::client::GSuiteAddOns].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gsuiteaddons_v1::*;
     /// # use builder::g_suite_add_ons::ClientBuilder;
     /// # use client::GSuiteAddOns;
@@ -30,19 +30,18 @@ pub mod g_suite_add_ons {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::GSuiteAddOns;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = GSuiteAddOns;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod g_suite_add_ons {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::GSuiteAddOns>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod g_suite_add_ons {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::GetAuthorization;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .get_authorization(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAuthorizationRequest::name].
@@ -130,8 +129,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAuthorization {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAuthorization {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -141,7 +140,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::CreateDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -172,7 +171,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -182,7 +181,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .create_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateDeploymentRequest::parent].
@@ -225,8 +224,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -236,7 +235,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::ReplaceDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -267,7 +266,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -277,7 +276,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .replace_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [deployment][crate::model::ReplaceDeploymentRequest::deployment].
@@ -304,8 +303,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReplaceDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReplaceDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -315,7 +314,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::GetDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -343,7 +342,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -353,7 +352,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .get_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDeploymentRequest::name].
@@ -366,8 +365,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -377,8 +376,8 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::ListDeployments;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -409,7 +408,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -419,14 +418,16 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .list_deployments(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -434,15 +435,17 @@ pub mod g_suite_add_ons {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDeploymentsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDeploymentsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -468,8 +471,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDeployments {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDeployments {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -479,7 +482,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::DeleteDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -510,7 +513,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -520,7 +523,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .delete_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteDeploymentRequest::name].
@@ -539,8 +542,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -550,7 +553,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::InstallDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -581,7 +584,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -591,7 +594,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .install_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::InstallDeploymentRequest::name].
@@ -604,8 +607,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for InstallDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for InstallDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -615,7 +618,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::UninstallDeployment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -646,7 +649,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -656,7 +659,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .uninstall_deployment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UninstallDeploymentRequest::name].
@@ -669,8 +672,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UninstallDeployment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UninstallDeployment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -680,7 +683,7 @@ pub mod g_suite_add_ons {
     /// # Example
     /// ```
     /// # use google_cloud_gsuiteaddons_v1::builder::g_suite_add_ons::GetInstallStatus;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_gsuiteaddons_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -711,7 +714,7 @@ pub mod g_suite_add_ons {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -721,7 +724,7 @@ pub mod g_suite_add_ons {
             (*self.0.stub)
                 .get_install_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstallStatusRequest::name].
@@ -734,8 +737,8 @@ pub mod g_suite_add_ons {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstallStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstallStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/client.rs b/src/generated/cloud/gsuiteaddons/v1/src/client.rs
index 9158c48c4e..72ca9b73f3 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/client.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_gsuiteaddons_v1::client::GSuiteAddOns;
 /// let client = GSuiteAddOns::builder().build().await?;
 /// // use `client` to make requests to the Google Workspace add-ons API.
@@ -93,13 +93,13 @@ impl GSuiteAddOns {
     /// Returns a builder for [GSuiteAddOns].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_gsuiteaddons_v1::client::GSuiteAddOns;
     /// let client = GSuiteAddOns::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::g_suite_add_ons::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::g_suite_add_ons::client::Factory)
+        crate::new_client_builder(super::builder::g_suite_add_ons::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -117,14 +117,14 @@ impl GSuiteAddOns {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::GSuiteAddOns>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::GSuiteAddOns>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -133,13 +133,13 @@ impl GSuiteAddOns {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GSuiteAddOns> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GSuiteAddOns> {
         super::transport::GSuiteAddOns::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::GSuiteAddOns> {
+    ) -> crate::ClientBuilderResult<impl super::stub::GSuiteAddOns> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::GSuiteAddOns::new)
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/lib.rs b/src/generated/cloud/gsuiteaddons/v1/src/lib.rs
index 52c420e171..48242834ef 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/lib.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/model.rs b/src/generated/cloud/gsuiteaddons/v1/src/model.rs
index 2334a3a845..83c2030de8 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/model.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/model.rs
@@ -19,7 +19,6 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_apps_script_type;
 extern crate google_cloud_apps_script_type_calendar;
@@ -28,6 +27,7 @@ extern crate google_cloud_apps_script_type_drive;
 extern crate google_cloud_apps_script_type_gmail;
 extern crate google_cloud_apps_script_type_sheets;
 extern crate google_cloud_apps_script_type_slides;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -460,7 +460,7 @@ impl wkt::message::Message for ListDeploymentsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDeploymentsResponse {
     type PageItem = crate::model::Deployment;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/stub.rs b/src/generated/cloud/gsuiteaddons/v1/src/stub.rs
index d0f8bff88f..720cb60b8e 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/stub.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn get_authorization(
         &self,
         _req: crate::model::GetAuthorizationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Authorization>>,
+        Output = crate::Result<crate::Response<crate::model::Authorization>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn create_deployment(
         &self,
         _req: crate::model::CreateDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +63,9 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn replace_deployment(
         &self,
         _req: crate::model::ReplaceDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +73,9 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn get_deployment(
         &self,
         _req: crate::model::GetDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Deployment>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Deployment>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,9 +83,9 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn list_deployments(
         &self,
         _req: crate::model::ListDeploymentsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,8 +94,8 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn delete_deployment(
         &self,
         _req: crate::model::DeleteDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -106,8 +103,8 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn install_deployment(
         &self,
         _req: crate::model::InstallDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -115,8 +112,8 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn uninstall_deployment(
         &self,
         _req: crate::model::UninstallDeploymentRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -124,9 +121,9 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     fn get_install_status(
         &self,
         _req: crate::model::GetInstallStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InstallStatus>>,
+        Output = crate::Result<crate::Response<crate::model::InstallStatus>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/stub/dynamic.rs b/src/generated/cloud/gsuiteaddons/v1/src/stub/dynamic.rs
index 13ee3e7995..74c648ac67 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/stub/dynamic.rs
@@ -20,56 +20,56 @@ pub trait GSuiteAddOns: std::fmt::Debug + Send + Sync {
     async fn get_authorization(
         &self,
         req: crate::model::GetAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Authorization>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Authorization>>;
 
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn replace_deployment(
         &self,
         req: crate::model::ReplaceDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>>;
 
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>>;
 
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn install_deployment(
         &self,
         req: crate::model::InstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn uninstall_deployment(
         &self,
         req: crate::model::UninstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_install_status(
         &self,
         req: crate::model::GetInstallStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstallStatus>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstallStatus>>;
 }
 
 /// All implementations of [super::GSuiteAddOns] also implement [GSuiteAddOns].
@@ -79,8 +79,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn get_authorization(
         &self,
         req: crate::model::GetAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Authorization>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Authorization>> {
         T::get_authorization(self, req, options).await
     }
 
@@ -88,8 +88,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::create_deployment(self, req, options).await
     }
 
@@ -97,8 +97,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn replace_deployment(
         &self,
         req: crate::model::ReplaceDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::replace_deployment(self, req, options).await
     }
 
@@ -106,8 +106,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Deployment>> {
         T::get_deployment(self, req, options).await
     }
 
@@ -115,8 +115,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         T::list_deployments(self, req, options).await
     }
 
@@ -124,8 +124,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_deployment(self, req, options).await
     }
 
@@ -133,8 +133,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn install_deployment(
         &self,
         req: crate::model::InstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::install_deployment(self, req, options).await
     }
 
@@ -142,8 +142,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn uninstall_deployment(
         &self,
         req: crate::model::UninstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::uninstall_deployment(self, req, options).await
     }
 
@@ -151,8 +151,8 @@ impl<T: super::GSuiteAddOns> GSuiteAddOns for T {
     async fn get_install_status(
         &self,
         req: crate::model::GetInstallStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InstallStatus>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InstallStatus>> {
         T::get_install_status(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/tracing.rs b/src/generated/cloud/gsuiteaddons/v1/src/tracing.rs
index 41f8611060..dcd1e332b2 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/tracing.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_authorization(
         &self,
         req: crate::model::GetAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Authorization>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Authorization>> {
         self.inner.get_authorization(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.create_deployment(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn replace_deployment(
         &self,
         req: crate::model::ReplaceDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.replace_deployment(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         self.inner.get_deployment(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         self.inner.list_deployments(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_deployment(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn install_deployment(
         &self,
         req: crate::model::InstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.install_deployment(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn uninstall_deployment(
         &self,
         req: crate::model::UninstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.uninstall_deployment(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_install_status(
         &self,
         req: crate::model::GetInstallStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstallStatus>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstallStatus>> {
         self.inner.get_install_status(req, options).await
     }
 }
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/transport.rs b/src/generated/cloud/gsuiteaddons/v1/src/transport.rs
index 0879f70b1c..a874de192e 100644
--- a/src/generated/cloud/gsuiteaddons/v1/src/transport.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [GSuiteAddOns](super::stub::GSuiteAddOns) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for GSuiteAddOns {
 }
 
 impl GSuiteAddOns {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
     async fn get_authorization(
         &self,
         req: crate::model::GetAuthorizationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Authorization>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Authorization>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -84,9 +84,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -101,13 +101,13 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
     async fn create_deployment(
         &self,
         req: crate::model::CreateDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -135,9 +135,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -152,13 +152,13 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
     async fn replace_deployment(
         &self,
         req: crate::model::ReplaceDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -201,9 +201,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -218,13 +218,13 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
     async fn get_deployment(
         &self,
         req: crate::model::GetDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Deployment>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Deployment>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -261,9 +261,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -278,13 +278,13 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
     async fn list_deployments(
         &self,
         req: crate::model::ListDeploymentsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDeploymentsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDeploymentsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -313,9 +313,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -330,13 +330,13 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
     async fn delete_deployment(
         &self,
         req: crate::model::DeleteDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -374,9 +374,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -385,24 +385,25 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn install_deployment(
         &self,
         req: crate::model::InstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -439,9 +440,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -450,24 +451,25 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn uninstall_deployment(
         &self,
         req: crate::model::UninstallDeploymentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -504,9 +506,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -515,24 +517,25 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_install_status(
         &self,
         req: crate::model::GetInstallStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InstallStatus>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InstallStatus>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -571,9 +574,9 @@ impl super::stub::GSuiteAddOns for GSuiteAddOns {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/iap/v1/Cargo.toml b/src/generated/cloud/iap/v1/Cargo.toml
index a9a6b245a1..869f718d4e 100644
--- a/src/generated/cloud/iap/v1/Cargo.toml
+++ b/src/generated/cloud/iap/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-iam-v1.workspace = true
 lazy_static.workspace         = true
 serde.workspace               = true
diff --git a/src/generated/cloud/iap/v1/src/builder.rs b/src/generated/cloud/iap/v1/src/builder.rs
index ea3edcbe47..1bd6ed9317 100644
--- a/src/generated/cloud/iap/v1/src/builder.rs
+++ b/src/generated/cloud/iap/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod identity_aware_proxy_admin_service {
     /// A builder for [IdentityAwareProxyAdminService][crate::client::IdentityAwareProxyAdminService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_iap_v1::*;
     /// # use builder::identity_aware_proxy_admin_service::ClientBuilder;
     /// # use client::IdentityAwareProxyAdminService;
@@ -30,19 +30,18 @@ pub mod identity_aware_proxy_admin_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::IdentityAwareProxyAdminService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = IdentityAwareProxyAdminService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod identity_aware_proxy_admin_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::IdentityAwareProxyAdminService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod identity_aware_proxy_admin_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -170,8 +169,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -181,7 +180,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -212,7 +211,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -222,7 +221,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -253,8 +252,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -264,7 +263,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -297,7 +296,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +306,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -333,8 +332,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -344,7 +343,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::GetIapSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -372,7 +371,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -382,7 +381,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .get_iap_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIapSettingsRequest::name].
@@ -395,8 +394,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIapSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIapSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -406,7 +405,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::UpdateIapSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -437,7 +436,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -447,7 +446,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .update_iap_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [iap_settings][crate::model::UpdateIapSettingsRequest::iap_settings].
@@ -492,8 +491,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateIapSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateIapSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -503,7 +502,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::ValidateIapAttributeExpression;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -536,7 +535,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -546,7 +545,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .validate_iap_attribute_expression(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ValidateIapAttributeExpressionRequest::name].
@@ -567,8 +566,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateIapAttributeExpression {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateIapAttributeExpression {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -578,8 +577,8 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::ListTunnelDestGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -613,7 +612,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -623,14 +622,16 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .list_tunnel_dest_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTunnelDestGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListTunnelDestGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -638,17 +639,17 @@ pub mod identity_aware_proxy_admin_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListTunnelDestGroupsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -674,8 +675,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTunnelDestGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTunnelDestGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -685,7 +686,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::CreateTunnelDestGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -716,7 +717,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -726,7 +727,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .create_tunnel_dest_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTunnelDestGroupRequest::parent].
@@ -769,8 +770,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTunnelDestGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTunnelDestGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -780,7 +781,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::GetTunnelDestGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -811,7 +812,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -821,7 +822,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .get_tunnel_dest_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTunnelDestGroupRequest::name].
@@ -834,8 +835,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTunnelDestGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTunnelDestGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -845,7 +846,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::DeleteTunnelDestGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -876,7 +877,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -886,7 +887,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .delete_tunnel_dest_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTunnelDestGroupRequest::name].
@@ -899,8 +900,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTunnelDestGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTunnelDestGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -910,7 +911,7 @@ pub mod identity_aware_proxy_admin_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_admin_service::UpdateTunnelDestGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -941,7 +942,7 @@ pub mod identity_aware_proxy_admin_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -951,7 +952,7 @@ pub mod identity_aware_proxy_admin_service {
             (*self.0.stub)
                 .update_tunnel_dest_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [tunnel_dest_group][crate::model::UpdateTunnelDestGroupRequest::tunnel_dest_group].
@@ -996,8 +997,8 @@ pub mod identity_aware_proxy_admin_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTunnelDestGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTunnelDestGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1009,7 +1010,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// A builder for [IdentityAwareProxyOAuthService][crate::client::IdentityAwareProxyOAuthService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_iap_v1::*;
     /// # use builder::identity_aware_proxy_o_auth_service::ClientBuilder;
     /// # use client::IdentityAwareProxyOAuthService;
@@ -1019,19 +1020,18 @@ pub mod identity_aware_proxy_o_auth_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::IdentityAwareProxyOAuthService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = IdentityAwareProxyOAuthService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1042,7 +1042,7 @@ pub mod identity_aware_proxy_o_auth_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::IdentityAwareProxyOAuthService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1055,7 +1055,7 @@ pub mod identity_aware_proxy_o_auth_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1065,7 +1065,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::ListBrands;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1093,7 +1093,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1103,7 +1103,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .list_brands(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListBrandsRequest::parent].
@@ -1116,8 +1116,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBrands {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBrands {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1127,7 +1127,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::CreateBrand;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1155,7 +1155,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1165,7 +1165,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .create_brand(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateBrandRequest::parent].
@@ -1200,8 +1200,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBrand {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBrand {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1211,7 +1211,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::GetBrand;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1239,7 +1239,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1249,7 +1249,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .get_brand(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBrandRequest::name].
@@ -1262,8 +1262,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBrand {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBrand {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1273,7 +1273,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::CreateIdentityAwareProxyClient;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1306,7 +1306,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1316,7 +1316,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .create_identity_aware_proxy_client(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateIdentityAwareProxyClientRequest::parent].
@@ -1354,8 +1354,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateIdentityAwareProxyClient {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateIdentityAwareProxyClient {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1365,8 +1365,8 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::ListIdentityAwareProxyClients;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1402,7 +1402,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1412,15 +1412,15 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .list_identity_aware_proxy_clients(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListIdentityAwareProxyClientsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1429,17 +1429,17 @@ pub mod identity_aware_proxy_o_auth_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListIdentityAwareProxyClientsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1465,8 +1465,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListIdentityAwareProxyClients {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListIdentityAwareProxyClients {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1476,7 +1476,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::GetIdentityAwareProxyClient;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1509,7 +1509,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1519,7 +1519,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .get_identity_aware_proxy_client(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetIdentityAwareProxyClientRequest::name].
@@ -1532,8 +1532,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIdentityAwareProxyClient {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIdentityAwareProxyClient {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1543,7 +1543,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::ResetIdentityAwareProxyClientSecret;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1576,7 +1576,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1586,7 +1586,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .reset_identity_aware_proxy_client_secret(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ResetIdentityAwareProxyClientSecretRequest::name].
@@ -1599,8 +1599,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResetIdentityAwareProxyClientSecret {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResetIdentityAwareProxyClientSecret {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1610,7 +1610,7 @@ pub mod identity_aware_proxy_o_auth_service {
     /// # Example
     /// ```
     /// # use google_cloud_iap_v1::builder::identity_aware_proxy_o_auth_service::DeleteIdentityAwareProxyClient;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_iap_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1643,7 +1643,7 @@ pub mod identity_aware_proxy_o_auth_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1653,7 +1653,7 @@ pub mod identity_aware_proxy_o_auth_service {
             (*self.0.stub)
                 .delete_identity_aware_proxy_client(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteIdentityAwareProxyClientRequest::name].
@@ -1666,8 +1666,8 @@ pub mod identity_aware_proxy_o_auth_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteIdentityAwareProxyClient {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteIdentityAwareProxyClient {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/iap/v1/src/client.rs b/src/generated/cloud/iap/v1/src/client.rs
index 13b632f48e..9fd6c11ec6 100644
--- a/src/generated/cloud/iap/v1/src/client.rs
+++ b/src/generated/cloud/iap/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_iap_v1::client::IdentityAwareProxyAdminService;
 /// let client = IdentityAwareProxyAdminService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Identity-Aware Proxy API.
@@ -66,13 +66,13 @@ impl IdentityAwareProxyAdminService {
     /// Returns a builder for [IdentityAwareProxyAdminService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_iap_v1::client::IdentityAwareProxyAdminService;
     /// let client = IdentityAwareProxyAdminService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::identity_aware_proxy_admin_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::identity_aware_proxy_admin_service::client::Factory,
         )
     }
@@ -92,14 +92,14 @@ impl IdentityAwareProxyAdminService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::IdentityAwareProxyAdminService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -110,13 +110,13 @@ impl IdentityAwareProxyAdminService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IdentityAwareProxyAdminService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IdentityAwareProxyAdminService> {
         super::transport::IdentityAwareProxyAdminService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IdentityAwareProxyAdminService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IdentityAwareProxyAdminService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::IdentityAwareProxyAdminService::new)
@@ -232,7 +232,7 @@ impl IdentityAwareProxyAdminService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_iap_v1::client::IdentityAwareProxyOAuthService;
 /// let client = IdentityAwareProxyOAuthService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Identity-Aware Proxy API.
@@ -280,13 +280,13 @@ impl IdentityAwareProxyOAuthService {
     /// Returns a builder for [IdentityAwareProxyOAuthService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_iap_v1::client::IdentityAwareProxyOAuthService;
     /// let client = IdentityAwareProxyOAuthService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::identity_aware_proxy_o_auth_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
+        crate::new_client_builder(
             super::builder::identity_aware_proxy_o_auth_service::client::Factory,
         )
     }
@@ -306,14 +306,14 @@ impl IdentityAwareProxyOAuthService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::IdentityAwareProxyOAuthService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -324,13 +324,13 @@ impl IdentityAwareProxyOAuthService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IdentityAwareProxyOAuthService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IdentityAwareProxyOAuthService> {
         super::transport::IdentityAwareProxyOAuthService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::IdentityAwareProxyOAuthService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::IdentityAwareProxyOAuthService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::IdentityAwareProxyOAuthService::new)
diff --git a/src/generated/cloud/iap/v1/src/lib.rs b/src/generated/cloud/iap/v1/src/lib.rs
index d78f4583b4..59323a893b 100644
--- a/src/generated/cloud/iap/v1/src/lib.rs
+++ b/src/generated/cloud/iap/v1/src/lib.rs
@@ -47,8 +47,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -83,3 +83,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/iap/v1/src/model.rs b/src/generated/cloud/iap/v1/src/model.rs
index 7af9fdf301..6aea7383b3 100644
--- a/src/generated/cloud/iap/v1/src/model.rs
+++ b/src/generated/cloud/iap/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate lazy_static;
 extern crate serde;
@@ -170,7 +170,7 @@ impl wkt::message::Message for ListTunnelDestGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTunnelDestGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTunnelDestGroupsResponse {
     type PageItem = crate::model::TunnelDestGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3029,7 +3029,9 @@ impl wkt::message::Message for ListIdentityAwareProxyClientsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListIdentityAwareProxyClientsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListIdentityAwareProxyClientsResponse
+{
     type PageItem = crate::model::IdentityAwareProxyClient;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/iap/v1/src/stub.rs b/src/generated/cloud/iap/v1/src/stub.rs
index 05846b14cc..cf9f55f0a4 100644
--- a/src/generated/cloud/iap/v1/src/stub.rs
+++ b/src/generated/cloud/iap/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +64,10 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -77,10 +77,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn get_iap_settings(
         &self,
         _req: crate::model::GetIapSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IapSettings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::IapSettings>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -88,10 +87,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn update_iap_settings(
         &self,
         _req: crate::model::UpdateIapSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IapSettings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::IapSettings>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -99,10 +97,10 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn validate_iap_attribute_expression(
         &self,
         _req: crate::model::ValidateIapAttributeExpressionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ValidateIapAttributeExpressionResponse>,
+            crate::Response<crate::model::ValidateIapAttributeExpressionResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -112,9 +110,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn list_tunnel_dest_groups(
         &self,
         _req: crate::model::ListTunnelDestGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTunnelDestGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTunnelDestGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,9 +121,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn create_tunnel_dest_group(
         &self,
         _req: crate::model::CreateTunnelDestGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TunnelDestGroup>>,
+        Output = crate::Result<crate::Response<crate::model::TunnelDestGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +132,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn get_tunnel_dest_group(
         &self,
         _req: crate::model::GetTunnelDestGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TunnelDestGroup>>,
+        Output = crate::Result<crate::Response<crate::model::TunnelDestGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,8 +143,8 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn delete_tunnel_dest_group(
         &self,
         _req: crate::model::DeleteTunnelDestGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -154,9 +152,9 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     fn update_tunnel_dest_group(
         &self,
         _req: crate::model::UpdateTunnelDestGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::TunnelDestGroup>>,
+        Output = crate::Result<crate::Response<crate::model::TunnelDestGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +176,9 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn list_brands(
         &self,
         _req: crate::model::ListBrandsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBrandsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBrandsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,10 +187,9 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn create_brand(
         &self,
         _req: crate::model::CreateBrandRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Brand>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Brand>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -200,10 +197,9 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn get_brand(
         &self,
         _req: crate::model::GetBrandRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Brand>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Brand>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -211,9 +207,9 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn create_identity_aware_proxy_client(
         &self,
         _req: crate::model::CreateIdentityAwareProxyClientRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>>,
+        Output = crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -222,10 +218,10 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn list_identity_aware_proxy_clients(
         &self,
         _req: crate::model::ListIdentityAwareProxyClientsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListIdentityAwareProxyClientsResponse>,
+            crate::Response<crate::model::ListIdentityAwareProxyClientsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -235,9 +231,9 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn get_identity_aware_proxy_client(
         &self,
         _req: crate::model::GetIdentityAwareProxyClientRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>>,
+        Output = crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -246,9 +242,9 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn reset_identity_aware_proxy_client_secret(
         &self,
         _req: crate::model::ResetIdentityAwareProxyClientSecretRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>>,
+        Output = crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -257,8 +253,8 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     fn delete_identity_aware_proxy_client(
         &self,
         _req: crate::model::DeleteIdentityAwareProxyClientRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/iap/v1/src/stub/dynamic.rs b/src/generated/cloud/iap/v1/src/stub/dynamic.rs
index d368a4a6f3..1fda16d661 100644
--- a/src/generated/cloud/iap/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/iap/v1/src/stub/dynamic.rs
@@ -20,70 +20,68 @@ pub trait IdentityAwareProxyAdminService: std::fmt::Debug + Send + Sync {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn get_iap_settings(
         &self,
         req: crate::model::GetIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IapSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IapSettings>>;
 
     async fn update_iap_settings(
         &self,
         req: crate::model::UpdateIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IapSettings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IapSettings>>;
 
     async fn validate_iap_attribute_expression(
         &self,
         req: crate::model::ValidateIapAttributeExpressionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ValidateIapAttributeExpressionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ValidateIapAttributeExpressionResponse>>;
 
     async fn list_tunnel_dest_groups(
         &self,
         req: crate::model::ListTunnelDestGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTunnelDestGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTunnelDestGroupsResponse>>;
 
     async fn create_tunnel_dest_group(
         &self,
         req: crate::model::CreateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TunnelDestGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TunnelDestGroup>>;
 
     async fn get_tunnel_dest_group(
         &self,
         req: crate::model::GetTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TunnelDestGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TunnelDestGroup>>;
 
     async fn delete_tunnel_dest_group(
         &self,
         req: crate::model::DeleteTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn update_tunnel_dest_group(
         &self,
         req: crate::model::UpdateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TunnelDestGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TunnelDestGroup>>;
 }
 
 /// All implementations of [super::IdentityAwareProxyAdminService] also implement [IdentityAwareProxyAdminService].
@@ -93,8 +91,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -102,8 +100,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -111,10 +109,9 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -122,8 +119,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn get_iap_settings(
         &self,
         req: crate::model::GetIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IapSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IapSettings>> {
         T::get_iap_settings(self, req, options).await
     }
 
@@ -131,8 +128,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn update_iap_settings(
         &self,
         req: crate::model::UpdateIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IapSettings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IapSettings>> {
         T::update_iap_settings(self, req, options).await
     }
 
@@ -140,9 +137,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn validate_iap_attribute_expression(
         &self,
         req: crate::model::ValidateIapAttributeExpressionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ValidateIapAttributeExpressionResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ValidateIapAttributeExpressionResponse>> {
         T::validate_iap_attribute_expression(self, req, options).await
     }
 
@@ -150,8 +146,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn list_tunnel_dest_groups(
         &self,
         req: crate::model::ListTunnelDestGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTunnelDestGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTunnelDestGroupsResponse>> {
         T::list_tunnel_dest_groups(self, req, options).await
     }
 
@@ -159,8 +155,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn create_tunnel_dest_group(
         &self,
         req: crate::model::CreateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TunnelDestGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TunnelDestGroup>> {
         T::create_tunnel_dest_group(self, req, options).await
     }
 
@@ -168,8 +164,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn get_tunnel_dest_group(
         &self,
         req: crate::model::GetTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TunnelDestGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TunnelDestGroup>> {
         T::get_tunnel_dest_group(self, req, options).await
     }
 
@@ -177,8 +173,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn delete_tunnel_dest_group(
         &self,
         req: crate::model::DeleteTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_tunnel_dest_group(self, req, options).await
     }
 
@@ -186,8 +182,8 @@ impl<T: super::IdentityAwareProxyAdminService> IdentityAwareProxyAdminService fo
     async fn update_tunnel_dest_group(
         &self,
         req: crate::model::UpdateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::TunnelDestGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::TunnelDestGroup>> {
         T::update_tunnel_dest_group(self, req, options).await
     }
 }
@@ -198,50 +194,50 @@ pub trait IdentityAwareProxyOAuthService: std::fmt::Debug + Send + Sync {
     async fn list_brands(
         &self,
         req: crate::model::ListBrandsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBrandsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBrandsResponse>>;
 
     async fn create_brand(
         &self,
         req: crate::model::CreateBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Brand>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Brand>>;
 
     async fn get_brand(
         &self,
         req: crate::model::GetBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Brand>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Brand>>;
 
     async fn create_identity_aware_proxy_client(
         &self,
         req: crate::model::CreateIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>>;
 
     async fn list_identity_aware_proxy_clients(
         &self,
         req: crate::model::ListIdentityAwareProxyClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIdentityAwareProxyClientsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIdentityAwareProxyClientsResponse>>;
 
     async fn get_identity_aware_proxy_client(
         &self,
         req: crate::model::GetIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>>;
 
     async fn reset_identity_aware_proxy_client_secret(
         &self,
         req: crate::model::ResetIdentityAwareProxyClientSecretRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>>;
 
     async fn delete_identity_aware_proxy_client(
         &self,
         req: crate::model::DeleteIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::IdentityAwareProxyOAuthService] also implement [IdentityAwareProxyOAuthService].
@@ -251,8 +247,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn list_brands(
         &self,
         req: crate::model::ListBrandsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBrandsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBrandsResponse>> {
         T::list_brands(self, req, options).await
     }
 
@@ -260,8 +256,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn create_brand(
         &self,
         req: crate::model::CreateBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Brand>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Brand>> {
         T::create_brand(self, req, options).await
     }
 
@@ -269,8 +265,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn get_brand(
         &self,
         req: crate::model::GetBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Brand>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Brand>> {
         T::get_brand(self, req, options).await
     }
 
@@ -278,8 +274,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn create_identity_aware_proxy_client(
         &self,
         req: crate::model::CreateIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         T::create_identity_aware_proxy_client(self, req, options).await
     }
 
@@ -287,9 +283,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn list_identity_aware_proxy_clients(
         &self,
         req: crate::model::ListIdentityAwareProxyClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListIdentityAwareProxyClientsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListIdentityAwareProxyClientsResponse>> {
         T::list_identity_aware_proxy_clients(self, req, options).await
     }
 
@@ -297,8 +292,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn get_identity_aware_proxy_client(
         &self,
         req: crate::model::GetIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         T::get_identity_aware_proxy_client(self, req, options).await
     }
 
@@ -306,8 +301,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn reset_identity_aware_proxy_client_secret(
         &self,
         req: crate::model::ResetIdentityAwareProxyClientSecretRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         T::reset_identity_aware_proxy_client_secret(self, req, options).await
     }
 
@@ -315,8 +310,8 @@ impl<T: super::IdentityAwareProxyOAuthService> IdentityAwareProxyOAuthService fo
     async fn delete_identity_aware_proxy_client(
         &self,
         req: crate::model::DeleteIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_identity_aware_proxy_client(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/iap/v1/src/tracing.rs b/src/generated/cloud/iap/v1/src/tracing.rs
index 9d8f966b2c..2f1f0389f0 100644
--- a/src/generated/cloud/iap/v1/src/tracing.rs
+++ b/src/generated/cloud/iap/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -59,9 +59,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -69,8 +68,8 @@ where
     async fn get_iap_settings(
         &self,
         req: crate::model::GetIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IapSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IapSettings>> {
         self.inner.get_iap_settings(req, options).await
     }
 
@@ -78,8 +77,8 @@ where
     async fn update_iap_settings(
         &self,
         req: crate::model::UpdateIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IapSettings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IapSettings>> {
         self.inner.update_iap_settings(req, options).await
     }
 
@@ -87,8 +86,8 @@ where
     async fn validate_iap_attribute_expression(
         &self,
         req: crate::model::ValidateIapAttributeExpressionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ValidateIapAttributeExpressionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ValidateIapAttributeExpressionResponse>> {
         self.inner
             .validate_iap_attribute_expression(req, options)
             .await
@@ -98,8 +97,8 @@ where
     async fn list_tunnel_dest_groups(
         &self,
         req: crate::model::ListTunnelDestGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTunnelDestGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTunnelDestGroupsResponse>> {
         self.inner.list_tunnel_dest_groups(req, options).await
     }
 
@@ -107,8 +106,8 @@ where
     async fn create_tunnel_dest_group(
         &self,
         req: crate::model::CreateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TunnelDestGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TunnelDestGroup>> {
         self.inner.create_tunnel_dest_group(req, options).await
     }
 
@@ -116,8 +115,8 @@ where
     async fn get_tunnel_dest_group(
         &self,
         req: crate::model::GetTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TunnelDestGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TunnelDestGroup>> {
         self.inner.get_tunnel_dest_group(req, options).await
     }
 
@@ -125,8 +124,8 @@ where
     async fn delete_tunnel_dest_group(
         &self,
         req: crate::model::DeleteTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_tunnel_dest_group(req, options).await
     }
 
@@ -134,8 +133,8 @@ where
     async fn update_tunnel_dest_group(
         &self,
         req: crate::model::UpdateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TunnelDestGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TunnelDestGroup>> {
         self.inner.update_tunnel_dest_group(req, options).await
     }
 }
@@ -166,8 +165,8 @@ where
     async fn list_brands(
         &self,
         req: crate::model::ListBrandsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBrandsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBrandsResponse>> {
         self.inner.list_brands(req, options).await
     }
 
@@ -175,8 +174,8 @@ where
     async fn create_brand(
         &self,
         req: crate::model::CreateBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Brand>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Brand>> {
         self.inner.create_brand(req, options).await
     }
 
@@ -184,8 +183,8 @@ where
     async fn get_brand(
         &self,
         req: crate::model::GetBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Brand>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Brand>> {
         self.inner.get_brand(req, options).await
     }
 
@@ -193,8 +192,8 @@ where
     async fn create_identity_aware_proxy_client(
         &self,
         req: crate::model::CreateIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         self.inner
             .create_identity_aware_proxy_client(req, options)
             .await
@@ -204,8 +203,8 @@ where
     async fn list_identity_aware_proxy_clients(
         &self,
         req: crate::model::ListIdentityAwareProxyClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIdentityAwareProxyClientsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIdentityAwareProxyClientsResponse>> {
         self.inner
             .list_identity_aware_proxy_clients(req, options)
             .await
@@ -215,8 +214,8 @@ where
     async fn get_identity_aware_proxy_client(
         &self,
         req: crate::model::GetIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         self.inner
             .get_identity_aware_proxy_client(req, options)
             .await
@@ -226,8 +225,8 @@ where
     async fn reset_identity_aware_proxy_client_secret(
         &self,
         req: crate::model::ResetIdentityAwareProxyClientSecretRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         self.inner
             .reset_identity_aware_proxy_client_secret(req, options)
             .await
@@ -237,8 +236,8 @@ where
     async fn delete_identity_aware_proxy_client(
         &self,
         req: crate::model::DeleteIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .delete_identity_aware_proxy_client(req, options)
             .await
diff --git a/src/generated/cloud/iap/v1/src/transport.rs b/src/generated/cloud/iap/v1/src/transport.rs
index d3adf8f8f1..db47951c6a 100644
--- a/src/generated/cloud/iap/v1/src/transport.rs
+++ b/src/generated/cloud/iap/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [IdentityAwareProxyAdminService](super::stub::IdentityAwareProxyAdminService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for IdentityAwareProxyAdminService {
 }
 
 impl IdentityAwareProxyAdminService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -76,9 +76,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -93,13 +93,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -126,9 +126,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -143,14 +143,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -177,9 +176,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -194,13 +193,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn get_iap_settings(
         &self,
         req: crate::model::GetIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IapSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IapSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -227,9 +226,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -244,13 +243,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn update_iap_settings(
         &self,
         req: crate::model::UpdateIapSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IapSettings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IapSettings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -295,9 +294,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -312,13 +311,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn validate_iap_attribute_expression(
         &self,
         req: crate::model::ValidateIapAttributeExpressionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ValidateIapAttributeExpressionResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ValidateIapAttributeExpressionResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -346,9 +345,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -363,13 +362,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn list_tunnel_dest_groups(
         &self,
         req: crate::model::ListTunnelDestGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTunnelDestGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTunnelDestGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -408,9 +407,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -425,13 +424,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn create_tunnel_dest_group(
         &self,
         req: crate::model::CreateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TunnelDestGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TunnelDestGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -469,9 +468,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -486,13 +485,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn get_tunnel_dest_group(
         &self,
         req: crate::model::GetTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TunnelDestGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TunnelDestGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -533,9 +532,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -550,13 +549,13 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
     async fn delete_tunnel_dest_group(
         &self,
         req: crate::model::DeleteTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -597,9 +596,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -608,24 +607,25 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn update_tunnel_dest_group(
         &self,
         req: crate::model::UpdateTunnelDestGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::TunnelDestGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::TunnelDestGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -684,9 +684,9 @@ impl super::stub::IdentityAwareProxyAdminService for IdentityAwareProxyAdminServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -714,7 +714,7 @@ impl std::fmt::Debug for IdentityAwareProxyOAuthService {
 }
 
 impl IdentityAwareProxyOAuthService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -724,13 +724,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn list_brands(
         &self,
         req: crate::model::ListBrandsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBrandsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBrandsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -757,9 +757,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -774,13 +774,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn create_brand(
         &self,
         req: crate::model::CreateBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Brand>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Brand>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -807,9 +807,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -824,13 +824,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn get_brand(
         &self,
         req: crate::model::GetBrandRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Brand>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Brand>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -867,9 +867,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -884,13 +884,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn create_identity_aware_proxy_client(
         &self,
         req: crate::model::CreateIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -927,9 +927,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -944,13 +944,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn list_identity_aware_proxy_clients(
         &self,
         req: crate::model::ListIdentityAwareProxyClientsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListIdentityAwareProxyClientsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListIdentityAwareProxyClientsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -989,9 +989,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1006,13 +1006,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn get_identity_aware_proxy_client(
         &self,
         req: crate::model::GetIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1053,9 +1053,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1070,13 +1070,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn reset_identity_aware_proxy_client_secret(
         &self,
         req: crate::model::ResetIdentityAwareProxyClientSecretRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::IdentityAwareProxyClient>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::IdentityAwareProxyClient>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1117,9 +1117,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1134,13 +1134,13 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
     async fn delete_identity_aware_proxy_client(
         &self,
         req: crate::model::DeleteIdentityAwareProxyClientRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1181,9 +1181,9 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1192,11 +1192,12 @@ impl super::stub::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthServ
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/ids/v1/Cargo.toml b/src/generated/cloud/ids/v1/Cargo.toml
index e125c987aa..92e679bf32 100644
--- a/src/generated/cloud/ids/v1/Cargo.toml
+++ b/src/generated/cloud/ids/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/ids/v1/src/builder.rs b/src/generated/cloud/ids/v1/src/builder.rs
index 7badecfcf3..a16189348b 100644
--- a/src/generated/cloud/ids/v1/src/builder.rs
+++ b/src/generated/cloud/ids/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod ids {
     /// A builder for [Ids][crate::client::Ids].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_ids_v1::*;
     /// # use builder::ids::ClientBuilder;
     /// # use client::Ids;
@@ -30,19 +30,18 @@ pub mod ids {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Ids;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Ids;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod ids {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Ids>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod ids {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::ListEndpoints;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -104,7 +103,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,13 +113,13 @@ pub mod ids {
             (*self.0.stub)
                 .list_endpoints(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEndpointsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListEndpointsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -129,15 +128,17 @@ pub mod ids {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListEndpointsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListEndpointsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -175,8 +176,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEndpoints {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEndpoints {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -186,7 +187,7 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::GetEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -212,7 +213,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -222,7 +223,7 @@ pub mod ids {
             (*self.0.stub)
                 .get_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEndpointRequest::name].
@@ -235,8 +236,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +247,7 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::CreateEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -273,7 +274,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -288,7 +289,7 @@ pub mod ids {
             (*self.0.stub)
                 .create_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_endpoint`.
@@ -305,7 +306,7 @@ pub mod ids {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -378,8 +379,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -389,7 +390,7 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::DeleteEndpoint;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -416,7 +417,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -431,7 +432,7 @@ pub mod ids {
             (*self.0.stub)
                 .delete_endpoint(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_endpoint`.
@@ -443,7 +444,7 @@ pub mod ids {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -486,8 +487,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteEndpoint {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteEndpoint {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -497,8 +498,8 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -532,7 +533,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -542,15 +543,15 @@ pub mod ids {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -559,17 +560,17 @@ pub mod ids {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -605,8 +606,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -616,7 +617,7 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -645,7 +646,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -655,7 +656,7 @@ pub mod ids {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -666,8 +667,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -677,7 +678,7 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -708,7 +709,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -718,7 +719,7 @@ pub mod ids {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -729,8 +730,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -740,7 +741,7 @@ pub mod ids {
     /// # Example
     /// ```
     /// # use google_cloud_ids_v1::builder::ids::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_ids_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -771,7 +772,7 @@ pub mod ids {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -781,7 +782,7 @@ pub mod ids {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -792,8 +793,8 @@ pub mod ids {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/ids/v1/src/client.rs b/src/generated/cloud/ids/v1/src/client.rs
index 75072ace72..36379f1aff 100644
--- a/src/generated/cloud/ids/v1/src/client.rs
+++ b/src/generated/cloud/ids/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_ids_v1::client::Ids;
 /// let client = Ids::builder().build().await?;
 /// // use `client` to make requests to the Cloud IDS API.
@@ -66,13 +66,13 @@ impl Ids {
     /// Returns a builder for [Ids].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_ids_v1::client::Ids;
     /// let client = Ids::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::ids::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::ids::client::Factory)
+        crate::new_client_builder(super::builder::ids::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Ids {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Ids>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Ids>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Ids {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Ids> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Ids> {
         super::transport::Ids::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Ids> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Ids> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Ids::new)
diff --git a/src/generated/cloud/ids/v1/src/lib.rs b/src/generated/cloud/ids/v1/src/lib.rs
index e8aab0771c..c98d6828f4 100644
--- a/src/generated/cloud/ids/v1/src/lib.rs
+++ b/src/generated/cloud/ids/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/ids/v1/src/model.rs b/src/generated/cloud/ids/v1/src/model.rs
index 0d909b9dc4..066c3f618d 100644
--- a/src/generated/cloud/ids/v1/src/model.rs
+++ b/src/generated/cloud/ids/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -762,7 +762,7 @@ impl wkt::message::Message for ListEndpointsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEndpointsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEndpointsResponse {
     type PageItem = crate::model::Endpoint;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/ids/v1/src/stub.rs b/src/generated/cloud/ids/v1/src/stub.rs
index 3f1de0c5bf..29fd5b6590 100644
--- a/src/generated/cloud/ids/v1/src/stub.rs
+++ b/src/generated/cloud/ids/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn list_endpoints(
         &self,
         _req: crate::model::ListEndpointsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEndpointsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEndpointsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn get_endpoint(
         &self,
         _req: crate::model::GetEndpointRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Endpoint>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Endpoint>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn create_endpoint(
         &self,
         _req: crate::model::CreateEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn delete_endpoint(
         &self,
         _req: crate::model::DeleteEndpointRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,10 +85,10 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -99,9 +98,9 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,8 +109,8 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -119,8 +118,8 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -130,9 +129,9 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -141,8 +140,8 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/ids/v1/src/stub/dynamic.rs b/src/generated/cloud/ids/v1/src/stub/dynamic.rs
index e1a0f2a1c8..63c18a3d72 100644
--- a/src/generated/cloud/ids/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/ids/v1/src/stub/dynamic.rs
@@ -20,62 +20,60 @@ pub trait Ids: std::fmt::Debug + Send + Sync {
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEndpointsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEndpointsResponse>>;
 
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Endpoint>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Endpoint>>;
 
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Ids] also implement [Ids].
@@ -85,8 +83,8 @@ impl<T: super::Ids> Ids for T {
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEndpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEndpointsResponse>> {
         T::list_endpoints(self, req, options).await
     }
 
@@ -94,8 +92,8 @@ impl<T: super::Ids> Ids for T {
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Endpoint>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Endpoint>> {
         T::get_endpoint(self, req, options).await
     }
 
@@ -103,8 +101,8 @@ impl<T: super::Ids> Ids for T {
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_endpoint(self, req, options).await
     }
 
@@ -112,8 +110,8 @@ impl<T: super::Ids> Ids for T {
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_endpoint(self, req, options).await
     }
 
@@ -121,10 +119,9 @@ impl<T: super::Ids> Ids for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -132,8 +129,8 @@ impl<T: super::Ids> Ids for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -141,8 +138,8 @@ impl<T: super::Ids> Ids for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -150,22 +147,22 @@ impl<T: super::Ids> Ids for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/ids/v1/src/tracing.rs b/src/generated/cloud/ids/v1/src/tracing.rs
index 91a5a2fa08..a8a50228aa 100644
--- a/src/generated/cloud/ids/v1/src/tracing.rs
+++ b/src/generated/cloud/ids/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEndpointsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEndpointsResponse>> {
         self.inner.list_endpoints(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Endpoint>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Endpoint>> {
         self.inner.get_endpoint(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_endpoint(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_endpoint(req, options).await
     }
 
@@ -77,9 +77,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -87,8 +86,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -96,8 +95,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -105,22 +104,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/ids/v1/src/transport.rs b/src/generated/cloud/ids/v1/src/transport.rs
index d76a670457..e3d036e2b0 100644
--- a/src/generated/cloud/ids/v1/src/transport.rs
+++ b/src/generated/cloud/ids/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Ids](super::stub::Ids) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -31,7 +31,7 @@ impl std::fmt::Debug for Ids {
 }
 
 impl Ids {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -41,13 +41,13 @@ impl super::stub::Ids for Ids {
     async fn list_endpoints(
         &self,
         req: crate::model::ListEndpointsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEndpointsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEndpointsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -88,9 +88,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -105,13 +105,13 @@ impl super::stub::Ids for Ids {
     async fn get_endpoint(
         &self,
         req: crate::model::GetEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Endpoint>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Endpoint>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -152,9 +152,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -169,13 +169,13 @@ impl super::stub::Ids for Ids {
     async fn create_endpoint(
         &self,
         req: crate::model::CreateEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::Ids for Ids {
     async fn delete_endpoint(
         &self,
         req: crate::model::DeleteEndpointRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -279,9 +279,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -296,14 +296,13 @@ impl super::stub::Ids for Ids {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -345,9 +344,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -362,13 +361,13 @@ impl super::stub::Ids for Ids {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -409,9 +408,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -426,13 +425,13 @@ impl super::stub::Ids for Ids {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -473,9 +472,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -484,24 +483,25 @@ impl super::stub::Ids for Ids {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -542,9 +542,9 @@ impl super::stub::Ids for Ids {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -553,25 +553,26 @@ impl super::stub::Ids for Ids {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/kms/inventory/v1/Cargo.toml b/src/generated/cloud/kms/inventory/v1/Cargo.toml
index ecf5168eed..6892a5509c 100644
--- a/src/generated/cloud/kms/inventory/v1/Cargo.toml
+++ b/src/generated/cloud/kms/inventory/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace         = true
 bytes.workspace               = true
-gax.workspace                 = true
 gaxi                          = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace    = true
 google-cloud-kms-v1.workspace = true
 lazy_static.workspace         = true
 serde.workspace               = true
diff --git a/src/generated/cloud/kms/inventory/v1/src/builder.rs b/src/generated/cloud/kms/inventory/v1/src/builder.rs
index dd0d844c6a..b8f4540cdb 100644
--- a/src/generated/cloud/kms/inventory/v1/src/builder.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod key_dashboard_service {
     /// A builder for [KeyDashboardService][crate::client::KeyDashboardService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_inventory_v1::*;
     /// # use builder::key_dashboard_service::ClientBuilder;
     /// # use client::KeyDashboardService;
@@ -30,19 +30,18 @@ pub mod key_dashboard_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::KeyDashboardService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = KeyDashboardService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod key_dashboard_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::KeyDashboardService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod key_dashboard_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod key_dashboard_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_inventory_v1::builder::key_dashboard_service::ListCryptoKeys;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_inventory_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod key_dashboard_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,14 +117,16 @@ pub mod key_dashboard_service {
             (*self.0.stub)
                 .list_crypto_keys(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCryptoKeysResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCryptoKeysResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -133,15 +134,17 @@ pub mod key_dashboard_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCryptoKeysResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCryptoKeysResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -167,8 +170,8 @@ pub mod key_dashboard_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCryptoKeys {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCryptoKeys {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -180,7 +183,7 @@ pub mod key_tracking_service {
     /// A builder for [KeyTrackingService][crate::client::KeyTrackingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_inventory_v1::*;
     /// # use builder::key_tracking_service::ClientBuilder;
     /// # use client::KeyTrackingService;
@@ -190,19 +193,18 @@ pub mod key_tracking_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::KeyTrackingService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = KeyTrackingService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -213,7 +215,7 @@ pub mod key_tracking_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::KeyTrackingService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -226,7 +228,7 @@ pub mod key_tracking_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -236,7 +238,7 @@ pub mod key_tracking_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_inventory_v1::builder::key_tracking_service::GetProtectedResourcesSummary;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_inventory_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -269,7 +271,7 @@ pub mod key_tracking_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -279,7 +281,7 @@ pub mod key_tracking_service {
             (*self.0.stub)
                 .get_protected_resources_summary(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProtectedResourcesSummaryRequest::name].
@@ -292,8 +294,8 @@ pub mod key_tracking_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProtectedResourcesSummary {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProtectedResourcesSummary {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -303,8 +305,8 @@ pub mod key_tracking_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_inventory_v1::builder::key_tracking_service::SearchProtectedResources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_inventory_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -340,7 +342,7 @@ pub mod key_tracking_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -350,15 +352,15 @@ pub mod key_tracking_service {
             (*self.0.stub)
                 .search_protected_resources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::SearchProtectedResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -367,17 +369,17 @@ pub mod key_tracking_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchProtectedResourcesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -422,8 +424,8 @@ pub mod key_tracking_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchProtectedResources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchProtectedResources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/kms/inventory/v1/src/client.rs b/src/generated/cloud/kms/inventory/v1/src/client.rs
index 980ee1833a..a62fbd435d 100644
--- a/src/generated/cloud/kms/inventory/v1/src/client.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_inventory_v1::client::KeyDashboardService;
 /// let client = KeyDashboardService::builder().build().await?;
 /// // use `client` to make requests to the KMS Inventory API.
@@ -66,15 +66,13 @@ impl KeyDashboardService {
     /// Returns a builder for [KeyDashboardService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_inventory_v1::client::KeyDashboardService;
     /// let client = KeyDashboardService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::key_dashboard_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::key_dashboard_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::key_dashboard_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl KeyDashboardService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::KeyDashboardService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::KeyDashboardService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl KeyDashboardService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KeyDashboardService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KeyDashboardService> {
         super::transport::KeyDashboardService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KeyDashboardService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KeyDashboardService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::KeyDashboardService::new)
@@ -133,7 +131,7 @@ impl KeyDashboardService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_inventory_v1::client::KeyTrackingService;
 /// let client = KeyTrackingService::builder().build().await?;
 /// // use `client` to make requests to the KMS Inventory API.
@@ -180,15 +178,13 @@ impl KeyTrackingService {
     /// Returns a builder for [KeyTrackingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_inventory_v1::client::KeyTrackingService;
     /// let client = KeyTrackingService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::key_tracking_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::key_tracking_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::key_tracking_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -206,14 +202,14 @@ impl KeyTrackingService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::KeyTrackingService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::KeyTrackingService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -223,13 +219,13 @@ impl KeyTrackingService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KeyTrackingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KeyTrackingService> {
         super::transport::KeyTrackingService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KeyTrackingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KeyTrackingService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::KeyTrackingService::new)
diff --git a/src/generated/cloud/kms/inventory/v1/src/lib.rs b/src/generated/cloud/kms/inventory/v1/src/lib.rs
index 0d130581fd..3bb61a39d4 100644
--- a/src/generated/cloud/kms/inventory/v1/src/lib.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/lib.rs
@@ -45,8 +45,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -81,3 +81,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/kms/inventory/v1/src/model.rs b/src/generated/cloud/kms/inventory/v1/src/model.rs
index 61e66b6ec9..e29c7d65aa 100644
--- a/src/generated/cloud/kms/inventory/v1/src/model.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_kms_v1;
 extern crate lazy_static;
 extern crate serde;
@@ -171,7 +171,7 @@ impl wkt::message::Message for ListCryptoKeysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCryptoKeysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCryptoKeysResponse {
     type PageItem = google_cloud_kms_v1::model::CryptoKey;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -559,7 +559,7 @@ impl wkt::message::Message for SearchProtectedResourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchProtectedResourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchProtectedResourcesResponse {
     type PageItem = crate::model::ProtectedResource;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/kms/inventory/v1/src/stub.rs b/src/generated/cloud/kms/inventory/v1/src/stub.rs
index 000c45f6a7..7761e166b9 100644
--- a/src/generated/cloud/kms/inventory/v1/src/stub.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait KeyDashboardService: std::fmt::Debug + Send + Sync {
     fn list_crypto_keys(
         &self,
         _req: crate::model::ListCryptoKeysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCryptoKeysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCryptoKeysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +66,9 @@ pub trait KeyTrackingService: std::fmt::Debug + Send + Sync {
     fn get_protected_resources_summary(
         &self,
         _req: crate::model::GetProtectedResourcesSummaryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ProtectedResourcesSummary>>,
+        Output = crate::Result<crate::Response<crate::model::ProtectedResourcesSummary>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,11 +77,9 @@ pub trait KeyTrackingService: std::fmt::Debug + Send + Sync {
     fn search_protected_resources(
         &self,
         _req: crate::model::SearchProtectedResourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SearchProtectedResourcesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SearchProtectedResourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/kms/inventory/v1/src/stub/dynamic.rs b/src/generated/cloud/kms/inventory/v1/src/stub/dynamic.rs
index 6ed14718f2..8cf39e591e 100644
--- a/src/generated/cloud/kms/inventory/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/stub/dynamic.rs
@@ -20,8 +20,8 @@ pub trait KeyDashboardService: std::fmt::Debug + Send + Sync {
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCryptoKeysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCryptoKeysResponse>>;
 }
 
 /// All implementations of [super::KeyDashboardService] also implement [KeyDashboardService].
@@ -31,8 +31,8 @@ impl<T: super::KeyDashboardService> KeyDashboardService for T {
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCryptoKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCryptoKeysResponse>> {
         T::list_crypto_keys(self, req, options).await
     }
 }
@@ -43,14 +43,14 @@ pub trait KeyTrackingService: std::fmt::Debug + Send + Sync {
     async fn get_protected_resources_summary(
         &self,
         req: crate::model::GetProtectedResourcesSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProtectedResourcesSummary>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProtectedResourcesSummary>>;
 
     async fn search_protected_resources(
         &self,
         req: crate::model::SearchProtectedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchProtectedResourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchProtectedResourcesResponse>>;
 }
 
 /// All implementations of [super::KeyTrackingService] also implement [KeyTrackingService].
@@ -60,8 +60,8 @@ impl<T: super::KeyTrackingService> KeyTrackingService for T {
     async fn get_protected_resources_summary(
         &self,
         req: crate::model::GetProtectedResourcesSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ProtectedResourcesSummary>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ProtectedResourcesSummary>> {
         T::get_protected_resources_summary(self, req, options).await
     }
 
@@ -69,9 +69,8 @@ impl<T: super::KeyTrackingService> KeyTrackingService for T {
     async fn search_protected_resources(
         &self,
         req: crate::model::SearchProtectedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchProtectedResourcesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchProtectedResourcesResponse>> {
         T::search_protected_resources(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/kms/inventory/v1/src/tracing.rs b/src/generated/cloud/kms/inventory/v1/src/tracing.rs
index 234f879379..281d3a0c39 100644
--- a/src/generated/cloud/kms/inventory/v1/src/tracing.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCryptoKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCryptoKeysResponse>> {
         self.inner.list_crypto_keys(req, options).await
     }
 }
@@ -73,8 +73,8 @@ where
     async fn get_protected_resources_summary(
         &self,
         req: crate::model::GetProtectedResourcesSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProtectedResourcesSummary>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProtectedResourcesSummary>> {
         self.inner
             .get_protected_resources_summary(req, options)
             .await
@@ -84,8 +84,8 @@ where
     async fn search_protected_resources(
         &self,
         req: crate::model::SearchProtectedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchProtectedResourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchProtectedResourcesResponse>> {
         self.inner.search_protected_resources(req, options).await
     }
 }
diff --git a/src/generated/cloud/kms/inventory/v1/src/transport.rs b/src/generated/cloud/kms/inventory/v1/src/transport.rs
index 221057172a..d5edfeecfb 100644
--- a/src/generated/cloud/kms/inventory/v1/src/transport.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [KeyDashboardService](super::stub::KeyDashboardService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for KeyDashboardService {
 }
 
 impl KeyDashboardService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::KeyDashboardService for KeyDashboardService {
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCryptoKeysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCryptoKeysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -78,9 +78,9 @@ impl super::stub::KeyDashboardService for KeyDashboardService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -108,7 +108,7 @@ impl std::fmt::Debug for KeyTrackingService {
 }
 
 impl KeyTrackingService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -118,13 +118,13 @@ impl super::stub::KeyTrackingService for KeyTrackingService {
     async fn get_protected_resources_summary(
         &self,
         req: crate::model::GetProtectedResourcesSummaryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ProtectedResourcesSummary>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ProtectedResourcesSummary>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -169,9 +169,9 @@ impl super::stub::KeyTrackingService for KeyTrackingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -186,13 +186,13 @@ impl super::stub::KeyTrackingService for KeyTrackingService {
     async fn search_protected_resources(
         &self,
         req: crate::model::SearchProtectedResourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchProtectedResourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchProtectedResourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -226,9 +226,9 @@ impl super::stub::KeyTrackingService for KeyTrackingService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/kms/v1/Cargo.toml b/src/generated/cloud/kms/v1/Cargo.toml
index db19e58cf9..9577feae82 100644
--- a/src/generated/cloud/kms/v1/Cargo.toml
+++ b/src/generated/cloud/kms/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/kms/v1/src/builder.rs b/src/generated/cloud/kms/v1/src/builder.rs
index 9b5ed6823c..dc992a865c 100644
--- a/src/generated/cloud/kms/v1/src/builder.rs
+++ b/src/generated/cloud/kms/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod autokey {
     /// A builder for [Autokey][crate::client::Autokey].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::*;
     /// # use builder::autokey::ClientBuilder;
     /// # use client::Autokey;
@@ -30,19 +30,18 @@ pub mod autokey {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Autokey;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Autokey;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod autokey {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Autokey>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod autokey {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,7 +73,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::CreateKeyHandle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -101,7 +100,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -116,7 +115,7 @@ pub mod autokey {
             (*self.0.stub)
                 .create_key_handle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_key_handle`.
@@ -133,7 +132,7 @@ pub mod autokey {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -198,8 +197,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateKeyHandle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateKeyHandle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -209,7 +208,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::GetKeyHandle;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -235,7 +234,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -245,7 +244,7 @@ pub mod autokey {
             (*self.0.stub)
                 .get_key_handle(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetKeyHandleRequest::name].
@@ -258,8 +257,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetKeyHandle {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetKeyHandle {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -269,8 +268,8 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::ListKeyHandles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -299,7 +298,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -309,14 +308,16 @@ pub mod autokey {
             (*self.0.stub)
                 .list_key_handles(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListKeyHandlesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListKeyHandlesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -324,15 +325,17 @@ pub mod autokey {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListKeyHandlesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListKeyHandlesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -364,8 +367,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListKeyHandles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListKeyHandles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -375,8 +378,8 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -408,7 +411,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -418,15 +421,15 @@ pub mod autokey {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -435,17 +438,17 @@ pub mod autokey {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -475,8 +478,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -486,7 +489,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -515,7 +518,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -525,7 +528,7 @@ pub mod autokey {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -536,8 +539,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -547,7 +550,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -576,7 +579,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -586,7 +589,7 @@ pub mod autokey {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -639,8 +642,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -650,7 +653,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -679,7 +682,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -689,7 +692,7 @@ pub mod autokey {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -720,8 +723,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -731,7 +734,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -762,7 +765,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -772,7 +775,7 @@ pub mod autokey {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -798,8 +801,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -809,7 +812,7 @@ pub mod autokey {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -838,7 +841,7 @@ pub mod autokey {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -848,7 +851,7 @@ pub mod autokey {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -859,8 +862,8 @@ pub mod autokey {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -872,7 +875,7 @@ pub mod autokey_admin {
     /// A builder for [AutokeyAdmin][crate::client::AutokeyAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::*;
     /// # use builder::autokey_admin::ClientBuilder;
     /// # use client::AutokeyAdmin;
@@ -882,19 +885,18 @@ pub mod autokey_admin {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::AutokeyAdmin;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = AutokeyAdmin;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -905,7 +907,7 @@ pub mod autokey_admin {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::AutokeyAdmin>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -918,7 +920,7 @@ pub mod autokey_admin {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -928,7 +930,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::UpdateAutokeyConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -959,7 +961,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -969,7 +971,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .update_autokey_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [autokey_config][crate::model::UpdateAutokeyConfigRequest::autokey_config].
@@ -1018,8 +1020,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAutokeyConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAutokeyConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1029,7 +1031,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::GetAutokeyConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1060,7 +1062,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1070,7 +1072,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .get_autokey_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAutokeyConfigRequest::name].
@@ -1083,8 +1085,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAutokeyConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAutokeyConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1094,7 +1096,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::ShowEffectiveAutokeyConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1127,7 +1129,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1137,7 +1139,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .show_effective_autokey_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ShowEffectiveAutokeyConfigRequest::parent].
@@ -1150,8 +1152,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ShowEffectiveAutokeyConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ShowEffectiveAutokeyConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1161,8 +1163,8 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1196,7 +1198,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1206,15 +1208,15 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1223,17 +1225,17 @@ pub mod autokey_admin {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1263,8 +1265,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1274,7 +1276,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1305,7 +1307,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1315,7 +1317,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1326,8 +1328,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1337,7 +1339,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1368,7 +1370,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1378,7 +1380,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -1431,8 +1433,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1442,7 +1444,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1473,7 +1475,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1483,7 +1485,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -1514,8 +1516,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1525,7 +1527,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1558,7 +1560,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1568,7 +1570,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -1594,8 +1596,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1605,7 +1607,7 @@ pub mod autokey_admin {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::autokey_admin::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1636,7 +1638,7 @@ pub mod autokey_admin {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1646,7 +1648,7 @@ pub mod autokey_admin {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1657,8 +1659,8 @@ pub mod autokey_admin {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1670,7 +1672,7 @@ pub mod ekm_service {
     /// A builder for [EkmService][crate::client::EkmService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::*;
     /// # use builder::ekm_service::ClientBuilder;
     /// # use client::EkmService;
@@ -1680,19 +1682,18 @@ pub mod ekm_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::EkmService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = EkmService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -1703,7 +1704,7 @@ pub mod ekm_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::EkmService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -1716,7 +1717,7 @@ pub mod ekm_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -1726,8 +1727,8 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::ListEkmConnections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1761,7 +1762,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1771,14 +1772,16 @@ pub mod ekm_service {
             (*self.0.stub)
                 .list_ekm_connections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListEkmConnectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListEkmConnectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1786,17 +1789,17 @@ pub mod ekm_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListEkmConnectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1834,8 +1837,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListEkmConnections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListEkmConnections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1845,7 +1848,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::GetEkmConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1876,7 +1879,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1886,7 +1889,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .get_ekm_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEkmConnectionRequest::name].
@@ -1899,8 +1902,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEkmConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEkmConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1910,7 +1913,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::CreateEkmConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1941,7 +1944,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1951,7 +1954,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .create_ekm_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateEkmConnectionRequest::parent].
@@ -1994,8 +1997,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateEkmConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateEkmConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2005,7 +2008,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::UpdateEkmConnection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2036,7 +2039,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2046,7 +2049,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .update_ekm_connection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [ekm_connection][crate::model::UpdateEkmConnectionRequest::ekm_connection].
@@ -2095,8 +2098,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEkmConnection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEkmConnection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2106,7 +2109,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::GetEkmConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2134,7 +2137,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2144,7 +2147,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .get_ekm_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetEkmConfigRequest::name].
@@ -2157,8 +2160,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetEkmConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetEkmConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2168,7 +2171,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::UpdateEkmConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2196,7 +2199,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2206,7 +2209,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .update_ekm_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [ekm_config][crate::model::UpdateEkmConfigRequest::ekm_config].
@@ -2255,8 +2258,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateEkmConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateEkmConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2266,7 +2269,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::VerifyConnectivity;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2297,7 +2300,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2307,7 +2310,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .verify_connectivity(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::VerifyConnectivityRequest::name].
@@ -2320,8 +2323,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for VerifyConnectivity {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for VerifyConnectivity {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2331,8 +2334,8 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2366,7 +2369,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2376,15 +2379,15 @@ pub mod ekm_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2393,17 +2396,17 @@ pub mod ekm_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2433,8 +2436,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2444,7 +2447,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2475,7 +2478,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2485,7 +2488,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2496,8 +2499,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2507,7 +2510,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2538,7 +2541,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2548,7 +2551,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2601,8 +2604,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2612,7 +2615,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2643,7 +2646,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2653,7 +2656,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -2684,8 +2687,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2695,7 +2698,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2728,7 +2731,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2738,7 +2741,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2764,8 +2767,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2775,7 +2778,7 @@ pub mod ekm_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::ekm_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2806,7 +2809,7 @@ pub mod ekm_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2816,7 +2819,7 @@ pub mod ekm_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2827,8 +2830,8 @@ pub mod ekm_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2840,7 +2843,7 @@ pub mod hsm_management {
     /// A builder for [HsmManagement][crate::client::HsmManagement].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::*;
     /// # use builder::hsm_management::ClientBuilder;
     /// # use client::HsmManagement;
@@ -2850,19 +2853,18 @@ pub mod hsm_management {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::HsmManagement;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = HsmManagement;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2873,7 +2875,7 @@ pub mod hsm_management {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::HsmManagement>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2886,7 +2888,7 @@ pub mod hsm_management {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2896,8 +2898,8 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::ListSingleTenantHsmInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2933,7 +2935,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2943,15 +2945,15 @@ pub mod hsm_management {
             (*self.0.stub)
                 .list_single_tenant_hsm_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListSingleTenantHsmInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2960,17 +2962,17 @@ pub mod hsm_management {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSingleTenantHsmInstancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3014,8 +3016,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSingleTenantHsmInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSingleTenantHsmInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3025,7 +3027,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::GetSingleTenantHsmInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3058,7 +3060,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3068,7 +3070,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .get_single_tenant_hsm_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSingleTenantHsmInstanceRequest::name].
@@ -3081,8 +3083,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSingleTenantHsmInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSingleTenantHsmInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3092,7 +3094,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::CreateSingleTenantHsmInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3126,7 +3128,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3141,7 +3143,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .create_single_tenant_hsm_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_single_tenant_hsm_instance`.
@@ -3160,7 +3162,7 @@ pub mod hsm_management {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3231,8 +3233,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSingleTenantHsmInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSingleTenantHsmInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3242,7 +3244,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::CreateSingleTenantHsmInstanceProposal;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3276,7 +3278,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3291,7 +3293,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .create_single_tenant_hsm_instance_proposal(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_single_tenant_hsm_instance_proposal`.
@@ -3310,7 +3312,7 @@ pub mod hsm_management {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3382,8 +3384,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSingleTenantHsmInstanceProposal {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSingleTenantHsmInstanceProposal {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3393,7 +3395,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::ApproveSingleTenantHsmInstanceProposal;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3428,7 +3430,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3440,7 +3442,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .approve_single_tenant_hsm_instance_proposal(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ApproveSingleTenantHsmInstanceProposalRequest::name].
@@ -3482,8 +3484,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApproveSingleTenantHsmInstanceProposal {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApproveSingleTenantHsmInstanceProposal {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3493,7 +3495,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::ExecuteSingleTenantHsmInstanceProposal;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3529,7 +3531,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3544,7 +3546,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .execute_single_tenant_hsm_instance_proposal(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `execute_single_tenant_hsm_instance_proposal`.
@@ -3563,7 +3565,7 @@ pub mod hsm_management {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3600,8 +3602,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExecuteSingleTenantHsmInstanceProposal {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExecuteSingleTenantHsmInstanceProposal {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3611,7 +3613,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::GetSingleTenantHsmInstanceProposal;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3644,7 +3646,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3654,7 +3656,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .get_single_tenant_hsm_instance_proposal(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSingleTenantHsmInstanceProposalRequest::name].
@@ -3667,8 +3669,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSingleTenantHsmInstanceProposal {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSingleTenantHsmInstanceProposal {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3678,8 +3680,8 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::ListSingleTenantHsmInstanceProposals;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3715,7 +3717,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3727,15 +3729,15 @@ pub mod hsm_management {
             (*self.0.stub)
                 .list_single_tenant_hsm_instance_proposals(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListSingleTenantHsmInstanceProposalsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3744,17 +3746,17 @@ pub mod hsm_management {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListSingleTenantHsmInstanceProposalsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3798,8 +3800,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSingleTenantHsmInstanceProposals {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSingleTenantHsmInstanceProposals {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3809,7 +3811,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::DeleteSingleTenantHsmInstanceProposal;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3842,7 +3844,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3852,7 +3854,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .delete_single_tenant_hsm_instance_proposal(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSingleTenantHsmInstanceProposalRequest::name].
@@ -3865,8 +3867,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSingleTenantHsmInstanceProposal {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSingleTenantHsmInstanceProposal {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3876,8 +3878,8 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3911,7 +3913,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3921,15 +3923,15 @@ pub mod hsm_management {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3938,17 +3940,17 @@ pub mod hsm_management {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3978,8 +3980,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3989,7 +3991,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4020,7 +4022,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4030,7 +4032,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4041,8 +4043,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4052,7 +4054,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4083,7 +4085,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4093,7 +4095,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4146,8 +4148,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4157,7 +4159,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4188,7 +4190,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4198,7 +4200,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4229,8 +4231,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4240,7 +4242,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4273,7 +4275,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4283,7 +4285,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4309,8 +4311,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4320,7 +4322,7 @@ pub mod hsm_management {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::hsm_management::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4351,7 +4353,7 @@ pub mod hsm_management {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4361,7 +4363,7 @@ pub mod hsm_management {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4372,8 +4374,8 @@ pub mod hsm_management {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4385,7 +4387,7 @@ pub mod key_management_service {
     /// A builder for [KeyManagementService][crate::client::KeyManagementService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::*;
     /// # use builder::key_management_service::ClientBuilder;
     /// # use client::KeyManagementService;
@@ -4395,19 +4397,18 @@ pub mod key_management_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::KeyManagementService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = KeyManagementService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -4418,7 +4419,7 @@ pub mod key_management_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::KeyManagementService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -4431,7 +4432,7 @@ pub mod key_management_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -4441,8 +4442,8 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::ListKeyRings;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4473,7 +4474,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4483,13 +4484,13 @@ pub mod key_management_service {
             (*self.0.stub)
                 .list_key_rings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListKeyRingsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListKeyRingsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4498,15 +4499,17 @@ pub mod key_management_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListKeyRingsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListKeyRingsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4544,8 +4547,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListKeyRings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListKeyRings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4555,8 +4558,8 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::ListCryptoKeys;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4587,7 +4590,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4597,14 +4600,16 @@ pub mod key_management_service {
             (*self.0.stub)
                 .list_crypto_keys(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCryptoKeysResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCryptoKeysResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4612,15 +4617,17 @@ pub mod key_management_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListCryptoKeysResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListCryptoKeysResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4667,8 +4674,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCryptoKeys {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCryptoKeys {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4678,8 +4685,8 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::ListCryptoKeyVersions;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4713,7 +4720,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4723,14 +4730,16 @@ pub mod key_management_service {
             (*self.0.stub)
                 .list_crypto_key_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCryptoKeyVersionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCryptoKeyVersionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4738,17 +4747,17 @@ pub mod key_management_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCryptoKeyVersionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4795,8 +4804,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCryptoKeyVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCryptoKeyVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4806,8 +4815,8 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::ListImportJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4838,7 +4847,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4848,14 +4857,16 @@ pub mod key_management_service {
             (*self.0.stub)
                 .list_import_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListImportJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListImportJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4863,15 +4874,17 @@ pub mod key_management_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListImportJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListImportJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4909,8 +4922,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListImportJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListImportJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4920,7 +4933,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetKeyRing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4948,7 +4961,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4958,7 +4971,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_key_ring(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetKeyRingRequest::name].
@@ -4971,8 +4984,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetKeyRing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetKeyRing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4982,7 +4995,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetCryptoKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5010,7 +5023,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5020,7 +5033,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_crypto_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCryptoKeyRequest::name].
@@ -5033,8 +5046,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCryptoKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCryptoKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5044,7 +5057,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetCryptoKeyVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5075,7 +5088,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5085,7 +5098,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_crypto_key_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCryptoKeyVersionRequest::name].
@@ -5098,8 +5111,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCryptoKeyVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCryptoKeyVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5109,7 +5122,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetPublicKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5137,7 +5150,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5147,7 +5160,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_public_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPublicKeyRequest::name].
@@ -5169,8 +5182,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPublicKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPublicKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5180,7 +5193,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5208,7 +5221,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5218,7 +5231,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetImportJobRequest::name].
@@ -5231,8 +5244,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5242,7 +5255,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::CreateKeyRing;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5270,7 +5283,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5280,7 +5293,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .create_key_ring(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateKeyRingRequest::parent].
@@ -5323,8 +5336,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateKeyRing {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateKeyRing {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5334,7 +5347,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::CreateCryptoKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5362,7 +5375,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5372,7 +5385,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .create_crypto_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCryptoKeyRequest::parent].
@@ -5421,8 +5434,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCryptoKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCryptoKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5432,7 +5445,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::CreateCryptoKeyVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5463,7 +5476,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5473,7 +5486,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .create_crypto_key_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateCryptoKeyVersionRequest::parent].
@@ -5508,8 +5521,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCryptoKeyVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCryptoKeyVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5519,7 +5532,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::ImportCryptoKeyVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5550,7 +5563,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5560,7 +5573,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .import_crypto_key_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ImportCryptoKeyVersionRequest::parent].
@@ -5633,8 +5646,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportCryptoKeyVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportCryptoKeyVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5644,7 +5657,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::CreateImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5672,7 +5685,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5682,7 +5695,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .create_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateImportJobRequest::parent].
@@ -5725,8 +5738,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5736,7 +5749,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::UpdateCryptoKey;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5764,7 +5777,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5774,7 +5787,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .update_crypto_key(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [crypto_key][crate::model::UpdateCryptoKeyRequest::crypto_key].
@@ -5823,8 +5836,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCryptoKey {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCryptoKey {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5834,7 +5847,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::UpdateCryptoKeyVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5865,7 +5878,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5875,7 +5888,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .update_crypto_key_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [crypto_key_version][crate::model::UpdateCryptoKeyVersionRequest::crypto_key_version].
@@ -5924,8 +5937,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCryptoKeyVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCryptoKeyVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5935,7 +5948,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::UpdateCryptoKeyPrimaryVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5968,7 +5981,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5978,7 +5991,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .update_crypto_key_primary_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateCryptoKeyPrimaryVersionRequest::name].
@@ -5999,8 +6012,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCryptoKeyPrimaryVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCryptoKeyPrimaryVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6010,7 +6023,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::DestroyCryptoKeyVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6043,7 +6056,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6053,7 +6066,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .destroy_crypto_key_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DestroyCryptoKeyVersionRequest::name].
@@ -6066,8 +6079,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DestroyCryptoKeyVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DestroyCryptoKeyVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6077,7 +6090,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::RestoreCryptoKeyVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6110,7 +6123,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6120,7 +6133,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .restore_crypto_key_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RestoreCryptoKeyVersionRequest::name].
@@ -6133,8 +6146,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreCryptoKeyVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreCryptoKeyVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6144,7 +6157,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::Encrypt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6172,7 +6185,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6182,7 +6195,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .encrypt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::EncryptRequest::name].
@@ -6249,8 +6262,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Encrypt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Encrypt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6260,7 +6273,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::Decrypt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6288,7 +6301,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6298,7 +6311,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .decrypt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DecryptRequest::name].
@@ -6365,8 +6378,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Decrypt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Decrypt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6376,7 +6389,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::RawEncrypt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6404,7 +6417,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6414,7 +6427,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .raw_encrypt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RawEncryptRequest::name].
@@ -6508,8 +6521,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RawEncrypt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RawEncrypt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6519,7 +6532,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::RawDecrypt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6547,7 +6560,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6557,7 +6570,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .raw_decrypt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RawDecryptRequest::name].
@@ -6659,8 +6672,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RawDecrypt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RawDecrypt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6670,7 +6683,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::AsymmetricSign;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6698,7 +6711,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6708,7 +6721,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .asymmetric_sign(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::AsymmetricSignRequest::name].
@@ -6781,8 +6794,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AsymmetricSign {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AsymmetricSign {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6792,7 +6805,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::AsymmetricDecrypt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6823,7 +6836,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6833,7 +6846,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .asymmetric_decrypt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::AsymmetricDecryptRequest::name].
@@ -6872,8 +6885,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AsymmetricDecrypt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AsymmetricDecrypt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6883,7 +6896,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::MacSign;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6911,7 +6924,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6921,7 +6934,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .mac_sign(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::MacSignRequest::name].
@@ -6960,8 +6973,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MacSign {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MacSign {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6971,7 +6984,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::MacVerify;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6999,7 +7012,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7009,7 +7022,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .mac_verify(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::MacVerifyRequest::name].
@@ -7074,8 +7087,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MacVerify {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MacVerify {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7085,7 +7098,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::Decapsulate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7113,7 +7126,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7123,7 +7136,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .decapsulate(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DecapsulateRequest::name].
@@ -7162,8 +7175,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for Decapsulate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for Decapsulate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7173,7 +7186,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GenerateRandomBytes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7204,7 +7217,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7214,7 +7227,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .generate_random_bytes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [location][crate::model::GenerateRandomBytesRequest::location].
@@ -7240,8 +7253,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GenerateRandomBytes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GenerateRandomBytes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7251,8 +7264,8 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7286,7 +7299,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7296,15 +7309,15 @@ pub mod key_management_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7313,17 +7326,17 @@ pub mod key_management_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7353,8 +7366,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7364,7 +7377,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7395,7 +7408,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7405,7 +7418,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -7416,8 +7429,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7427,7 +7440,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7458,7 +7471,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7468,7 +7481,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -7521,8 +7534,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7532,7 +7545,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7563,7 +7576,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7573,7 +7586,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -7604,8 +7617,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7615,7 +7628,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7648,7 +7661,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7658,7 +7671,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -7684,8 +7697,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7695,7 +7708,7 @@ pub mod key_management_service {
     /// # Example
     /// ```
     /// # use google_cloud_kms_v1::builder::key_management_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_kms_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7726,7 +7739,7 @@ pub mod key_management_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7736,7 +7749,7 @@ pub mod key_management_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7747,8 +7760,8 @@ pub mod key_management_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/kms/v1/src/client.rs b/src/generated/cloud/kms/v1/src/client.rs
index 59d0e260e3..8a49cb542d 100644
--- a/src/generated/cloud/kms/v1/src/client.rs
+++ b/src/generated/cloud/kms/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_v1::client::Autokey;
 /// let client = Autokey::builder().build().await?;
 /// // use `client` to make requests to the Cloud Key Management Service (KMS) API.
@@ -88,13 +88,13 @@ impl Autokey {
     /// Returns a builder for [Autokey].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::client::Autokey;
     /// let client = Autokey::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::autokey::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::autokey::client::Factory)
+        crate::new_client_builder(super::builder::autokey::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -112,14 +112,14 @@ impl Autokey {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Autokey>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Autokey>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -128,13 +128,13 @@ impl Autokey {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Autokey> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Autokey> {
         super::transport::Autokey::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Autokey> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Autokey> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Autokey::new)
@@ -226,7 +226,7 @@ impl Autokey {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_v1::client::AutokeyAdmin;
 /// let client = AutokeyAdmin::builder().build().await?;
 /// // use `client` to make requests to the Cloud Key Management Service (KMS) API.
@@ -281,13 +281,13 @@ impl AutokeyAdmin {
     /// Returns a builder for [AutokeyAdmin].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::client::AutokeyAdmin;
     /// let client = AutokeyAdmin::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::autokey_admin::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::autokey_admin::client::Factory)
+        crate::new_client_builder(super::builder::autokey_admin::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -305,14 +305,14 @@ impl AutokeyAdmin {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::AutokeyAdmin>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::AutokeyAdmin>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -321,13 +321,13 @@ impl AutokeyAdmin {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AutokeyAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AutokeyAdmin> {
         super::transport::AutokeyAdmin::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::AutokeyAdmin> {
+    ) -> crate::ClientBuilderResult<impl super::stub::AutokeyAdmin> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::AutokeyAdmin::new)
@@ -411,7 +411,7 @@ impl AutokeyAdmin {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_v1::client::EkmService;
 /// let client = EkmService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Key Management Service (KMS) API.
@@ -464,13 +464,13 @@ impl EkmService {
     /// Returns a builder for [EkmService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::client::EkmService;
     /// let client = EkmService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::ekm_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::ekm_service::client::Factory)
+        crate::new_client_builder(super::builder::ekm_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -488,14 +488,14 @@ impl EkmService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::EkmService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::EkmService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -504,13 +504,13 @@ impl EkmService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EkmService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EkmService> {
         super::transport::EkmService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::EkmService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::EkmService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::EkmService::new)
@@ -621,7 +621,7 @@ impl EkmService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_v1::client::HsmManagement;
 /// let client = HsmManagement::builder().build().await?;
 /// // use `client` to make requests to the Cloud Key Management Service (KMS) API.
@@ -677,13 +677,13 @@ impl HsmManagement {
     /// Returns a builder for [HsmManagement].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::client::HsmManagement;
     /// let client = HsmManagement::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::hsm_management::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::hsm_management::client::Factory)
+        crate::new_client_builder(super::builder::hsm_management::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -701,14 +701,14 @@ impl HsmManagement {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::HsmManagement>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::HsmManagement>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -717,13 +717,13 @@ impl HsmManagement {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HsmManagement> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HsmManagement> {
         super::transport::HsmManagement::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HsmManagement> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HsmManagement> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::HsmManagement::new)
@@ -927,7 +927,7 @@ impl HsmManagement {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_kms_v1::client::KeyManagementService;
 /// let client = KeyManagementService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Key Management Service (KMS) API.
@@ -989,15 +989,13 @@ impl KeyManagementService {
     /// Returns a builder for [KeyManagementService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_kms_v1::client::KeyManagementService;
     /// let client = KeyManagementService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::key_management_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::key_management_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::key_management_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1015,14 +1013,14 @@ impl KeyManagementService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::KeyManagementService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::KeyManagementService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1032,13 +1030,13 @@ impl KeyManagementService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KeyManagementService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KeyManagementService> {
         super::transport::KeyManagementService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::KeyManagementService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::KeyManagementService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::KeyManagementService::new)
diff --git a/src/generated/cloud/kms/v1/src/lib.rs b/src/generated/cloud/kms/v1/src/lib.rs
index 644a20adb1..40bb6ef397 100644
--- a/src/generated/cloud/kms/v1/src/lib.rs
+++ b/src/generated/cloud/kms/v1/src/lib.rs
@@ -50,8 +50,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -86,3 +86,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/kms/v1/src/model.rs b/src/generated/cloud/kms/v1/src/model.rs
index 09f37c33b0..1f4feae1cc 100644
--- a/src/generated/cloud/kms/v1/src/model.rs
+++ b/src/generated/cloud/kms/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -463,7 +463,7 @@ impl wkt::message::Message for ListKeyHandlesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListKeyHandlesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListKeyHandlesResponse {
     type PageItem = crate::model::KeyHandle;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1157,7 +1157,7 @@ impl wkt::message::Message for ListEkmConnectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListEkmConnectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListEkmConnectionsResponse {
     type PageItem = crate::model::EkmConnection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5000,7 +5000,9 @@ impl wkt::message::Message for ListSingleTenantHsmInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSingleTenantHsmInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListSingleTenantHsmInstancesResponse
+{
     type PageItem = crate::model::SingleTenantHsmInstance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6010,7 +6012,9 @@ impl wkt::message::Message for ListSingleTenantHsmInstanceProposalsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSingleTenantHsmInstanceProposalsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListSingleTenantHsmInstanceProposalsResponse
+{
     type PageItem = crate::model::SingleTenantHsmInstanceProposal;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10798,7 +10802,7 @@ impl wkt::message::Message for ListKeyRingsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListKeyRingsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListKeyRingsResponse {
     type PageItem = crate::model::KeyRing;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10903,7 +10907,7 @@ impl wkt::message::Message for ListCryptoKeysResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCryptoKeysResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCryptoKeysResponse {
     type PageItem = crate::model::CryptoKey;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11009,7 +11013,7 @@ impl wkt::message::Message for ListCryptoKeyVersionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCryptoKeyVersionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCryptoKeyVersionsResponse {
     type PageItem = crate::model::CryptoKeyVersion;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11114,7 +11118,7 @@ impl wkt::message::Message for ListImportJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListImportJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListImportJobsResponse {
     type PageItem = crate::model::ImportJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/kms/v1/src/stub.rs b/src/generated/cloud/kms/v1/src/stub.rs
index 15077670bc..fc06067a11 100644
--- a/src/generated/cloud/kms/v1/src/stub.rs
+++ b/src/generated/cloud/kms/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn create_key_handle(
         &self,
         _req: crate::model::CreateKeyHandleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn get_key_handle(
         &self,
         _req: crate::model::GetKeyHandleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KeyHandle>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::KeyHandle>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn list_key_handles(
         &self,
         _req: crate::model::ListKeyHandlesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListKeyHandlesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListKeyHandlesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +74,10 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -88,9 +87,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,9 +98,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -110,9 +109,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -121,10 +120,10 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -134,9 +133,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -147,9 +146,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -158,9 +157,9 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -180,9 +179,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn update_autokey_config(
         &self,
         _req: crate::model::UpdateAutokeyConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutokeyConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AutokeyConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -191,9 +190,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn get_autokey_config(
         &self,
         _req: crate::model::GetAutokeyConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AutokeyConfig>>,
+        Output = crate::Result<crate::Response<crate::model::AutokeyConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -202,11 +201,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn show_effective_autokey_config(
         &self,
         _req: crate::model::ShowEffectiveAutokeyConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ShowEffectiveAutokeyConfigResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ShowEffectiveAutokeyConfigResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -215,10 +212,10 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -228,9 +225,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -239,9 +236,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -250,9 +247,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -261,10 +258,10 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -274,9 +271,9 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -298,9 +295,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn list_ekm_connections(
         &self,
         _req: crate::model::ListEkmConnectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListEkmConnectionsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListEkmConnectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -309,9 +306,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn get_ekm_connection(
         &self,
         _req: crate::model::GetEkmConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EkmConnection>>,
+        Output = crate::Result<crate::Response<crate::model::EkmConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -320,9 +317,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn create_ekm_connection(
         &self,
         _req: crate::model::CreateEkmConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EkmConnection>>,
+        Output = crate::Result<crate::Response<crate::model::EkmConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -331,9 +328,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn update_ekm_connection(
         &self,
         _req: crate::model::UpdateEkmConnectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EkmConnection>>,
+        Output = crate::Result<crate::Response<crate::model::EkmConnection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -342,10 +339,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn get_ekm_config(
         &self,
         _req: crate::model::GetEkmConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EkmConfig>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EkmConfig>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -353,10 +349,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn update_ekm_config(
         &self,
         _req: crate::model::UpdateEkmConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EkmConfig>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::EkmConfig>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -364,9 +359,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn verify_connectivity(
         &self,
         _req: crate::model::VerifyConnectivityRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VerifyConnectivityResponse>>,
+        Output = crate::Result<crate::Response<crate::model::VerifyConnectivityResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -375,10 +370,10 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -388,9 +383,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -399,9 +394,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -410,9 +405,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -421,10 +416,10 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -434,9 +429,9 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -458,11 +453,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn list_single_tenant_hsm_instances(
         &self,
         _req: crate::model::ListSingleTenantHsmInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListSingleTenantHsmInstancesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListSingleTenantHsmInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -471,9 +464,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn get_single_tenant_hsm_instance(
         &self,
         _req: crate::model::GetSingleTenantHsmInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SingleTenantHsmInstance>>,
+        Output = crate::Result<crate::Response<crate::model::SingleTenantHsmInstance>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -482,9 +475,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn create_single_tenant_hsm_instance(
         &self,
         _req: crate::model::CreateSingleTenantHsmInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -493,9 +486,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn create_single_tenant_hsm_instance_proposal(
         &self,
         _req: crate::model::CreateSingleTenantHsmInstanceProposalRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -504,10 +497,10 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn approve_single_tenant_hsm_instance_proposal(
         &self,
         _req: crate::model::ApproveSingleTenantHsmInstanceProposalRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>,
+            crate::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -517,9 +510,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn execute_single_tenant_hsm_instance_proposal(
         &self,
         _req: crate::model::ExecuteSingleTenantHsmInstanceProposalRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -528,11 +521,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn get_single_tenant_hsm_instance_proposal(
         &self,
         _req: crate::model::GetSingleTenantHsmInstanceProposalRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SingleTenantHsmInstanceProposal>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SingleTenantHsmInstanceProposal>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -541,10 +532,10 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn list_single_tenant_hsm_instance_proposals(
         &self,
         _req: crate::model::ListSingleTenantHsmInstanceProposalsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>,
+            crate::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -554,8 +545,8 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn delete_single_tenant_hsm_instance_proposal(
         &self,
         _req: crate::model::DeleteSingleTenantHsmInstanceProposalRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -563,10 +554,10 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -576,9 +567,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -587,9 +578,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -598,9 +589,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -609,10 +600,10 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -622,9 +613,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -635,9 +626,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -646,9 +637,9 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -668,9 +659,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn list_key_rings(
         &self,
         _req: crate::model::ListKeyRingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListKeyRingsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListKeyRingsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -679,9 +670,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn list_crypto_keys(
         &self,
         _req: crate::model::ListCryptoKeysRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCryptoKeysResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCryptoKeysResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -690,11 +681,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn list_crypto_key_versions(
         &self,
         _req: crate::model::ListCryptoKeyVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListCryptoKeyVersionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListCryptoKeyVersionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -703,9 +692,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn list_import_jobs(
         &self,
         _req: crate::model::ListImportJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListImportJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListImportJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -714,10 +703,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_key_ring(
         &self,
         _req: crate::model::GetKeyRingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KeyRing>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::KeyRing>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -725,10 +713,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_crypto_key(
         &self,
         _req: crate::model::GetCryptoKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CryptoKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -736,9 +723,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_crypto_key_version(
         &self,
         _req: crate::model::GetCryptoKeyVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>,
+        Output = crate::Result<crate::Response<crate::model::CryptoKeyVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -747,10 +734,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_public_key(
         &self,
         _req: crate::model::GetPublicKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PublicKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::PublicKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -758,10 +744,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_import_job(
         &self,
         _req: crate::model::GetImportJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImportJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ImportJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -769,10 +754,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn create_key_ring(
         &self,
         _req: crate::model::CreateKeyRingRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KeyRing>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::KeyRing>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -780,10 +764,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn create_crypto_key(
         &self,
         _req: crate::model::CreateCryptoKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CryptoKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -791,9 +774,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn create_crypto_key_version(
         &self,
         _req: crate::model::CreateCryptoKeyVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>,
+        Output = crate::Result<crate::Response<crate::model::CryptoKeyVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -802,9 +785,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn import_crypto_key_version(
         &self,
         _req: crate::model::ImportCryptoKeyVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>,
+        Output = crate::Result<crate::Response<crate::model::CryptoKeyVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -813,10 +796,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn create_import_job(
         &self,
         _req: crate::model::CreateImportJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImportJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ImportJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -824,10 +806,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn update_crypto_key(
         &self,
         _req: crate::model::UpdateCryptoKeyRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CryptoKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -835,9 +816,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn update_crypto_key_version(
         &self,
         _req: crate::model::UpdateCryptoKeyVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>,
+        Output = crate::Result<crate::Response<crate::model::CryptoKeyVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -846,10 +827,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn update_crypto_key_primary_version(
         &self,
         _req: crate::model::UpdateCryptoKeyPrimaryVersionRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKey>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::CryptoKey>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -857,9 +837,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn destroy_crypto_key_version(
         &self,
         _req: crate::model::DestroyCryptoKeyVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>,
+        Output = crate::Result<crate::Response<crate::model::CryptoKeyVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -868,9 +848,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn restore_crypto_key_version(
         &self,
         _req: crate::model::RestoreCryptoKeyVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>,
+        Output = crate::Result<crate::Response<crate::model::CryptoKeyVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -879,9 +859,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn encrypt(
         &self,
         _req: crate::model::EncryptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::EncryptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::EncryptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -890,9 +870,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn decrypt(
         &self,
         _req: crate::model::DecryptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DecryptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DecryptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -901,9 +881,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn raw_encrypt(
         &self,
         _req: crate::model::RawEncryptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RawEncryptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RawEncryptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -912,9 +892,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn raw_decrypt(
         &self,
         _req: crate::model::RawDecryptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RawDecryptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RawDecryptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -923,9 +903,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn asymmetric_sign(
         &self,
         _req: crate::model::AsymmetricSignRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AsymmetricSignResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AsymmetricSignResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -934,9 +914,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn asymmetric_decrypt(
         &self,
         _req: crate::model::AsymmetricDecryptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AsymmetricDecryptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AsymmetricDecryptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -945,9 +925,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn mac_sign(
         &self,
         _req: crate::model::MacSignRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MacSignResponse>>,
+        Output = crate::Result<crate::Response<crate::model::MacSignResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -956,9 +936,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn mac_verify(
         &self,
         _req: crate::model::MacVerifyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MacVerifyResponse>>,
+        Output = crate::Result<crate::Response<crate::model::MacVerifyResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -967,9 +947,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn decapsulate(
         &self,
         _req: crate::model::DecapsulateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::DecapsulateResponse>>,
+        Output = crate::Result<crate::Response<crate::model::DecapsulateResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -978,9 +958,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn generate_random_bytes(
         &self,
         _req: crate::model::GenerateRandomBytesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::GenerateRandomBytesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::GenerateRandomBytesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -989,10 +969,10 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1002,9 +982,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1013,9 +993,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1024,9 +1004,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1035,10 +1015,10 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1048,9 +1028,9 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/kms/v1/src/stub/dynamic.rs b/src/generated/cloud/kms/v1/src/stub/dynamic.rs
index f7296aa3bc..05ec530fe7 100644
--- a/src/generated/cloud/kms/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/kms/v1/src/stub/dynamic.rs
@@ -20,68 +20,66 @@ pub trait Autokey: std::fmt::Debug + Send + Sync {
     async fn create_key_handle(
         &self,
         req: crate::model::CreateKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_key_handle(
         &self,
         req: crate::model::GetKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KeyHandle>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KeyHandle>>;
 
     async fn list_key_handles(
         &self,
         req: crate::model::ListKeyHandlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKeyHandlesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKeyHandlesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Autokey] also implement [Autokey].
@@ -91,8 +89,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn create_key_handle(
         &self,
         req: crate::model::CreateKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_key_handle(self, req, options).await
     }
 
@@ -100,8 +98,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn get_key_handle(
         &self,
         req: crate::model::GetKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KeyHandle>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KeyHandle>> {
         T::get_key_handle(self, req, options).await
     }
 
@@ -109,8 +107,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn list_key_handles(
         &self,
         req: crate::model::ListKeyHandlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKeyHandlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKeyHandlesResponse>> {
         T::list_key_handles(self, req, options).await
     }
 
@@ -118,9 +116,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -128,8 +125,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -137,8 +134,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -146,8 +143,8 @@ impl<T: super::Autokey> Autokey for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -155,10 +152,9 @@ impl<T: super::Autokey> Autokey for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -166,22 +162,22 @@ impl<T: super::Autokey> Autokey for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -192,58 +188,56 @@ pub trait AutokeyAdmin: std::fmt::Debug + Send + Sync {
     async fn update_autokey_config(
         &self,
         req: crate::model::UpdateAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutokeyConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutokeyConfig>>;
 
     async fn get_autokey_config(
         &self,
         req: crate::model::GetAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutokeyConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutokeyConfig>>;
 
     async fn show_effective_autokey_config(
         &self,
         req: crate::model::ShowEffectiveAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ShowEffectiveAutokeyConfigResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ShowEffectiveAutokeyConfigResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::AutokeyAdmin] also implement [AutokeyAdmin].
@@ -253,8 +247,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn update_autokey_config(
         &self,
         req: crate::model::UpdateAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutokeyConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutokeyConfig>> {
         T::update_autokey_config(self, req, options).await
     }
 
@@ -262,8 +256,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn get_autokey_config(
         &self,
         req: crate::model::GetAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AutokeyConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AutokeyConfig>> {
         T::get_autokey_config(self, req, options).await
     }
 
@@ -271,9 +265,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn show_effective_autokey_config(
         &self,
         req: crate::model::ShowEffectiveAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ShowEffectiveAutokeyConfigResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ShowEffectiveAutokeyConfigResponse>> {
         T::show_effective_autokey_config(self, req, options).await
     }
 
@@ -281,9 +274,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -291,8 +283,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -300,8 +292,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -309,8 +301,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -318,10 +310,9 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -329,8 +320,8 @@ impl<T: super::AutokeyAdmin> AutokeyAdmin for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
@@ -341,82 +332,80 @@ pub trait EkmService: std::fmt::Debug + Send + Sync {
     async fn list_ekm_connections(
         &self,
         req: crate::model::ListEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEkmConnectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEkmConnectionsResponse>>;
 
     async fn get_ekm_connection(
         &self,
         req: crate::model::GetEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnection>>;
 
     async fn create_ekm_connection(
         &self,
         req: crate::model::CreateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnection>>;
 
     async fn update_ekm_connection(
         &self,
         req: crate::model::UpdateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnection>>;
 
     async fn get_ekm_config(
         &self,
         req: crate::model::GetEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConfig>>;
 
     async fn update_ekm_config(
         &self,
         req: crate::model::UpdateEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConfig>>;
 
     async fn verify_connectivity(
         &self,
         req: crate::model::VerifyConnectivityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyConnectivityResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyConnectivityResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::EkmService] also implement [EkmService].
@@ -426,8 +415,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn list_ekm_connections(
         &self,
         req: crate::model::ListEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListEkmConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListEkmConnectionsResponse>> {
         T::list_ekm_connections(self, req, options).await
     }
 
@@ -435,8 +424,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn get_ekm_connection(
         &self,
         req: crate::model::GetEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnection>> {
         T::get_ekm_connection(self, req, options).await
     }
 
@@ -444,8 +433,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn create_ekm_connection(
         &self,
         req: crate::model::CreateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnection>> {
         T::create_ekm_connection(self, req, options).await
     }
 
@@ -453,8 +442,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn update_ekm_connection(
         &self,
         req: crate::model::UpdateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConnection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConnection>> {
         T::update_ekm_connection(self, req, options).await
     }
 
@@ -462,8 +451,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn get_ekm_config(
         &self,
         req: crate::model::GetEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConfig>> {
         T::get_ekm_config(self, req, options).await
     }
 
@@ -471,8 +460,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn update_ekm_config(
         &self,
         req: crate::model::UpdateEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EkmConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EkmConfig>> {
         T::update_ekm_config(self, req, options).await
     }
 
@@ -480,8 +469,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn verify_connectivity(
         &self,
         req: crate::model::VerifyConnectivityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyConnectivityResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyConnectivityResponse>> {
         T::verify_connectivity(self, req, options).await
     }
 
@@ -489,9 +478,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -499,8 +487,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -508,8 +496,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -517,8 +505,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -526,10 +514,9 @@ impl<T: super::EkmService> EkmService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -537,8 +524,8 @@ impl<T: super::EkmService> EkmService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
@@ -549,108 +536,102 @@ pub trait HsmManagement: std::fmt::Debug + Send + Sync {
     async fn list_single_tenant_hsm_instances(
         &self,
         req: crate::model::ListSingleTenantHsmInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSingleTenantHsmInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSingleTenantHsmInstancesResponse>>;
 
     async fn get_single_tenant_hsm_instance(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SingleTenantHsmInstance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SingleTenantHsmInstance>>;
 
     async fn create_single_tenant_hsm_instance(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn approve_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ApproveSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>>;
 
     async fn execute_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ExecuteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SingleTenantHsmInstanceProposal>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SingleTenantHsmInstanceProposal>>;
 
     async fn list_single_tenant_hsm_instance_proposals(
         &self,
         req: crate::model::ListSingleTenantHsmInstanceProposalsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>>;
 
     async fn delete_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::DeleteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::HsmManagement] also implement [HsmManagement].
@@ -660,9 +641,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn list_single_tenant_hsm_instances(
         &self,
         req: crate::model::ListSingleTenantHsmInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSingleTenantHsmInstancesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSingleTenantHsmInstancesResponse>> {
         T::list_single_tenant_hsm_instances(self, req, options).await
     }
 
@@ -670,8 +650,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn get_single_tenant_hsm_instance(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SingleTenantHsmInstance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SingleTenantHsmInstance>> {
         T::get_single_tenant_hsm_instance(self, req, options).await
     }
 
@@ -679,8 +659,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn create_single_tenant_hsm_instance(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_single_tenant_hsm_instance(self, req, options).await
     }
 
@@ -688,8 +668,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn create_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_single_tenant_hsm_instance_proposal(self, req, options).await
     }
 
@@ -697,10 +677,9 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn approve_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ApproveSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>>
+    {
         T::approve_single_tenant_hsm_instance_proposal(self, req, options).await
     }
 
@@ -708,8 +687,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn execute_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ExecuteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::execute_single_tenant_hsm_instance_proposal(self, req, options).await
     }
 
@@ -717,8 +696,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn get_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SingleTenantHsmInstanceProposal>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SingleTenantHsmInstanceProposal>> {
         T::get_single_tenant_hsm_instance_proposal(self, req, options).await
     }
 
@@ -726,10 +705,9 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn list_single_tenant_hsm_instance_proposals(
         &self,
         req: crate::model::ListSingleTenantHsmInstanceProposalsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>>
+    {
         T::list_single_tenant_hsm_instance_proposals(self, req, options).await
     }
 
@@ -737,8 +715,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn delete_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::DeleteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_single_tenant_hsm_instance_proposal(self, req, options).await
     }
 
@@ -746,9 +724,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -756,8 +733,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -765,8 +742,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -774,8 +751,8 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -783,10 +760,9 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -794,22 +770,22 @@ impl<T: super::HsmManagement> HsmManagement for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -820,214 +796,212 @@ pub trait KeyManagementService: std::fmt::Debug + Send + Sync {
     async fn list_key_rings(
         &self,
         req: crate::model::ListKeyRingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKeyRingsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKeyRingsResponse>>;
 
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCryptoKeysResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCryptoKeysResponse>>;
 
     async fn list_crypto_key_versions(
         &self,
         req: crate::model::ListCryptoKeyVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCryptoKeyVersionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCryptoKeyVersionsResponse>>;
 
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListImportJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListImportJobsResponse>>;
 
     async fn get_key_ring(
         &self,
         req: crate::model::GetKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KeyRing>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KeyRing>>;
 
     async fn get_crypto_key(
         &self,
         req: crate::model::GetCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>>;
 
     async fn get_crypto_key_version(
         &self,
         req: crate::model::GetCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>>;
 
     async fn get_public_key(
         &self,
         req: crate::model::GetPublicKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicKey>>;
 
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportJob>>;
 
     async fn create_key_ring(
         &self,
         req: crate::model::CreateKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KeyRing>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KeyRing>>;
 
     async fn create_crypto_key(
         &self,
         req: crate::model::CreateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>>;
 
     async fn create_crypto_key_version(
         &self,
         req: crate::model::CreateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>>;
 
     async fn import_crypto_key_version(
         &self,
         req: crate::model::ImportCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>>;
 
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportJob>>;
 
     async fn update_crypto_key(
         &self,
         req: crate::model::UpdateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>>;
 
     async fn update_crypto_key_version(
         &self,
         req: crate::model::UpdateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>>;
 
     async fn update_crypto_key_primary_version(
         &self,
         req: crate::model::UpdateCryptoKeyPrimaryVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>>;
 
     async fn destroy_crypto_key_version(
         &self,
         req: crate::model::DestroyCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>>;
 
     async fn restore_crypto_key_version(
         &self,
         req: crate::model::RestoreCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>>;
 
     async fn encrypt(
         &self,
         req: crate::model::EncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptResponse>>;
 
     async fn decrypt(
         &self,
         req: crate::model::DecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DecryptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DecryptResponse>>;
 
     async fn raw_encrypt(
         &self,
         req: crate::model::RawEncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RawEncryptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RawEncryptResponse>>;
 
     async fn raw_decrypt(
         &self,
         req: crate::model::RawDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RawDecryptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RawDecryptResponse>>;
 
     async fn asymmetric_sign(
         &self,
         req: crate::model::AsymmetricSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AsymmetricSignResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AsymmetricSignResponse>>;
 
     async fn asymmetric_decrypt(
         &self,
         req: crate::model::AsymmetricDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AsymmetricDecryptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AsymmetricDecryptResponse>>;
 
     async fn mac_sign(
         &self,
         req: crate::model::MacSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MacSignResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MacSignResponse>>;
 
     async fn mac_verify(
         &self,
         req: crate::model::MacVerifyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MacVerifyResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MacVerifyResponse>>;
 
     async fn decapsulate(
         &self,
         req: crate::model::DecapsulateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DecapsulateResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DecapsulateResponse>>;
 
     async fn generate_random_bytes(
         &self,
         req: crate::model::GenerateRandomBytesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateRandomBytesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateRandomBytesResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 }
 
 /// All implementations of [super::KeyManagementService] also implement [KeyManagementService].
@@ -1037,8 +1011,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn list_key_rings(
         &self,
         req: crate::model::ListKeyRingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKeyRingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKeyRingsResponse>> {
         T::list_key_rings(self, req, options).await
     }
 
@@ -1046,8 +1020,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCryptoKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCryptoKeysResponse>> {
         T::list_crypto_keys(self, req, options).await
     }
 
@@ -1055,8 +1029,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn list_crypto_key_versions(
         &self,
         req: crate::model::ListCryptoKeyVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCryptoKeyVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCryptoKeyVersionsResponse>> {
         T::list_crypto_key_versions(self, req, options).await
     }
 
@@ -1064,8 +1038,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListImportJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListImportJobsResponse>> {
         T::list_import_jobs(self, req, options).await
     }
 
@@ -1073,8 +1047,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_key_ring(
         &self,
         req: crate::model::GetKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KeyRing>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KeyRing>> {
         T::get_key_ring(self, req, options).await
     }
 
@@ -1082,8 +1056,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_crypto_key(
         &self,
         req: crate::model::GetCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>> {
         T::get_crypto_key(self, req, options).await
     }
 
@@ -1091,8 +1065,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_crypto_key_version(
         &self,
         req: crate::model::GetCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>> {
         T::get_crypto_key_version(self, req, options).await
     }
 
@@ -1100,8 +1074,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_public_key(
         &self,
         req: crate::model::GetPublicKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PublicKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PublicKey>> {
         T::get_public_key(self, req, options).await
     }
 
@@ -1109,8 +1083,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportJob>> {
         T::get_import_job(self, req, options).await
     }
 
@@ -1118,8 +1092,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn create_key_ring(
         &self,
         req: crate::model::CreateKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KeyRing>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KeyRing>> {
         T::create_key_ring(self, req, options).await
     }
 
@@ -1127,8 +1101,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn create_crypto_key(
         &self,
         req: crate::model::CreateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>> {
         T::create_crypto_key(self, req, options).await
     }
 
@@ -1136,8 +1110,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn create_crypto_key_version(
         &self,
         req: crate::model::CreateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>> {
         T::create_crypto_key_version(self, req, options).await
     }
 
@@ -1145,8 +1119,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn import_crypto_key_version(
         &self,
         req: crate::model::ImportCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>> {
         T::import_crypto_key_version(self, req, options).await
     }
 
@@ -1154,8 +1128,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportJob>> {
         T::create_import_job(self, req, options).await
     }
 
@@ -1163,8 +1137,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn update_crypto_key(
         &self,
         req: crate::model::UpdateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>> {
         T::update_crypto_key(self, req, options).await
     }
 
@@ -1172,8 +1146,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn update_crypto_key_version(
         &self,
         req: crate::model::UpdateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>> {
         T::update_crypto_key_version(self, req, options).await
     }
 
@@ -1181,8 +1155,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn update_crypto_key_primary_version(
         &self,
         req: crate::model::UpdateCryptoKeyPrimaryVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKey>> {
         T::update_crypto_key_primary_version(self, req, options).await
     }
 
@@ -1190,8 +1164,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn destroy_crypto_key_version(
         &self,
         req: crate::model::DestroyCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>> {
         T::destroy_crypto_key_version(self, req, options).await
     }
 
@@ -1199,8 +1173,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn restore_crypto_key_version(
         &self,
         req: crate::model::RestoreCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CryptoKeyVersion>> {
         T::restore_crypto_key_version(self, req, options).await
     }
 
@@ -1208,8 +1182,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn encrypt(
         &self,
         req: crate::model::EncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::EncryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::EncryptResponse>> {
         T::encrypt(self, req, options).await
     }
 
@@ -1217,8 +1191,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn decrypt(
         &self,
         req: crate::model::DecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DecryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DecryptResponse>> {
         T::decrypt(self, req, options).await
     }
 
@@ -1226,8 +1200,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn raw_encrypt(
         &self,
         req: crate::model::RawEncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RawEncryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RawEncryptResponse>> {
         T::raw_encrypt(self, req, options).await
     }
 
@@ -1235,8 +1209,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn raw_decrypt(
         &self,
         req: crate::model::RawDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RawDecryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RawDecryptResponse>> {
         T::raw_decrypt(self, req, options).await
     }
 
@@ -1244,8 +1218,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn asymmetric_sign(
         &self,
         req: crate::model::AsymmetricSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AsymmetricSignResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AsymmetricSignResponse>> {
         T::asymmetric_sign(self, req, options).await
     }
 
@@ -1253,8 +1227,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn asymmetric_decrypt(
         &self,
         req: crate::model::AsymmetricDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AsymmetricDecryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AsymmetricDecryptResponse>> {
         T::asymmetric_decrypt(self, req, options).await
     }
 
@@ -1262,8 +1236,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn mac_sign(
         &self,
         req: crate::model::MacSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MacSignResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MacSignResponse>> {
         T::mac_sign(self, req, options).await
     }
 
@@ -1271,8 +1245,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn mac_verify(
         &self,
         req: crate::model::MacVerifyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MacVerifyResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MacVerifyResponse>> {
         T::mac_verify(self, req, options).await
     }
 
@@ -1280,8 +1254,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn decapsulate(
         &self,
         req: crate::model::DecapsulateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::DecapsulateResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::DecapsulateResponse>> {
         T::decapsulate(self, req, options).await
     }
 
@@ -1289,8 +1263,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn generate_random_bytes(
         &self,
         req: crate::model::GenerateRandomBytesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::GenerateRandomBytesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::GenerateRandomBytesResponse>> {
         T::generate_random_bytes(self, req, options).await
     }
 
@@ -1298,9 +1272,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1308,8 +1281,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1317,8 +1290,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1326,8 +1299,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1335,10 +1308,9 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1346,8 +1318,8 @@ impl<T: super::KeyManagementService> KeyManagementService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/kms/v1/src/tracing.rs b/src/generated/cloud/kms/v1/src/tracing.rs
index 71f7aeb100..fd3a266222 100644
--- a/src/generated/cloud/kms/v1/src/tracing.rs
+++ b/src/generated/cloud/kms/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_key_handle(
         &self,
         req: crate::model::CreateKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_key_handle(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_key_handle(
         &self,
         req: crate::model::GetKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KeyHandle>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KeyHandle>> {
         self.inner.get_key_handle(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_key_handles(
         &self,
         req: crate::model::ListKeyHandlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKeyHandlesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKeyHandlesResponse>> {
         self.inner.list_key_handles(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -104,9 +104,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -114,22 +113,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -160,8 +159,8 @@ where
     async fn update_autokey_config(
         &self,
         req: crate::model::UpdateAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutokeyConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutokeyConfig>> {
         self.inner.update_autokey_config(req, options).await
     }
 
@@ -169,8 +168,8 @@ where
     async fn get_autokey_config(
         &self,
         req: crate::model::GetAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutokeyConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutokeyConfig>> {
         self.inner.get_autokey_config(req, options).await
     }
 
@@ -178,8 +177,8 @@ where
     async fn show_effective_autokey_config(
         &self,
         req: crate::model::ShowEffectiveAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ShowEffectiveAutokeyConfigResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ShowEffectiveAutokeyConfigResponse>> {
         self.inner.show_effective_autokey_config(req, options).await
     }
 
@@ -187,8 +186,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -196,8 +195,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -205,8 +204,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -214,8 +213,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -223,9 +222,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -233,8 +231,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
@@ -265,8 +263,8 @@ where
     async fn list_ekm_connections(
         &self,
         req: crate::model::ListEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEkmConnectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEkmConnectionsResponse>> {
         self.inner.list_ekm_connections(req, options).await
     }
 
@@ -274,8 +272,8 @@ where
     async fn get_ekm_connection(
         &self,
         req: crate::model::GetEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnection>> {
         self.inner.get_ekm_connection(req, options).await
     }
 
@@ -283,8 +281,8 @@ where
     async fn create_ekm_connection(
         &self,
         req: crate::model::CreateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnection>> {
         self.inner.create_ekm_connection(req, options).await
     }
 
@@ -292,8 +290,8 @@ where
     async fn update_ekm_connection(
         &self,
         req: crate::model::UpdateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnection>> {
         self.inner.update_ekm_connection(req, options).await
     }
 
@@ -301,8 +299,8 @@ where
     async fn get_ekm_config(
         &self,
         req: crate::model::GetEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConfig>> {
         self.inner.get_ekm_config(req, options).await
     }
 
@@ -310,8 +308,8 @@ where
     async fn update_ekm_config(
         &self,
         req: crate::model::UpdateEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConfig>> {
         self.inner.update_ekm_config(req, options).await
     }
 
@@ -319,8 +317,8 @@ where
     async fn verify_connectivity(
         &self,
         req: crate::model::VerifyConnectivityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyConnectivityResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyConnectivityResponse>> {
         self.inner.verify_connectivity(req, options).await
     }
 
@@ -328,8 +326,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -337,8 +335,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -346,8 +344,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -355,8 +353,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -364,9 +362,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -374,8 +371,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
@@ -406,8 +403,8 @@ where
     async fn list_single_tenant_hsm_instances(
         &self,
         req: crate::model::ListSingleTenantHsmInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSingleTenantHsmInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSingleTenantHsmInstancesResponse>> {
         self.inner
             .list_single_tenant_hsm_instances(req, options)
             .await
@@ -417,8 +414,8 @@ where
     async fn get_single_tenant_hsm_instance(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SingleTenantHsmInstance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SingleTenantHsmInstance>> {
         self.inner
             .get_single_tenant_hsm_instance(req, options)
             .await
@@ -428,8 +425,8 @@ where
     async fn create_single_tenant_hsm_instance(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_single_tenant_hsm_instance(req, options)
             .await
@@ -439,8 +436,8 @@ where
     async fn create_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_single_tenant_hsm_instance_proposal(req, options)
             .await
@@ -450,9 +447,8 @@ where
     async fn approve_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ApproveSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>> {
         self.inner
             .approve_single_tenant_hsm_instance_proposal(req, options)
             .await
@@ -462,8 +458,8 @@ where
     async fn execute_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ExecuteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .execute_single_tenant_hsm_instance_proposal(req, options)
             .await
@@ -473,8 +469,8 @@ where
     async fn get_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SingleTenantHsmInstanceProposal>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SingleTenantHsmInstanceProposal>> {
         self.inner
             .get_single_tenant_hsm_instance_proposal(req, options)
             .await
@@ -484,9 +480,8 @@ where
     async fn list_single_tenant_hsm_instance_proposals(
         &self,
         req: crate::model::ListSingleTenantHsmInstanceProposalsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>> {
         self.inner
             .list_single_tenant_hsm_instance_proposals(req, options)
             .await
@@ -496,8 +491,8 @@ where
     async fn delete_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::DeleteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner
             .delete_single_tenant_hsm_instance_proposal(req, options)
             .await
@@ -507,8 +502,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -516,8 +511,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -525,8 +520,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -534,8 +529,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -543,9 +538,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -553,22 +547,22 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -599,8 +593,8 @@ where
     async fn list_key_rings(
         &self,
         req: crate::model::ListKeyRingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKeyRingsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKeyRingsResponse>> {
         self.inner.list_key_rings(req, options).await
     }
 
@@ -608,8 +602,8 @@ where
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCryptoKeysResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCryptoKeysResponse>> {
         self.inner.list_crypto_keys(req, options).await
     }
 
@@ -617,8 +611,8 @@ where
     async fn list_crypto_key_versions(
         &self,
         req: crate::model::ListCryptoKeyVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCryptoKeyVersionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCryptoKeyVersionsResponse>> {
         self.inner.list_crypto_key_versions(req, options).await
     }
 
@@ -626,8 +620,8 @@ where
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListImportJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListImportJobsResponse>> {
         self.inner.list_import_jobs(req, options).await
     }
 
@@ -635,8 +629,8 @@ where
     async fn get_key_ring(
         &self,
         req: crate::model::GetKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KeyRing>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KeyRing>> {
         self.inner.get_key_ring(req, options).await
     }
 
@@ -644,8 +638,8 @@ where
     async fn get_crypto_key(
         &self,
         req: crate::model::GetCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         self.inner.get_crypto_key(req, options).await
     }
 
@@ -653,8 +647,8 @@ where
     async fn get_crypto_key_version(
         &self,
         req: crate::model::GetCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         self.inner.get_crypto_key_version(req, options).await
     }
 
@@ -662,8 +656,8 @@ where
     async fn get_public_key(
         &self,
         req: crate::model::GetPublicKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicKey>> {
         self.inner.get_public_key(req, options).await
     }
 
@@ -671,8 +665,8 @@ where
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportJob>> {
         self.inner.get_import_job(req, options).await
     }
 
@@ -680,8 +674,8 @@ where
     async fn create_key_ring(
         &self,
         req: crate::model::CreateKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KeyRing>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KeyRing>> {
         self.inner.create_key_ring(req, options).await
     }
 
@@ -689,8 +683,8 @@ where
     async fn create_crypto_key(
         &self,
         req: crate::model::CreateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         self.inner.create_crypto_key(req, options).await
     }
 
@@ -698,8 +692,8 @@ where
     async fn create_crypto_key_version(
         &self,
         req: crate::model::CreateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         self.inner.create_crypto_key_version(req, options).await
     }
 
@@ -707,8 +701,8 @@ where
     async fn import_crypto_key_version(
         &self,
         req: crate::model::ImportCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         self.inner.import_crypto_key_version(req, options).await
     }
 
@@ -716,8 +710,8 @@ where
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportJob>> {
         self.inner.create_import_job(req, options).await
     }
 
@@ -725,8 +719,8 @@ where
     async fn update_crypto_key(
         &self,
         req: crate::model::UpdateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         self.inner.update_crypto_key(req, options).await
     }
 
@@ -734,8 +728,8 @@ where
     async fn update_crypto_key_version(
         &self,
         req: crate::model::UpdateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         self.inner.update_crypto_key_version(req, options).await
     }
 
@@ -743,8 +737,8 @@ where
     async fn update_crypto_key_primary_version(
         &self,
         req: crate::model::UpdateCryptoKeyPrimaryVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         self.inner
             .update_crypto_key_primary_version(req, options)
             .await
@@ -754,8 +748,8 @@ where
     async fn destroy_crypto_key_version(
         &self,
         req: crate::model::DestroyCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         self.inner.destroy_crypto_key_version(req, options).await
     }
 
@@ -763,8 +757,8 @@ where
     async fn restore_crypto_key_version(
         &self,
         req: crate::model::RestoreCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         self.inner.restore_crypto_key_version(req, options).await
     }
 
@@ -772,8 +766,8 @@ where
     async fn encrypt(
         &self,
         req: crate::model::EncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptResponse>> {
         self.inner.encrypt(req, options).await
     }
 
@@ -781,8 +775,8 @@ where
     async fn decrypt(
         &self,
         req: crate::model::DecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DecryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DecryptResponse>> {
         self.inner.decrypt(req, options).await
     }
 
@@ -790,8 +784,8 @@ where
     async fn raw_encrypt(
         &self,
         req: crate::model::RawEncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RawEncryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RawEncryptResponse>> {
         self.inner.raw_encrypt(req, options).await
     }
 
@@ -799,8 +793,8 @@ where
     async fn raw_decrypt(
         &self,
         req: crate::model::RawDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RawDecryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RawDecryptResponse>> {
         self.inner.raw_decrypt(req, options).await
     }
 
@@ -808,8 +802,8 @@ where
     async fn asymmetric_sign(
         &self,
         req: crate::model::AsymmetricSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AsymmetricSignResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AsymmetricSignResponse>> {
         self.inner.asymmetric_sign(req, options).await
     }
 
@@ -817,8 +811,8 @@ where
     async fn asymmetric_decrypt(
         &self,
         req: crate::model::AsymmetricDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AsymmetricDecryptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AsymmetricDecryptResponse>> {
         self.inner.asymmetric_decrypt(req, options).await
     }
 
@@ -826,8 +820,8 @@ where
     async fn mac_sign(
         &self,
         req: crate::model::MacSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MacSignResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MacSignResponse>> {
         self.inner.mac_sign(req, options).await
     }
 
@@ -835,8 +829,8 @@ where
     async fn mac_verify(
         &self,
         req: crate::model::MacVerifyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MacVerifyResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MacVerifyResponse>> {
         self.inner.mac_verify(req, options).await
     }
 
@@ -844,8 +838,8 @@ where
     async fn decapsulate(
         &self,
         req: crate::model::DecapsulateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DecapsulateResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DecapsulateResponse>> {
         self.inner.decapsulate(req, options).await
     }
 
@@ -853,8 +847,8 @@ where
     async fn generate_random_bytes(
         &self,
         req: crate::model::GenerateRandomBytesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateRandomBytesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateRandomBytesResponse>> {
         self.inner.generate_random_bytes(req, options).await
     }
 
@@ -862,8 +856,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -871,8 +865,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -880,8 +874,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -889,8 +883,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -898,9 +892,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -908,8 +901,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/kms/v1/src/transport.rs b/src/generated/cloud/kms/v1/src/transport.rs
index 90b482af3b..dc339d8422 100644
--- a/src/generated/cloud/kms/v1/src/transport.rs
+++ b/src/generated/cloud/kms/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Autokey](super::stub::Autokey) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Autokey {
 }
 
 impl Autokey {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Autokey for Autokey {
     async fn create_key_handle(
         &self,
         req: crate::model::CreateKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -87,9 +87,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -104,13 +104,13 @@ impl super::stub::Autokey for Autokey {
     async fn get_key_handle(
         &self,
         req: crate::model::GetKeyHandleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KeyHandle>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KeyHandle>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -151,9 +151,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -168,13 +168,13 @@ impl super::stub::Autokey for Autokey {
     async fn list_key_handles(
         &self,
         req: crate::model::ListKeyHandlesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKeyHandlesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKeyHandlesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -214,9 +214,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -231,13 +231,13 @@ impl super::stub::Autokey for Autokey {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -267,9 +267,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -284,13 +284,13 @@ impl super::stub::Autokey for Autokey {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -327,9 +327,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -344,13 +344,13 @@ impl super::stub::Autokey for Autokey {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -545,9 +545,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -562,13 +562,13 @@ impl super::stub::Autokey for Autokey {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -823,9 +823,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -840,14 +840,13 @@ impl super::stub::Autokey for Autokey {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1042,9 +1041,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1059,13 +1058,13 @@ impl super::stub::Autokey for Autokey {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1106,9 +1105,9 @@ impl super::stub::Autokey for Autokey {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1122,15 +1121,15 @@ impl super::stub::Autokey for Autokey {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1150,7 +1149,7 @@ impl std::fmt::Debug for AutokeyAdmin {
 }
 
 impl AutokeyAdmin {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1160,13 +1159,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn update_autokey_config(
         &self,
         req: crate::model::UpdateAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutokeyConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutokeyConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1219,9 +1218,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1236,13 +1235,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn get_autokey_config(
         &self,
         req: crate::model::GetAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AutokeyConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AutokeyConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1277,9 +1276,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1294,13 +1293,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn show_effective_autokey_config(
         &self,
         req: crate::model::ShowEffectiveAutokeyConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ShowEffectiveAutokeyConfigResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ShowEffectiveAutokeyConfigResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1327,9 +1326,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1344,13 +1343,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1380,9 +1379,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1397,13 +1396,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1440,9 +1439,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1457,13 +1456,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1658,9 +1657,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1675,13 +1674,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1936,9 +1935,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1953,14 +1952,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2155,9 +2153,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2172,13 +2170,13 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2219,9 +2217,9 @@ impl super::stub::AutokeyAdmin for AutokeyAdmin {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2249,7 +2247,7 @@ impl std::fmt::Debug for EkmService {
 }
 
 impl EkmService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2259,13 +2257,13 @@ impl super::stub::EkmService for EkmService {
     async fn list_ekm_connections(
         &self,
         req: crate::model::ListEkmConnectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListEkmConnectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListEkmConnectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2306,9 +2304,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2323,13 +2321,13 @@ impl super::stub::EkmService for EkmService {
     async fn get_ekm_connection(
         &self,
         req: crate::model::GetEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2370,9 +2368,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2387,13 +2385,13 @@ impl super::stub::EkmService for EkmService {
     async fn create_ekm_connection(
         &self,
         req: crate::model::CreateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2431,9 +2429,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2448,13 +2446,13 @@ impl super::stub::EkmService for EkmService {
     async fn update_ekm_connection(
         &self,
         req: crate::model::UpdateEkmConnectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConnection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConnection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2513,9 +2511,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2530,13 +2528,13 @@ impl super::stub::EkmService for EkmService {
     async fn get_ekm_config(
         &self,
         req: crate::model::GetEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2575,9 +2573,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2592,13 +2590,13 @@ impl super::stub::EkmService for EkmService {
     async fn update_ekm_config(
         &self,
         req: crate::model::UpdateEkmConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EkmConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EkmConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2655,9 +2653,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2672,13 +2670,13 @@ impl super::stub::EkmService for EkmService {
     async fn verify_connectivity(
         &self,
         req: crate::model::VerifyConnectivityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyConnectivityResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyConnectivityResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2719,9 +2717,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2736,13 +2734,13 @@ impl super::stub::EkmService for EkmService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2772,9 +2770,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2789,13 +2787,13 @@ impl super::stub::EkmService for EkmService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2832,9 +2830,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2849,13 +2847,13 @@ impl super::stub::EkmService for EkmService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3050,9 +3048,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3067,13 +3065,13 @@ impl super::stub::EkmService for EkmService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3328,9 +3326,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3345,14 +3343,13 @@ impl super::stub::EkmService for EkmService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3547,9 +3544,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3564,13 +3561,13 @@ impl super::stub::EkmService for EkmService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3611,9 +3608,9 @@ impl super::stub::EkmService for EkmService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3641,7 +3638,7 @@ impl std::fmt::Debug for HsmManagement {
 }
 
 impl HsmManagement {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -3651,13 +3648,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn list_single_tenant_hsm_instances(
         &self,
         req: crate::model::ListSingleTenantHsmInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSingleTenantHsmInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSingleTenantHsmInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3699,9 +3696,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3716,13 +3713,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn get_single_tenant_hsm_instance(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SingleTenantHsmInstance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SingleTenantHsmInstance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3763,9 +3760,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3780,13 +3777,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn create_single_tenant_hsm_instance(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3827,9 +3824,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3844,13 +3841,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn create_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::CreateSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3895,9 +3892,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3912,14 +3909,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn approve_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ApproveSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ApproveSingleTenantHsmInstanceProposalResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3964,9 +3960,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3981,13 +3977,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn execute_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::ExecuteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4032,9 +4028,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4049,13 +4045,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn get_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::GetSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SingleTenantHsmInstanceProposal>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SingleTenantHsmInstanceProposal>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4100,9 +4096,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4117,14 +4113,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn list_single_tenant_hsm_instance_proposals(
         &self,
         req: crate::model::ListSingleTenantHsmInstanceProposalsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSingleTenantHsmInstanceProposalsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4170,9 +4165,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4187,13 +4182,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn delete_single_tenant_hsm_instance_proposal(
         &self,
         req: crate::model::DeleteSingleTenantHsmInstanceProposalRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4238,9 +4233,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4249,24 +4244,25 @@ impl super::stub::HsmManagement for HsmManagement {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4296,9 +4292,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4313,13 +4309,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4356,9 +4352,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4373,13 +4369,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4574,9 +4570,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4591,13 +4587,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4852,9 +4848,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4869,14 +4865,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5071,9 +5066,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5088,13 +5083,13 @@ impl super::stub::HsmManagement for HsmManagement {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5135,9 +5130,9 @@ impl super::stub::HsmManagement for HsmManagement {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5151,15 +5146,15 @@ impl super::stub::HsmManagement for HsmManagement {
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -5179,7 +5174,7 @@ impl std::fmt::Debug for KeyManagementService {
 }
 
 impl KeyManagementService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -5189,13 +5184,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn list_key_rings(
         &self,
         req: crate::model::ListKeyRingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKeyRingsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKeyRingsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5236,9 +5231,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5253,13 +5248,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn list_crypto_keys(
         &self,
         req: crate::model::ListCryptoKeysRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCryptoKeysResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCryptoKeysResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5305,9 +5300,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5322,13 +5317,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn list_crypto_key_versions(
         &self,
         req: crate::model::ListCryptoKeyVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCryptoKeyVersionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCryptoKeyVersionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5378,9 +5373,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5395,13 +5390,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListImportJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListImportJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5446,9 +5441,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5463,13 +5458,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_key_ring(
         &self,
         req: crate::model::GetKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KeyRing>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KeyRing>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5510,9 +5505,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5527,13 +5522,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_crypto_key(
         &self,
         req: crate::model::GetCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5578,9 +5573,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5595,13 +5590,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_crypto_key_version(
         &self,
         req: crate::model::GetCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5650,9 +5645,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5667,13 +5662,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_public_key(
         &self,
         req: crate::model::GetPublicKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PublicKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PublicKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5723,9 +5718,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5740,13 +5735,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5791,9 +5786,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5808,13 +5803,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn create_key_ring(
         &self,
         req: crate::model::CreateKeyRingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KeyRing>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KeyRing>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5852,9 +5847,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5869,13 +5864,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn create_crypto_key(
         &self,
         req: crate::model::CreateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5921,9 +5916,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -5938,13 +5933,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn create_crypto_key_version(
         &self,
         req: crate::model::CreateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -5989,9 +5984,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6006,13 +6001,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn import_crypto_key_version(
         &self,
         req: crate::model::ImportCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6057,9 +6052,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6074,13 +6069,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6122,9 +6117,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6139,13 +6134,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn update_crypto_key(
         &self,
         req: crate::model::UpdateCryptoKeyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6208,9 +6203,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6225,13 +6220,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn update_crypto_key_version(
         &self,
         req: crate::model::UpdateCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6298,9 +6293,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6315,13 +6310,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn update_crypto_key_primary_version(
         &self,
         req: crate::model::UpdateCryptoKeyPrimaryVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKey>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKey>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6366,9 +6361,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6383,13 +6378,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn destroy_crypto_key_version(
         &self,
         req: crate::model::DestroyCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6438,9 +6433,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6455,13 +6450,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn restore_crypto_key_version(
         &self,
         req: crate::model::RestoreCryptoKeyVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CryptoKeyVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CryptoKeyVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6510,9 +6505,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6527,13 +6522,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn encrypt(
         &self,
         req: crate::model::EncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::EncryptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::EncryptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6578,9 +6573,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6595,13 +6590,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn decrypt(
         &self,
         req: crate::model::DecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DecryptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DecryptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6646,9 +6641,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6663,13 +6658,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn raw_encrypt(
         &self,
         req: crate::model::RawEncryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RawEncryptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RawEncryptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6718,9 +6713,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6735,13 +6730,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn raw_decrypt(
         &self,
         req: crate::model::RawDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RawDecryptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RawDecryptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6790,9 +6785,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6807,13 +6802,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn asymmetric_sign(
         &self,
         req: crate::model::AsymmetricSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AsymmetricSignResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AsymmetricSignResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6862,9 +6857,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6879,13 +6874,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn asymmetric_decrypt(
         &self,
         req: crate::model::AsymmetricDecryptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AsymmetricDecryptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AsymmetricDecryptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -6934,9 +6929,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -6951,13 +6946,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn mac_sign(
         &self,
         req: crate::model::MacSignRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MacSignResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MacSignResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7006,9 +7001,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7023,13 +7018,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn mac_verify(
         &self,
         req: crate::model::MacVerifyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MacVerifyResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MacVerifyResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7078,9 +7073,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7095,13 +7090,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn decapsulate(
         &self,
         req: crate::model::DecapsulateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::DecapsulateResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::DecapsulateResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7150,9 +7145,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7167,13 +7162,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn generate_random_bytes(
         &self,
         req: crate::model::GenerateRandomBytesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::GenerateRandomBytesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::GenerateRandomBytesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7210,9 +7205,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7227,13 +7222,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7263,9 +7258,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7280,13 +7275,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7323,9 +7318,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7340,13 +7335,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7541,9 +7536,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7558,13 +7553,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -7819,9 +7814,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -7836,14 +7831,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8038,9 +8032,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -8055,13 +8049,13 @@ impl super::stub::KeyManagementService for KeyManagementService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -8102,9 +8096,9 @@ impl super::stub::KeyManagementService for KeyManagementService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/language/v2/Cargo.toml b/src/generated/cloud/language/v2/Cargo.toml
index 6ef8819fd9..f3cb32b2b4 100644
--- a/src/generated/cloud/language/v2/Cargo.toml
+++ b/src/generated/cloud/language/v2/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/language/v2/src/builder.rs b/src/generated/cloud/language/v2/src/builder.rs
index 5b63e2c067..5cd57b0069 100644
--- a/src/generated/cloud/language/v2/src/builder.rs
+++ b/src/generated/cloud/language/v2/src/builder.rs
@@ -20,7 +20,7 @@ pub mod language_service {
     /// A builder for [LanguageService][crate::client::LanguageService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_language_v2::*;
     /// # use builder::language_service::ClientBuilder;
     /// # use client::LanguageService;
@@ -30,19 +30,18 @@ pub mod language_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::LanguageService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = LanguageService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod language_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::LanguageService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod language_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod language_service {
     /// # Example
     /// ```
     /// # use google_cloud_language_v2::builder::language_service::AnalyzeSentiment;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_language_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod language_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod language_service {
             (*self.0.stub)
                 .analyze_sentiment(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::AnalyzeSentimentRequest::document].
@@ -150,8 +149,8 @@ pub mod language_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeSentiment {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeSentiment {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -161,7 +160,7 @@ pub mod language_service {
     /// # Example
     /// ```
     /// # use google_cloud_language_v2::builder::language_service::AnalyzeEntities;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_language_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -189,7 +188,7 @@ pub mod language_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -199,7 +198,7 @@ pub mod language_service {
             (*self.0.stub)
                 .analyze_entities(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::AnalyzeEntitiesRequest::document].
@@ -232,8 +231,8 @@ pub mod language_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnalyzeEntities {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnalyzeEntities {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -243,7 +242,7 @@ pub mod language_service {
     /// # Example
     /// ```
     /// # use google_cloud_language_v2::builder::language_service::ClassifyText;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_language_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -271,7 +270,7 @@ pub mod language_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -281,7 +280,7 @@ pub mod language_service {
             (*self.0.stub)
                 .classify_text(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::ClassifyTextRequest::document].
@@ -308,8 +307,8 @@ pub mod language_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ClassifyText {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ClassifyText {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -319,7 +318,7 @@ pub mod language_service {
     /// # Example
     /// ```
     /// # use google_cloud_language_v2::builder::language_service::ModerateText;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_language_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -347,7 +346,7 @@ pub mod language_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -357,7 +356,7 @@ pub mod language_service {
             (*self.0.stub)
                 .moderate_text(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::ModerateTextRequest::document].
@@ -393,8 +392,8 @@ pub mod language_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ModerateText {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ModerateText {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -404,7 +403,7 @@ pub mod language_service {
     /// # Example
     /// ```
     /// # use google_cloud_language_v2::builder::language_service::AnnotateText;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_language_v2::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -432,7 +431,7 @@ pub mod language_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -442,7 +441,7 @@ pub mod language_service {
             (*self.0.stub)
                 .annotate_text(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [document][crate::model::AnnotateTextRequest::document].
@@ -497,8 +496,8 @@ pub mod language_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AnnotateText {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AnnotateText {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/language/v2/src/client.rs b/src/generated/cloud/language/v2/src/client.rs
index 02af271a68..f4ea2a4fb8 100644
--- a/src/generated/cloud/language/v2/src/client.rs
+++ b/src/generated/cloud/language/v2/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_language_v2::client::LanguageService;
 /// let client = LanguageService::builder().build().await?;
 /// // use `client` to make requests to the Cloud Natural Language API.
@@ -67,15 +67,13 @@ impl LanguageService {
     /// Returns a builder for [LanguageService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_language_v2::client::LanguageService;
     /// let client = LanguageService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::language_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::language_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::language_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -93,15 +91,14 @@ impl LanguageService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::LanguageService>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::LanguageService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -110,13 +107,13 @@ impl LanguageService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LanguageService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LanguageService> {
         super::transport::LanguageService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LanguageService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LanguageService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::LanguageService::new)
diff --git a/src/generated/cloud/language/v2/src/lib.rs b/src/generated/cloud/language/v2/src/lib.rs
index 3757b8de92..c38f2d001d 100644
--- a/src/generated/cloud/language/v2/src/lib.rs
+++ b/src/generated/cloud/language/v2/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/language/v2/src/model.rs b/src/generated/cloud/language/v2/src/model.rs
index e998d6e502..63b093cfef 100644
--- a/src/generated/cloud/language/v2/src/model.rs
+++ b/src/generated/cloud/language/v2/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
diff --git a/src/generated/cloud/language/v2/src/stub.rs b/src/generated/cloud/language/v2/src/stub.rs
index d2f01e92da..6b6fc7f992 100644
--- a/src/generated/cloud/language/v2/src/stub.rs
+++ b/src/generated/cloud/language/v2/src/stub.rs
@@ -42,9 +42,9 @@ pub trait LanguageService: std::fmt::Debug + Send + Sync {
     fn analyze_sentiment(
         &self,
         _req: crate::model::AnalyzeSentimentRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalyzeSentimentResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnalyzeSentimentResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait LanguageService: std::fmt::Debug + Send + Sync {
     fn analyze_entities(
         &self,
         _req: crate::model::AnalyzeEntitiesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnalyzeEntitiesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnalyzeEntitiesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait LanguageService: std::fmt::Debug + Send + Sync {
     fn classify_text(
         &self,
         _req: crate::model::ClassifyTextRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ClassifyTextResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ClassifyTextResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait LanguageService: std::fmt::Debug + Send + Sync {
     fn moderate_text(
         &self,
         _req: crate::model::ModerateTextRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ModerateTextResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ModerateTextResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait LanguageService: std::fmt::Debug + Send + Sync {
     fn annotate_text(
         &self,
         _req: crate::model::AnnotateTextRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AnnotateTextResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AnnotateTextResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/language/v2/src/stub/dynamic.rs b/src/generated/cloud/language/v2/src/stub/dynamic.rs
index 4fc7112a12..54b67de81f 100644
--- a/src/generated/cloud/language/v2/src/stub/dynamic.rs
+++ b/src/generated/cloud/language/v2/src/stub/dynamic.rs
@@ -20,32 +20,32 @@ pub trait LanguageService: std::fmt::Debug + Send + Sync {
     async fn analyze_sentiment(
         &self,
         req: crate::model::AnalyzeSentimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeSentimentResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeSentimentResponse>>;
 
     async fn analyze_entities(
         &self,
         req: crate::model::AnalyzeEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeEntitiesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeEntitiesResponse>>;
 
     async fn classify_text(
         &self,
         req: crate::model::ClassifyTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ClassifyTextResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ClassifyTextResponse>>;
 
     async fn moderate_text(
         &self,
         req: crate::model::ModerateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModerateTextResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModerateTextResponse>>;
 
     async fn annotate_text(
         &self,
         req: crate::model::AnnotateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnnotateTextResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnnotateTextResponse>>;
 }
 
 /// All implementations of [super::LanguageService] also implement [LanguageService].
@@ -55,8 +55,8 @@ impl<T: super::LanguageService> LanguageService for T {
     async fn analyze_sentiment(
         &self,
         req: crate::model::AnalyzeSentimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeSentimentResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeSentimentResponse>> {
         T::analyze_sentiment(self, req, options).await
     }
 
@@ -64,8 +64,8 @@ impl<T: super::LanguageService> LanguageService for T {
     async fn analyze_entities(
         &self,
         req: crate::model::AnalyzeEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnalyzeEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnalyzeEntitiesResponse>> {
         T::analyze_entities(self, req, options).await
     }
 
@@ -73,8 +73,8 @@ impl<T: super::LanguageService> LanguageService for T {
     async fn classify_text(
         &self,
         req: crate::model::ClassifyTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ClassifyTextResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ClassifyTextResponse>> {
         T::classify_text(self, req, options).await
     }
 
@@ -82,8 +82,8 @@ impl<T: super::LanguageService> LanguageService for T {
     async fn moderate_text(
         &self,
         req: crate::model::ModerateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ModerateTextResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ModerateTextResponse>> {
         T::moderate_text(self, req, options).await
     }
 
@@ -91,8 +91,8 @@ impl<T: super::LanguageService> LanguageService for T {
     async fn annotate_text(
         &self,
         req: crate::model::AnnotateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AnnotateTextResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AnnotateTextResponse>> {
         T::annotate_text(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/language/v2/src/tracing.rs b/src/generated/cloud/language/v2/src/tracing.rs
index b6557b36fb..57ad5b5f33 100644
--- a/src/generated/cloud/language/v2/src/tracing.rs
+++ b/src/generated/cloud/language/v2/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn analyze_sentiment(
         &self,
         req: crate::model::AnalyzeSentimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeSentimentResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeSentimentResponse>> {
         self.inner.analyze_sentiment(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn analyze_entities(
         &self,
         req: crate::model::AnalyzeEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeEntitiesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeEntitiesResponse>> {
         self.inner.analyze_entities(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn classify_text(
         &self,
         req: crate::model::ClassifyTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ClassifyTextResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ClassifyTextResponse>> {
         self.inner.classify_text(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn moderate_text(
         &self,
         req: crate::model::ModerateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModerateTextResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModerateTextResponse>> {
         self.inner.moderate_text(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn annotate_text(
         &self,
         req: crate::model::AnnotateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnnotateTextResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnnotateTextResponse>> {
         self.inner.annotate_text(req, options).await
     }
 }
diff --git a/src/generated/cloud/language/v2/src/transport.rs b/src/generated/cloud/language/v2/src/transport.rs
index 23d902b71e..f9d794ebd1 100644
--- a/src/generated/cloud/language/v2/src/transport.rs
+++ b/src/generated/cloud/language/v2/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [LanguageService](super::stub::LanguageService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for LanguageService {
 }
 
 impl LanguageService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,11 +43,11 @@ impl super::stub::LanguageService for LanguageService {
     async fn analyze_sentiment(
         &self,
         req: crate::model::AnalyzeSentimentRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeSentimentResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeSentimentResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v2/documents:analyzeSentiment".to_string();
@@ -62,9 +62,9 @@ impl super::stub::LanguageService for LanguageService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -79,11 +79,11 @@ impl super::stub::LanguageService for LanguageService {
     async fn analyze_entities(
         &self,
         req: crate::model::AnalyzeEntitiesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnalyzeEntitiesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnalyzeEntitiesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v2/documents:analyzeEntities".to_string();
@@ -98,9 +98,9 @@ impl super::stub::LanguageService for LanguageService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -115,11 +115,11 @@ impl super::stub::LanguageService for LanguageService {
     async fn classify_text(
         &self,
         req: crate::model::ClassifyTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ClassifyTextResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ClassifyTextResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v2/documents:classifyText".to_string();
@@ -134,9 +134,9 @@ impl super::stub::LanguageService for LanguageService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -151,11 +151,11 @@ impl super::stub::LanguageService for LanguageService {
     async fn moderate_text(
         &self,
         req: crate::model::ModerateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ModerateTextResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ModerateTextResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v2/documents:moderateText".to_string();
@@ -170,9 +170,9 @@ impl super::stub::LanguageService for LanguageService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -187,11 +187,11 @@ impl super::stub::LanguageService for LanguageService {
     async fn annotate_text(
         &self,
         req: crate::model::AnnotateTextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AnnotateTextResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AnnotateTextResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = "/v2/documents:annotateText".to_string();
@@ -206,9 +206,9 @@ impl super::stub::LanguageService for LanguageService {
                     let builder = PathMismatchBuilder::default();
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/licensemanager/v1/Cargo.toml b/src/generated/cloud/licensemanager/v1/Cargo.toml
index a512bf1965..ee1279b78d 100644
--- a/src/generated/cloud/licensemanager/v1/Cargo.toml
+++ b/src/generated/cloud/licensemanager/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/licensemanager/v1/src/builder.rs b/src/generated/cloud/licensemanager/v1/src/builder.rs
index 87ca53f9a3..dd1f875417 100644
--- a/src/generated/cloud/licensemanager/v1/src/builder.rs
+++ b/src/generated/cloud/licensemanager/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod license_manager {
     /// A builder for [LicenseManager][crate::client::LicenseManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_licensemanager_v1::*;
     /// # use builder::license_manager::ClientBuilder;
     /// # use client::LicenseManager;
@@ -30,19 +30,18 @@ pub mod license_manager {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::LicenseManager;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = LicenseManager;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod license_manager {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::LicenseManager>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod license_manager {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::ListConfigurations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod license_manager {
             (*self.0.stub)
                 .list_configurations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConfigurationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConfigurationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod license_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConfigurationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -184,8 +185,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConfigurations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConfigurations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -195,7 +196,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::GetConfiguration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -226,7 +227,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -236,7 +237,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .get_configuration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConfigurationRequest::name].
@@ -249,8 +250,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConfiguration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConfiguration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -260,7 +261,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::CreateConfiguration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -292,7 +293,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -307,7 +308,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .create_configuration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_configuration`.
@@ -324,7 +325,7 @@ pub mod license_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -397,8 +398,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConfiguration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConfiguration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -408,7 +409,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::UpdateConfiguration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -440,7 +441,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -455,7 +456,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .update_configuration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_configuration`.
@@ -472,7 +473,7 @@ pub mod license_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -547,8 +548,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConfiguration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConfiguration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -558,7 +559,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::DeleteConfiguration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -590,7 +591,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -605,7 +606,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .delete_configuration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_configuration`.
@@ -617,7 +618,7 @@ pub mod license_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -660,8 +661,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConfiguration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConfiguration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -671,8 +672,8 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -703,7 +704,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -713,13 +714,13 @@ pub mod license_manager {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -728,15 +729,17 @@ pub mod license_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -774,8 +777,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -785,7 +788,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -813,7 +816,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -823,7 +826,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -836,8 +839,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -847,7 +850,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::DeactivateConfiguration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -881,7 +884,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -896,7 +899,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .deactivate_configuration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `deactivate_configuration`.
@@ -913,7 +916,7 @@ pub mod license_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -956,8 +959,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeactivateConfiguration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeactivateConfiguration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -967,7 +970,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::ReactivateConfiguration;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1001,7 +1004,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1016,7 +1019,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .reactivate_configuration(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reactivate_configuration`.
@@ -1033,7 +1036,7 @@ pub mod license_manager {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1076,8 +1079,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReactivateConfiguration {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReactivateConfiguration {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1087,7 +1090,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::QueryConfigurationLicenseUsage;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1120,7 +1123,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1130,7 +1133,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .query_configuration_license_usage(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::QueryConfigurationLicenseUsageRequest::name].
@@ -1187,8 +1190,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryConfigurationLicenseUsage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryConfigurationLicenseUsage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1198,8 +1201,8 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::AggregateUsage;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1230,7 +1233,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1240,14 +1243,16 @@ pub mod license_manager {
             (*self.0.stub)
                 .aggregate_usage(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::AggregateUsageResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::AggregateUsageResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1255,15 +1260,17 @@ pub mod license_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::AggregateUsageResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::AggregateUsageResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1345,8 +1352,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregateUsage {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregateUsage {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1356,8 +1363,8 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::ListProducts;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1388,7 +1395,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1398,13 +1405,13 @@ pub mod license_manager {
             (*self.0.stub)
                 .list_products(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListProductsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListProductsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1413,15 +1420,17 @@ pub mod license_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListProductsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListProductsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1459,8 +1468,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListProducts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListProducts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1470,7 +1479,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::GetProduct;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1498,7 +1507,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1508,7 +1517,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .get_product(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetProductRequest::name].
@@ -1521,8 +1530,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetProduct {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetProduct {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1532,8 +1541,8 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1567,7 +1576,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1577,15 +1586,15 @@ pub mod license_manager {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1594,17 +1603,17 @@ pub mod license_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1634,8 +1643,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1645,7 +1654,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1676,7 +1685,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1686,7 +1695,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1697,8 +1706,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1708,8 +1717,8 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1745,7 +1754,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1755,15 +1764,15 @@ pub mod license_manager {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1772,17 +1781,17 @@ pub mod license_manager {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1818,8 +1827,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1829,7 +1838,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1860,7 +1869,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1870,7 +1879,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1881,8 +1890,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1892,7 +1901,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1925,7 +1934,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1935,7 +1944,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1946,8 +1955,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1957,7 +1966,7 @@ pub mod license_manager {
     /// # Example
     /// ```
     /// # use google_cloud_licensemanager_v1::builder::license_manager::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_licensemanager_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1990,7 +1999,7 @@ pub mod license_manager {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2000,7 +2009,7 @@ pub mod license_manager {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2011,8 +2020,8 @@ pub mod license_manager {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/licensemanager/v1/src/client.rs b/src/generated/cloud/licensemanager/v1/src/client.rs
index 3b253f3b1c..12a364866d 100644
--- a/src/generated/cloud/licensemanager/v1/src/client.rs
+++ b/src/generated/cloud/licensemanager/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_licensemanager_v1::client::LicenseManager;
 /// let client = LicenseManager::builder().build().await?;
 /// // use `client` to make requests to the License Manager API.
@@ -66,13 +66,13 @@ impl LicenseManager {
     /// Returns a builder for [LicenseManager].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_licensemanager_v1::client::LicenseManager;
     /// let client = LicenseManager::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::license_manager::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::license_manager::client::Factory)
+        crate::new_client_builder(super::builder::license_manager::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl LicenseManager {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::LicenseManager>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::LicenseManager>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl LicenseManager {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LicenseManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LicenseManager> {
         super::transport::LicenseManager::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::LicenseManager> {
+    ) -> crate::ClientBuilderResult<impl super::stub::LicenseManager> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::LicenseManager::new)
diff --git a/src/generated/cloud/licensemanager/v1/src/lib.rs b/src/generated/cloud/licensemanager/v1/src/lib.rs
index dbbc54b691..cda3fccaeb 100644
--- a/src/generated/cloud/licensemanager/v1/src/lib.rs
+++ b/src/generated/cloud/licensemanager/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/licensemanager/v1/src/model.rs b/src/generated/cloud/licensemanager/v1/src/model.rs
index 5dfa1c589c..748c383d3f 100644
--- a/src/generated/cloud/licensemanager/v1/src/model.rs
+++ b/src/generated/cloud/licensemanager/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -1599,7 +1599,7 @@ impl wkt::message::Message for ListConfigurationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConfigurationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConfigurationsResponse {
     type PageItem = crate::model::Configuration;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2119,7 +2119,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2752,7 +2752,7 @@ impl wkt::message::Message for AggregateUsageResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for AggregateUsageResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for AggregateUsageResponse {
     type PageItem = crate::model::Usage;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2940,7 +2940,7 @@ impl wkt::message::Message for ListProductsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListProductsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListProductsResponse {
     type PageItem = crate::model::Product;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/licensemanager/v1/src/stub.rs b/src/generated/cloud/licensemanager/v1/src/stub.rs
index 7ff13bed46..e9b32a643f 100644
--- a/src/generated/cloud/licensemanager/v1/src/stub.rs
+++ b/src/generated/cloud/licensemanager/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn list_configurations(
         &self,
         _req: crate::model::ListConfigurationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConfigurationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConfigurationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn get_configuration(
         &self,
         _req: crate::model::GetConfigurationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Configuration>>,
+        Output = crate::Result<crate::Response<crate::model::Configuration>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn create_configuration(
         &self,
         _req: crate::model::CreateConfigurationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +75,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn update_configuration(
         &self,
         _req: crate::model::UpdateConfigurationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +86,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn delete_configuration(
         &self,
         _req: crate::model::DeleteConfigurationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +97,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +108,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -119,9 +118,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn deactivate_configuration(
         &self,
         _req: crate::model::DeactivateConfigurationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +129,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn reactivate_configuration(
         &self,
         _req: crate::model::ReactivateConfigurationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,10 +140,10 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn query_configuration_license_usage(
         &self,
         _req: crate::model::QueryConfigurationLicenseUsageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::QueryConfigurationLicenseUsageResponse>,
+            crate::Response<crate::model::QueryConfigurationLicenseUsageResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -154,9 +153,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn aggregate_usage(
         &self,
         _req: crate::model::AggregateUsageRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AggregateUsageResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AggregateUsageResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -165,9 +164,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn list_products(
         &self,
         _req: crate::model::ListProductsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListProductsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListProductsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,10 +175,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn get_product(
         &self,
         _req: crate::model::GetProductRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Product>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Product>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -187,10 +185,10 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -200,9 +198,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,10 +209,10 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -224,9 +222,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -235,8 +233,8 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -244,8 +242,8 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -255,9 +253,9 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -266,8 +264,8 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/licensemanager/v1/src/stub/dynamic.rs b/src/generated/cloud/licensemanager/v1/src/stub/dynamic.rs
index 5990bbb4ab..8422e309f5 100644
--- a/src/generated/cloud/licensemanager/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/licensemanager/v1/src/stub/dynamic.rs
@@ -20,128 +20,126 @@ pub trait LicenseManager: std::fmt::Debug + Send + Sync {
     async fn list_configurations(
         &self,
         req: crate::model::ListConfigurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConfigurationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConfigurationsResponse>>;
 
     async fn get_configuration(
         &self,
         req: crate::model::GetConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Configuration>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Configuration>>;
 
     async fn create_configuration(
         &self,
         req: crate::model::CreateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_configuration(
         &self,
         req: crate::model::UpdateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_configuration(
         &self,
         req: crate::model::DeleteConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn deactivate_configuration(
         &self,
         req: crate::model::DeactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reactivate_configuration(
         &self,
         req: crate::model::ReactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn query_configuration_license_usage(
         &self,
         req: crate::model::QueryConfigurationLicenseUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryConfigurationLicenseUsageResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryConfigurationLicenseUsageResponse>>;
 
     async fn aggregate_usage(
         &self,
         req: crate::model::AggregateUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AggregateUsageResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AggregateUsageResponse>>;
 
     async fn list_products(
         &self,
         req: crate::model::ListProductsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProductsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProductsResponse>>;
 
     async fn get_product(
         &self,
         req: crate::model::GetProductRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Product>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Product>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::LicenseManager] also implement [LicenseManager].
@@ -151,8 +149,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn list_configurations(
         &self,
         req: crate::model::ListConfigurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConfigurationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConfigurationsResponse>> {
         T::list_configurations(self, req, options).await
     }
 
@@ -160,8 +158,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn get_configuration(
         &self,
         req: crate::model::GetConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Configuration>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Configuration>> {
         T::get_configuration(self, req, options).await
     }
 
@@ -169,8 +167,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn create_configuration(
         &self,
         req: crate::model::CreateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_configuration(self, req, options).await
     }
 
@@ -178,8 +176,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn update_configuration(
         &self,
         req: crate::model::UpdateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_configuration(self, req, options).await
     }
 
@@ -187,8 +185,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn delete_configuration(
         &self,
         req: crate::model::DeleteConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_configuration(self, req, options).await
     }
 
@@ -196,8 +194,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -205,8 +203,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -214,8 +212,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn deactivate_configuration(
         &self,
         req: crate::model::DeactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::deactivate_configuration(self, req, options).await
     }
 
@@ -223,8 +221,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn reactivate_configuration(
         &self,
         req: crate::model::ReactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reactivate_configuration(self, req, options).await
     }
 
@@ -232,9 +230,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn query_configuration_license_usage(
         &self,
         req: crate::model::QueryConfigurationLicenseUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryConfigurationLicenseUsageResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryConfigurationLicenseUsageResponse>> {
         T::query_configuration_license_usage(self, req, options).await
     }
 
@@ -242,8 +239,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn aggregate_usage(
         &self,
         req: crate::model::AggregateUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AggregateUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AggregateUsageResponse>> {
         T::aggregate_usage(self, req, options).await
     }
 
@@ -251,8 +248,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn list_products(
         &self,
         req: crate::model::ListProductsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListProductsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListProductsResponse>> {
         T::list_products(self, req, options).await
     }
 
@@ -260,8 +257,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn get_product(
         &self,
         req: crate::model::GetProductRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Product>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Product>> {
         T::get_product(self, req, options).await
     }
 
@@ -269,9 +266,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -279,8 +275,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -288,10 +284,9 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -299,8 +294,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -308,8 +303,8 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -317,22 +312,22 @@ impl<T: super::LicenseManager> LicenseManager for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/licensemanager/v1/src/tracing.rs b/src/generated/cloud/licensemanager/v1/src/tracing.rs
index d820c10e94..7fe737ef93 100644
--- a/src/generated/cloud/licensemanager/v1/src/tracing.rs
+++ b/src/generated/cloud/licensemanager/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_configurations(
         &self,
         req: crate::model::ListConfigurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConfigurationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConfigurationsResponse>> {
         self.inner.list_configurations(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_configuration(
         &self,
         req: crate::model::GetConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Configuration>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Configuration>> {
         self.inner.get_configuration(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_configuration(
         &self,
         req: crate::model::CreateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_configuration(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_configuration(
         &self,
         req: crate::model::UpdateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_configuration(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_configuration(
         &self,
         req: crate::model::DeleteConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_configuration(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn deactivate_configuration(
         &self,
         req: crate::model::DeactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.deactivate_configuration(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn reactivate_configuration(
         &self,
         req: crate::model::ReactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reactivate_configuration(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn query_configuration_license_usage(
         &self,
         req: crate::model::QueryConfigurationLicenseUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryConfigurationLicenseUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryConfigurationLicenseUsageResponse>> {
         self.inner
             .query_configuration_license_usage(req, options)
             .await
@@ -133,8 +133,8 @@ where
     async fn aggregate_usage(
         &self,
         req: crate::model::AggregateUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AggregateUsageResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AggregateUsageResponse>> {
         self.inner.aggregate_usage(req, options).await
     }
 
@@ -142,8 +142,8 @@ where
     async fn list_products(
         &self,
         req: crate::model::ListProductsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProductsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProductsResponse>> {
         self.inner.list_products(req, options).await
     }
 
@@ -151,8 +151,8 @@ where
     async fn get_product(
         &self,
         req: crate::model::GetProductRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Product>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Product>> {
         self.inner.get_product(req, options).await
     }
 
@@ -160,8 +160,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -169,8 +169,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -178,9 +178,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -188,8 +187,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -197,8 +196,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -206,22 +205,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/licensemanager/v1/src/transport.rs b/src/generated/cloud/licensemanager/v1/src/transport.rs
index a5d0deda71..ba5673aa8b 100644
--- a/src/generated/cloud/licensemanager/v1/src/transport.rs
+++ b/src/generated/cloud/licensemanager/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [LicenseManager](super::stub::LicenseManager) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for LicenseManager {
 }
 
 impl LicenseManager {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn list_configurations(
         &self,
         req: crate::model::ListConfigurationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConfigurationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConfigurationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn get_configuration(
         &self,
         req: crate::model::GetConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Configuration>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Configuration>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn create_configuration(
         &self,
         req: crate::model::CreateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn update_configuration(
         &self,
         req: crate::model::UpdateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn delete_configuration(
         &self,
         req: crate::model::DeleteConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +381,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +428,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +445,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +492,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +509,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn deactivate_configuration(
         &self,
         req: crate::model::DeactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -556,9 +556,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -573,13 +573,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn reactivate_configuration(
         &self,
         req: crate::model::ReactivateConfigurationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -620,9 +620,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -637,13 +637,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn query_configuration_license_usage(
         &self,
         req: crate::model::QueryConfigurationLicenseUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryConfigurationLicenseUsageResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryConfigurationLicenseUsageResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -706,9 +706,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -723,13 +723,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn aggregate_usage(
         &self,
         req: crate::model::AggregateUsageRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AggregateUsageResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AggregateUsageResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -796,9 +796,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -813,13 +813,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn list_products(
         &self,
         req: crate::model::ListProductsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListProductsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListProductsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -860,9 +860,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -877,13 +877,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn get_product(
         &self,
         req: crate::model::GetProductRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Product>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Product>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -924,9 +924,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -941,13 +941,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -977,9 +977,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -994,13 +994,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1037,9 +1037,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1054,14 +1054,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1103,9 +1102,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1120,13 +1119,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1167,9 +1166,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1184,13 +1183,13 @@ impl super::stub::LicenseManager for LicenseManager {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1231,9 +1230,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1242,24 +1241,25 @@ impl super::stub::LicenseManager for LicenseManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1300,9 +1300,9 @@ impl super::stub::LicenseManager for LicenseManager {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1311,25 +1311,26 @@ impl super::stub::LicenseManager for LicenseManager {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/location/Cargo.toml b/src/generated/cloud/location/Cargo.toml
index c9f620c1a6..af8f5eef4a 100644
--- a/src/generated/cloud/location/Cargo.toml
+++ b/src/generated/cloud/location/Cargo.toml
@@ -38,16 +38,16 @@ default-rustls-provider = ["gaxi/_default-rustls-provider"]
 all-features = true
 
 [dependencies]
-async-trait.workspace = true
-bytes.workspace       = true
-gax.workspace         = true
-gaxi                  = { workspace = true, features = ["_internal-http-client"] }
-lazy_static.workspace = true
-serde.workspace       = true
-serde_json.workspace  = true
-serde_with.workspace  = true
-tracing.workspace     = true
-wkt.workspace         = true
+async-trait.workspace      = true
+bytes.workspace            = true
+gaxi                       = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace = true
+lazy_static.workspace      = true
+serde.workspace            = true
+serde_json.workspace       = true
+serde_with.workspace       = true
+tracing.workspace          = true
+wkt.workspace              = true
 
 [dev-dependencies]
 tokio-test.workspace = true
diff --git a/src/generated/cloud/location/src/builder.rs b/src/generated/cloud/location/src/builder.rs
index 788bcfdf51..5950fe761e 100644
--- a/src/generated/cloud/location/src/builder.rs
+++ b/src/generated/cloud/location/src/builder.rs
@@ -20,7 +20,7 @@ pub mod locations {
     /// A builder for [Locations][crate::client::Locations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_location::*;
     /// # use builder::locations::ClientBuilder;
     /// # use client::Locations;
@@ -30,19 +30,18 @@ pub mod locations {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Locations;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Locations;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod locations {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Locations>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod locations {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod locations {
     /// # Example
     /// ```
     /// # use google_cloud_location::builder::locations::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_location::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod locations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod locations {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListLocationsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListLocationsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod locations {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListLocationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListLocationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -171,8 +172,8 @@ pub mod locations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -182,7 +183,7 @@ pub mod locations {
     /// # Example
     /// ```
     /// # use google_cloud_location::builder::locations::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_location::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -210,7 +211,7 @@ pub mod locations {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -220,7 +221,7 @@ pub mod locations {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetLocationRequest::name].
@@ -231,8 +232,8 @@ pub mod locations {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/location/src/client.rs b/src/generated/cloud/location/src/client.rs
index eac07ce417..da384fbe9d 100644
--- a/src/generated/cloud/location/src/client.rs
+++ b/src/generated/cloud/location/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_location::client::Locations;
 /// let client = Locations::builder().build().await?;
 /// // use `client` to make requests to the Cloud Metadata API.
@@ -70,13 +70,13 @@ impl Locations {
     /// Returns a builder for [Locations].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_location::client::Locations;
     /// let client = Locations::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::locations::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::locations::client::Factory)
+        crate::new_client_builder(super::builder::locations::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -94,14 +94,14 @@ impl Locations {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Locations>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Locations>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -110,13 +110,13 @@ impl Locations {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Locations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Locations> {
         super::transport::Locations::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Locations> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Locations> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Locations::new)
diff --git a/src/generated/cloud/location/src/lib.rs b/src/generated/cloud/location/src/lib.rs
index ce18f047cd..191c6a7758 100644
--- a/src/generated/cloud/location/src/lib.rs
+++ b/src/generated/cloud/location/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/location/src/model.rs b/src/generated/cloud/location/src/model.rs
index 52e154b810..7f55b8afbc 100644
--- a/src/generated/cloud/location/src/model.rs
+++ b/src/generated/cloud/location/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate lazy_static;
 extern crate serde;
 extern crate serde_json;
@@ -176,7 +176,7 @@ impl wkt::message::Message for ListLocationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListLocationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListLocationsResponse {
     type PageItem = crate::model::Location;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/location/src/stub.rs b/src/generated/cloud/location/src/stub.rs
index 55c405c85f..a3e9b8da1d 100644
--- a/src/generated/cloud/location/src/stub.rs
+++ b/src/generated/cloud/location/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Locations: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: crate::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListLocationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListLocationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Locations: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: crate::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Location>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Location>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/location/src/stub/dynamic.rs b/src/generated/cloud/location/src/stub/dynamic.rs
index 081898abec..4854de93a6 100644
--- a/src/generated/cloud/location/src/stub/dynamic.rs
+++ b/src/generated/cloud/location/src/stub/dynamic.rs
@@ -20,14 +20,14 @@ pub trait Locations: std::fmt::Debug + Send + Sync {
     async fn list_locations(
         &self,
         req: crate::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: crate::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Location>>;
 }
 
 /// All implementations of [super::Locations] also implement [Locations].
@@ -37,8 +37,8 @@ impl<T: super::Locations> Locations for T {
     async fn list_locations(
         &self,
         req: crate::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -46,8 +46,8 @@ impl<T: super::Locations> Locations for T {
     async fn get_location(
         &self,
         req: crate::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/location/src/tracing.rs b/src/generated/cloud/location/src/tracing.rs
index f2406c1916..9bd116e1c0 100644
--- a/src/generated/cloud/location/src/tracing.rs
+++ b/src/generated/cloud/location/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_locations(
         &self,
         req: crate::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_location(
         &self,
         req: crate::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/location/src/transport.rs b/src/generated/cloud/location/src/transport.rs
index 5612ceba15..a934bf6c3a 100644
--- a/src/generated/cloud/location/src/transport.rs
+++ b/src/generated/cloud/location/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Locations](super::stub::Locations) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Locations {
 }
 
 impl Locations {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Locations for Locations {
     async fn list_locations(
         &self,
         req: crate::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -105,9 +105,9 @@ impl super::stub::Locations for Locations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -122,13 +122,13 @@ impl super::stub::Locations for Locations {
     async fn get_location(
         &self,
         req: crate::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -188,9 +188,9 @@ impl super::stub::Locations for Locations {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/locationfinder/v1/Cargo.toml b/src/generated/cloud/locationfinder/v1/Cargo.toml
index dcf2c97bc3..9271f56d6a 100644
--- a/src/generated/cloud/locationfinder/v1/Cargo.toml
+++ b/src/generated/cloud/locationfinder/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-location.workspace = true
 lazy_static.workspace           = true
 serde.workspace                 = true
diff --git a/src/generated/cloud/locationfinder/v1/src/builder.rs b/src/generated/cloud/locationfinder/v1/src/builder.rs
index 7aa68cc754..5fdf51c5a9 100644
--- a/src/generated/cloud/locationfinder/v1/src/builder.rs
+++ b/src/generated/cloud/locationfinder/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_location_finder {
     /// A builder for [CloudLocationFinder][crate::client::CloudLocationFinder].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_locationfinder_v1::*;
     /// # use builder::cloud_location_finder::ClientBuilder;
     /// # use client::CloudLocationFinder;
@@ -30,19 +30,18 @@ pub mod cloud_location_finder {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudLocationFinder;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudLocationFinder;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_location_finder {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudLocationFinder>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_location_finder {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod cloud_location_finder {
     /// # Example
     /// ```
     /// # use google_cloud_locationfinder_v1::builder::cloud_location_finder::ListCloudLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_locationfinder_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod cloud_location_finder {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod cloud_location_finder {
             (*self.0.stub)
                 .list_cloud_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListCloudLocationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListCloudLocationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod cloud_location_finder {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListCloudLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -178,8 +179,8 @@ pub mod cloud_location_finder {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListCloudLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListCloudLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -189,7 +190,7 @@ pub mod cloud_location_finder {
     /// # Example
     /// ```
     /// # use google_cloud_locationfinder_v1::builder::cloud_location_finder::GetCloudLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_locationfinder_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -220,7 +221,7 @@ pub mod cloud_location_finder {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -230,7 +231,7 @@ pub mod cloud_location_finder {
             (*self.0.stub)
                 .get_cloud_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCloudLocationRequest::name].
@@ -243,8 +244,8 @@ pub mod cloud_location_finder {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCloudLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCloudLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -254,8 +255,8 @@ pub mod cloud_location_finder {
     /// # Example
     /// ```
     /// # use google_cloud_locationfinder_v1::builder::cloud_location_finder::SearchCloudLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_locationfinder_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -289,7 +290,7 @@ pub mod cloud_location_finder {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -299,14 +300,16 @@ pub mod cloud_location_finder {
             (*self.0.stub)
                 .search_cloud_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SearchCloudLocationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SearchCloudLocationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -314,17 +317,17 @@ pub mod cloud_location_finder {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SearchCloudLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -364,8 +367,8 @@ pub mod cloud_location_finder {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SearchCloudLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SearchCloudLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -375,8 +378,8 @@ pub mod cloud_location_finder {
     /// # Example
     /// ```
     /// # use google_cloud_locationfinder_v1::builder::cloud_location_finder::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_locationfinder_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -410,7 +413,7 @@ pub mod cloud_location_finder {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -420,15 +423,15 @@ pub mod cloud_location_finder {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -437,17 +440,17 @@ pub mod cloud_location_finder {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -477,8 +480,8 @@ pub mod cloud_location_finder {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -488,7 +491,7 @@ pub mod cloud_location_finder {
     /// # Example
     /// ```
     /// # use google_cloud_locationfinder_v1::builder::cloud_location_finder::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_locationfinder_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -519,7 +522,7 @@ pub mod cloud_location_finder {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -529,7 +532,7 @@ pub mod cloud_location_finder {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -540,8 +543,8 @@ pub mod cloud_location_finder {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/locationfinder/v1/src/client.rs b/src/generated/cloud/locationfinder/v1/src/client.rs
index 39833c32e9..7fd7fcd290 100644
--- a/src/generated/cloud/locationfinder/v1/src/client.rs
+++ b/src/generated/cloud/locationfinder/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_locationfinder_v1::client::CloudLocationFinder;
 /// let client = CloudLocationFinder::builder().build().await?;
 /// // use `client` to make requests to the Cloud Location Finder API.
@@ -66,15 +66,13 @@ impl CloudLocationFinder {
     /// Returns a builder for [CloudLocationFinder].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_locationfinder_v1::client::CloudLocationFinder;
     /// let client = CloudLocationFinder::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_location_finder::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cloud_location_finder::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cloud_location_finder::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl CloudLocationFinder {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudLocationFinder>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudLocationFinder>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -109,13 +107,13 @@ impl CloudLocationFinder {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudLocationFinder> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudLocationFinder> {
         super::transport::CloudLocationFinder::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudLocationFinder> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudLocationFinder> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudLocationFinder::new)
diff --git a/src/generated/cloud/locationfinder/v1/src/lib.rs b/src/generated/cloud/locationfinder/v1/src/lib.rs
index e7ac8088e1..3a6671f5eb 100644
--- a/src/generated/cloud/locationfinder/v1/src/lib.rs
+++ b/src/generated/cloud/locationfinder/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/locationfinder/v1/src/model.rs b/src/generated/cloud/locationfinder/v1/src/model.rs
index 281e56e68f..9a9b54c5d8 100644
--- a/src/generated/cloud/locationfinder/v1/src/model.rs
+++ b/src/generated/cloud/locationfinder/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate lazy_static;
 extern crate serde;
@@ -669,7 +669,7 @@ impl wkt::message::Message for ListCloudLocationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListCloudLocationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListCloudLocationsResponse {
     type PageItem = crate::model::CloudLocation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -887,7 +887,7 @@ impl wkt::message::Message for SearchCloudLocationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SearchCloudLocationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SearchCloudLocationsResponse {
     type PageItem = crate::model::CloudLocation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/locationfinder/v1/src/stub.rs b/src/generated/cloud/locationfinder/v1/src/stub.rs
index 7eec2621c8..1f126f0a22 100644
--- a/src/generated/cloud/locationfinder/v1/src/stub.rs
+++ b/src/generated/cloud/locationfinder/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait CloudLocationFinder: std::fmt::Debug + Send + Sync {
     fn list_cloud_locations(
         &self,
         _req: crate::model::ListCloudLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListCloudLocationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListCloudLocationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait CloudLocationFinder: std::fmt::Debug + Send + Sync {
     fn get_cloud_location(
         &self,
         _req: crate::model::GetCloudLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CloudLocation>>,
+        Output = crate::Result<crate::Response<crate::model::CloudLocation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait CloudLocationFinder: std::fmt::Debug + Send + Sync {
     fn search_cloud_locations(
         &self,
         _req: crate::model::SearchCloudLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SearchCloudLocationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SearchCloudLocationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +75,10 @@ pub trait CloudLocationFinder: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -88,9 +88,9 @@ pub trait CloudLocationFinder: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/locationfinder/v1/src/stub/dynamic.rs b/src/generated/cloud/locationfinder/v1/src/stub/dynamic.rs
index 5a7ae50646..26667b1cff 100644
--- a/src/generated/cloud/locationfinder/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/locationfinder/v1/src/stub/dynamic.rs
@@ -20,32 +20,32 @@ pub trait CloudLocationFinder: std::fmt::Debug + Send + Sync {
     async fn list_cloud_locations(
         &self,
         req: crate::model::ListCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCloudLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCloudLocationsResponse>>;
 
     async fn get_cloud_location(
         &self,
         req: crate::model::GetCloudLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudLocation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudLocation>>;
 
     async fn search_cloud_locations(
         &self,
         req: crate::model::SearchCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchCloudLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchCloudLocationsResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 }
 
 /// All implementations of [super::CloudLocationFinder] also implement [CloudLocationFinder].
@@ -55,8 +55,8 @@ impl<T: super::CloudLocationFinder> CloudLocationFinder for T {
     async fn list_cloud_locations(
         &self,
         req: crate::model::ListCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListCloudLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListCloudLocationsResponse>> {
         T::list_cloud_locations(self, req, options).await
     }
 
@@ -64,8 +64,8 @@ impl<T: super::CloudLocationFinder> CloudLocationFinder for T {
     async fn get_cloud_location(
         &self,
         req: crate::model::GetCloudLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CloudLocation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CloudLocation>> {
         T::get_cloud_location(self, req, options).await
     }
 
@@ -73,8 +73,8 @@ impl<T: super::CloudLocationFinder> CloudLocationFinder for T {
     async fn search_cloud_locations(
         &self,
         req: crate::model::SearchCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SearchCloudLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SearchCloudLocationsResponse>> {
         T::search_cloud_locations(self, req, options).await
     }
 
@@ -82,9 +82,8 @@ impl<T: super::CloudLocationFinder> CloudLocationFinder for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -92,8 +91,8 @@ impl<T: super::CloudLocationFinder> CloudLocationFinder for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/locationfinder/v1/src/tracing.rs b/src/generated/cloud/locationfinder/v1/src/tracing.rs
index 4c1cd97798..8d83f2f151 100644
--- a/src/generated/cloud/locationfinder/v1/src/tracing.rs
+++ b/src/generated/cloud/locationfinder/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_cloud_locations(
         &self,
         req: crate::model::ListCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCloudLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCloudLocationsResponse>> {
         self.inner.list_cloud_locations(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_cloud_location(
         &self,
         req: crate::model::GetCloudLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudLocation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudLocation>> {
         self.inner.get_cloud_location(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn search_cloud_locations(
         &self,
         req: crate::model::SearchCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchCloudLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchCloudLocationsResponse>> {
         self.inner.search_cloud_locations(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/locationfinder/v1/src/transport.rs b/src/generated/cloud/locationfinder/v1/src/transport.rs
index 4885ed21b0..2865af2fb2 100644
--- a/src/generated/cloud/locationfinder/v1/src/transport.rs
+++ b/src/generated/cloud/locationfinder/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudLocationFinder](super::stub::CloudLocationFinder) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudLocationFinder {
 }
 
 impl CloudLocationFinder {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
     async fn list_cloud_locations(
         &self,
         req: crate::model::ListCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListCloudLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListCloudLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -89,9 +89,9 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -106,13 +106,13 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
     async fn get_cloud_location(
         &self,
         req: crate::model::GetCloudLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CloudLocation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CloudLocation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -153,9 +153,9 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -170,13 +170,13 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
     async fn search_cloud_locations(
         &self,
         req: crate::model::SearchCloudLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SearchCloudLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SearchCloudLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -217,9 +217,9 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -234,13 +234,13 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -270,9 +270,9 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -287,13 +287,13 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -330,9 +330,9 @@ impl super::stub::CloudLocationFinder for CloudLocationFinder {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/lustre/v1/Cargo.toml b/src/generated/cloud/lustre/v1/Cargo.toml
index 89a0032818..13428db060 100644
--- a/src/generated/cloud/lustre/v1/Cargo.toml
+++ b/src/generated/cloud/lustre/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/lustre/v1/src/builder.rs b/src/generated/cloud/lustre/v1/src/builder.rs
index 4ad21682f0..8624ab0946 100644
--- a/src/generated/cloud/lustre/v1/src/builder.rs
+++ b/src/generated/cloud/lustre/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod lustre {
     /// A builder for [Lustre][crate::client::Lustre].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_lustre_v1::*;
     /// # use builder::lustre::ClientBuilder;
     /// # use client::Lustre;
@@ -30,19 +30,18 @@ pub mod lustre {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Lustre;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Lustre;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod lustre {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Lustre>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod lustre {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -104,7 +103,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -114,13 +113,13 @@ pub mod lustre {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -129,15 +128,17 @@ pub mod lustre {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -175,8 +176,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -186,7 +187,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -212,7 +213,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -222,7 +223,7 @@ pub mod lustre {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -235,8 +236,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -246,7 +247,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -273,7 +274,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -288,7 +289,7 @@ pub mod lustre {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -305,7 +306,7 @@ pub mod lustre {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -378,8 +379,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -389,7 +390,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -416,7 +417,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -431,7 +432,7 @@ pub mod lustre {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -448,7 +449,7 @@ pub mod lustre {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -523,8 +524,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -534,7 +535,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -561,7 +562,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -576,7 +577,7 @@ pub mod lustre {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -588,7 +589,7 @@ pub mod lustre {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -631,8 +632,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -642,7 +643,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::ImportData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -669,7 +670,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -684,7 +685,7 @@ pub mod lustre {
             (*self.0.stub)
                 .import_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `import_data`.
@@ -703,7 +704,7 @@ pub mod lustre {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -802,8 +803,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ImportData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ImportData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -813,7 +814,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::ExportData;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -840,7 +841,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -855,7 +856,7 @@ pub mod lustre {
             (*self.0.stub)
                 .export_data(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_data`.
@@ -874,7 +875,7 @@ pub mod lustre {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -973,8 +974,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportData {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportData {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -984,8 +985,8 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1017,7 +1018,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1027,15 +1028,15 @@ pub mod lustre {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1044,17 +1045,17 @@ pub mod lustre {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1084,8 +1085,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1095,7 +1096,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1124,7 +1125,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1134,7 +1135,7 @@ pub mod lustre {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1145,8 +1146,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1156,8 +1157,8 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1191,7 +1192,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1201,15 +1202,15 @@ pub mod lustre {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1218,17 +1219,17 @@ pub mod lustre {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1264,8 +1265,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1275,7 +1276,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1304,7 +1305,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1314,7 +1315,7 @@ pub mod lustre {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1325,8 +1326,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1336,7 +1337,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1367,7 +1368,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1377,7 +1378,7 @@ pub mod lustre {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1388,8 +1389,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1399,7 +1400,7 @@ pub mod lustre {
     /// # Example
     /// ```
     /// # use google_cloud_lustre_v1::builder::lustre::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_lustre_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1430,7 +1431,7 @@ pub mod lustre {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1440,7 +1441,7 @@ pub mod lustre {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1451,8 +1452,8 @@ pub mod lustre {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/lustre/v1/src/client.rs b/src/generated/cloud/lustre/v1/src/client.rs
index f99ca435ce..c96e0988ca 100644
--- a/src/generated/cloud/lustre/v1/src/client.rs
+++ b/src/generated/cloud/lustre/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_lustre_v1::client::Lustre;
 /// let client = Lustre::builder().build().await?;
 /// // use `client` to make requests to the Google Cloud Managed Lustre API.
@@ -66,13 +66,13 @@ impl Lustre {
     /// Returns a builder for [Lustre].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_lustre_v1::client::Lustre;
     /// let client = Lustre::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::lustre::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::lustre::client::Factory)
+        crate::new_client_builder(super::builder::lustre::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Lustre {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Lustre>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Lustre>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Lustre {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Lustre> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Lustre> {
         super::transport::Lustre::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Lustre> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Lustre> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Lustre::new)
diff --git a/src/generated/cloud/lustre/v1/src/lib.rs b/src/generated/cloud/lustre/v1/src/lib.rs
index eb069e270e..a89975af08 100644
--- a/src/generated/cloud/lustre/v1/src/lib.rs
+++ b/src/generated/cloud/lustre/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/lustre/v1/src/model.rs b/src/generated/cloud/lustre/v1/src/model.rs
index 207f4d6f88..ba2b1c1b79 100644
--- a/src/generated/cloud/lustre/v1/src/model.rs
+++ b/src/generated/cloud/lustre/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -655,7 +655,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/lustre/v1/src/stub.rs b/src/generated/cloud/lustre/v1/src/stub.rs
index 179533e6c9..7a07a33c06 100644
--- a/src/generated/cloud/lustre/v1/src/stub.rs
+++ b/src/generated/cloud/lustre/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn import_data(
         &self,
         _req: crate::model::ImportDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn export_data(
         &self,
         _req: crate::model::ExportDataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,10 +118,10 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -132,9 +131,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,10 +142,10 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -156,9 +155,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,8 +166,8 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -176,8 +175,8 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -187,9 +186,9 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -198,8 +197,8 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/lustre/v1/src/stub/dynamic.rs b/src/generated/cloud/lustre/v1/src/stub/dynamic.rs
index c21ce8aa01..5c2985236c 100644
--- a/src/generated/cloud/lustre/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/lustre/v1/src/stub/dynamic.rs
@@ -20,92 +20,90 @@ pub trait Lustre: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Lustre] also implement [Lustre].
@@ -115,8 +113,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -124,8 +122,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -133,8 +131,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -142,8 +140,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -151,8 +149,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -160,8 +158,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::import_data(self, req, options).await
     }
 
@@ -169,8 +167,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_data(self, req, options).await
     }
 
@@ -178,9 +176,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -188,8 +185,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -197,10 +194,9 @@ impl<T: super::Lustre> Lustre for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -208,8 +204,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -217,8 +213,8 @@ impl<T: super::Lustre> Lustre for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -226,22 +222,22 @@ impl<T: super::Lustre> Lustre for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/lustre/v1/src/tracing.rs b/src/generated/cloud/lustre/v1/src/tracing.rs
index 2561d25ebb..f4a631ef75 100644
--- a/src/generated/cloud/lustre/v1/src/tracing.rs
+++ b/src/generated/cloud/lustre/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.import_data(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_data(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -122,9 +122,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -132,8 +131,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -141,8 +140,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -150,22 +149,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/lustre/v1/src/transport.rs b/src/generated/cloud/lustre/v1/src/transport.rs
index c558638066..62e144a361 100644
--- a/src/generated/cloud/lustre/v1/src/transport.rs
+++ b/src/generated/cloud/lustre/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Lustre](super::stub::Lustre) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Lustre {
 }
 
 impl Lustre {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Lustre for Lustre {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Lustre for Lustre {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Lustre for Lustre {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::Lustre for Lustre {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::Lustre for Lustre {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +381,13 @@ impl super::stub::Lustre for Lustre {
     async fn import_data(
         &self,
         req: crate::model::ImportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +428,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +445,13 @@ impl super::stub::Lustre for Lustre {
     async fn export_data(
         &self,
         req: crate::model::ExportDataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +492,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +509,13 @@ impl super::stub::Lustre for Lustre {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -545,9 +545,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -562,13 +562,13 @@ impl super::stub::Lustre for Lustre {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -605,9 +605,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -622,14 +622,13 @@ impl super::stub::Lustre for Lustre {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -671,9 +670,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -688,13 +687,13 @@ impl super::stub::Lustre for Lustre {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -735,9 +734,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -752,13 +751,13 @@ impl super::stub::Lustre for Lustre {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -799,9 +798,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -810,24 +809,25 @@ impl super::stub::Lustre for Lustre {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -868,9 +868,9 @@ impl super::stub::Lustre for Lustre {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -879,25 +879,26 @@ impl super::stub::Lustre for Lustre {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/maintenance/api/v1/Cargo.toml b/src/generated/cloud/maintenance/api/v1/Cargo.toml
index 091ead2c3c..d0f1cf42ff 100644
--- a/src/generated/cloud/maintenance/api/v1/Cargo.toml
+++ b/src/generated/cloud/maintenance/api/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-location.workspace = true
 lazy_static.workspace           = true
 serde.workspace                 = true
diff --git a/src/generated/cloud/maintenance/api/v1/src/builder.rs b/src/generated/cloud/maintenance/api/v1/src/builder.rs
index 357fdee9a4..a04271ee91 100644
--- a/src/generated/cloud/maintenance/api/v1/src/builder.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod maintenance {
     /// A builder for [Maintenance][crate::client::Maintenance].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_maintenance_api_v1::*;
     /// # use builder::maintenance::ClientBuilder;
     /// # use client::Maintenance;
@@ -30,19 +30,18 @@ pub mod maintenance {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Maintenance;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Maintenance;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod maintenance {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Maintenance>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod maintenance {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod maintenance {
     /// # Example
     /// ```
     /// # use google_cloud_maintenance_api_v1::builder::maintenance::SummarizeMaintenances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_maintenance_api_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -111,7 +110,7 @@ pub mod maintenance {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -121,14 +120,16 @@ pub mod maintenance {
             (*self.0.stub)
                 .summarize_maintenances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::SummarizeMaintenancesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::SummarizeMaintenancesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -136,17 +137,17 @@ pub mod maintenance {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::SummarizeMaintenancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -184,8 +185,8 @@ pub mod maintenance {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SummarizeMaintenances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SummarizeMaintenances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -195,8 +196,8 @@ pub mod maintenance {
     /// # Example
     /// ```
     /// # use google_cloud_maintenance_api_v1::builder::maintenance::ListResourceMaintenances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_maintenance_api_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -232,7 +233,7 @@ pub mod maintenance {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -242,15 +243,15 @@ pub mod maintenance {
             (*self.0.stub)
                 .list_resource_maintenances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListResourceMaintenancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -259,17 +260,17 @@ pub mod maintenance {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListResourceMaintenancesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -307,8 +308,8 @@ pub mod maintenance {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListResourceMaintenances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListResourceMaintenances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -318,7 +319,7 @@ pub mod maintenance {
     /// # Example
     /// ```
     /// # use google_cloud_maintenance_api_v1::builder::maintenance::GetResourceMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_maintenance_api_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -349,7 +350,7 @@ pub mod maintenance {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -359,7 +360,7 @@ pub mod maintenance {
             (*self.0.stub)
                 .get_resource_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetResourceMaintenanceRequest::name].
@@ -372,8 +373,8 @@ pub mod maintenance {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetResourceMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetResourceMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -383,8 +384,8 @@ pub mod maintenance {
     /// # Example
     /// ```
     /// # use google_cloud_maintenance_api_v1::builder::maintenance::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_maintenance_api_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -418,7 +419,7 @@ pub mod maintenance {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -428,15 +429,15 @@ pub mod maintenance {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -445,17 +446,17 @@ pub mod maintenance {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -485,8 +486,8 @@ pub mod maintenance {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -496,7 +497,7 @@ pub mod maintenance {
     /// # Example
     /// ```
     /// # use google_cloud_maintenance_api_v1::builder::maintenance::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_maintenance_api_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -527,7 +528,7 @@ pub mod maintenance {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -537,7 +538,7 @@ pub mod maintenance {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -548,8 +549,8 @@ pub mod maintenance {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/maintenance/api/v1/src/client.rs b/src/generated/cloud/maintenance/api/v1/src/client.rs
index fce168d050..e0b88afc4e 100644
--- a/src/generated/cloud/maintenance/api/v1/src/client.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_maintenance_api_v1::client::Maintenance;
 /// let client = Maintenance::builder().build().await?;
 /// // use `client` to make requests to the Maintenance API.
@@ -66,13 +66,13 @@ impl Maintenance {
     /// Returns a builder for [Maintenance].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_maintenance_api_v1::client::Maintenance;
     /// let client = Maintenance::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::maintenance::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::maintenance::client::Factory)
+        crate::new_client_builder(super::builder::maintenance::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Maintenance {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Maintenance>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Maintenance>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Maintenance {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Maintenance> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Maintenance> {
         super::transport::Maintenance::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Maintenance> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Maintenance> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Maintenance::new)
diff --git a/src/generated/cloud/maintenance/api/v1/src/lib.rs b/src/generated/cloud/maintenance/api/v1/src/lib.rs
index 0c2cdf7281..6b1a1e6fcf 100644
--- a/src/generated/cloud/maintenance/api/v1/src/lib.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/maintenance/api/v1/src/model.rs b/src/generated/cloud/maintenance/api/v1/src/model.rs
index 4710c5c1a9..542bb4bc3c 100644
--- a/src/generated/cloud/maintenance/api/v1/src/model.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate lazy_static;
 extern crate serde;
@@ -218,7 +218,7 @@ impl wkt::message::Message for SummarizeMaintenancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for SummarizeMaintenancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for SummarizeMaintenancesResponse {
     type PageItem = crate::model::MaintenanceSummary;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1898,7 +1898,7 @@ impl wkt::message::Message for ListResourceMaintenancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListResourceMaintenancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListResourceMaintenancesResponse {
     type PageItem = crate::model::ResourceMaintenance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/maintenance/api/v1/src/stub.rs b/src/generated/cloud/maintenance/api/v1/src/stub.rs
index 4b73726fa6..79a0c404ab 100644
--- a/src/generated/cloud/maintenance/api/v1/src/stub.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait Maintenance: std::fmt::Debug + Send + Sync {
     fn summarize_maintenances(
         &self,
         _req: crate::model::SummarizeMaintenancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SummarizeMaintenancesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SummarizeMaintenancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,11 +53,9 @@ pub trait Maintenance: std::fmt::Debug + Send + Sync {
     fn list_resource_maintenances(
         &self,
         _req: crate::model::ListResourceMaintenancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListResourceMaintenancesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListResourceMaintenancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -68,9 +64,9 @@ pub trait Maintenance: std::fmt::Debug + Send + Sync {
     fn get_resource_maintenance(
         &self,
         _req: crate::model::GetResourceMaintenanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResourceMaintenance>>,
+        Output = crate::Result<crate::Response<crate::model::ResourceMaintenance>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -79,10 +75,10 @@ pub trait Maintenance: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -92,9 +88,9 @@ pub trait Maintenance: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/maintenance/api/v1/src/stub/dynamic.rs b/src/generated/cloud/maintenance/api/v1/src/stub/dynamic.rs
index 0ef7bffb12..525f8daefb 100644
--- a/src/generated/cloud/maintenance/api/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/stub/dynamic.rs
@@ -20,32 +20,32 @@ pub trait Maintenance: std::fmt::Debug + Send + Sync {
     async fn summarize_maintenances(
         &self,
         req: crate::model::SummarizeMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SummarizeMaintenancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SummarizeMaintenancesResponse>>;
 
     async fn list_resource_maintenances(
         &self,
         req: crate::model::ListResourceMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceMaintenancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceMaintenancesResponse>>;
 
     async fn get_resource_maintenance(
         &self,
         req: crate::model::GetResourceMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceMaintenance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceMaintenance>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 }
 
 /// All implementations of [super::Maintenance] also implement [Maintenance].
@@ -55,8 +55,8 @@ impl<T: super::Maintenance> Maintenance for T {
     async fn summarize_maintenances(
         &self,
         req: crate::model::SummarizeMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SummarizeMaintenancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SummarizeMaintenancesResponse>> {
         T::summarize_maintenances(self, req, options).await
     }
 
@@ -64,9 +64,8 @@ impl<T: super::Maintenance> Maintenance for T {
     async fn list_resource_maintenances(
         &self,
         req: crate::model::ListResourceMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListResourceMaintenancesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListResourceMaintenancesResponse>> {
         T::list_resource_maintenances(self, req, options).await
     }
 
@@ -74,8 +73,8 @@ impl<T: super::Maintenance> Maintenance for T {
     async fn get_resource_maintenance(
         &self,
         req: crate::model::GetResourceMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResourceMaintenance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResourceMaintenance>> {
         T::get_resource_maintenance(self, req, options).await
     }
 
@@ -83,9 +82,8 @@ impl<T: super::Maintenance> Maintenance for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -93,8 +91,8 @@ impl<T: super::Maintenance> Maintenance for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/maintenance/api/v1/src/tracing.rs b/src/generated/cloud/maintenance/api/v1/src/tracing.rs
index a9b9a5dedb..b98dd1453b 100644
--- a/src/generated/cloud/maintenance/api/v1/src/tracing.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn summarize_maintenances(
         &self,
         req: crate::model::SummarizeMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SummarizeMaintenancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SummarizeMaintenancesResponse>> {
         self.inner.summarize_maintenances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_resource_maintenances(
         &self,
         req: crate::model::ListResourceMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceMaintenancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceMaintenancesResponse>> {
         self.inner.list_resource_maintenances(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_resource_maintenance(
         &self,
         req: crate::model::GetResourceMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceMaintenance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceMaintenance>> {
         self.inner.get_resource_maintenance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/maintenance/api/v1/src/transport.rs b/src/generated/cloud/maintenance/api/v1/src/transport.rs
index 22e679b4c7..8d1d015857 100644
--- a/src/generated/cloud/maintenance/api/v1/src/transport.rs
+++ b/src/generated/cloud/maintenance/api/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Maintenance](super::stub::Maintenance) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Maintenance {
 }
 
 impl Maintenance {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Maintenance for Maintenance {
     async fn summarize_maintenances(
         &self,
         req: crate::model::SummarizeMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SummarizeMaintenancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SummarizeMaintenancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Maintenance for Maintenance {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Maintenance for Maintenance {
     async fn list_resource_maintenances(
         &self,
         req: crate::model::ListResourceMaintenancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListResourceMaintenancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListResourceMaintenancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Maintenance for Maintenance {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Maintenance for Maintenance {
     async fn get_resource_maintenance(
         &self,
         req: crate::model::GetResourceMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResourceMaintenance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResourceMaintenance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -218,9 +218,9 @@ impl super::stub::Maintenance for Maintenance {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -235,13 +235,13 @@ impl super::stub::Maintenance for Maintenance {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -271,9 +271,9 @@ impl super::stub::Maintenance for Maintenance {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -288,13 +288,13 @@ impl super::stub::Maintenance for Maintenance {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -331,9 +331,9 @@ impl super::stub::Maintenance for Maintenance {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/managedidentities/v1/Cargo.toml b/src/generated/cloud/managedidentities/v1/Cargo.toml
index 7d76d7ce23..6d38082cbd 100644
--- a/src/generated/cloud/managedidentities/v1/Cargo.toml
+++ b/src/generated/cloud/managedidentities/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/managedidentities/v1/src/builder.rs b/src/generated/cloud/managedidentities/v1/src/builder.rs
index 9377e7f92b..bb59cdfbeb 100644
--- a/src/generated/cloud/managedidentities/v1/src/builder.rs
+++ b/src/generated/cloud/managedidentities/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod managed_identities_service {
     /// A builder for [ManagedIdentitiesService][crate::client::ManagedIdentitiesService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedidentities_v1::*;
     /// # use builder::managed_identities_service::ClientBuilder;
     /// # use client::ManagedIdentitiesService;
@@ -30,19 +30,18 @@ pub mod managed_identities_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ManagedIdentitiesService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ManagedIdentitiesService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod managed_identities_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ManagedIdentitiesService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod managed_identities_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::CreateMicrosoftAdDomain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -110,7 +109,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -125,7 +124,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .create_microsoft_ad_domain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_microsoft_ad_domain`.
@@ -141,7 +140,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -208,8 +207,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMicrosoftAdDomain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMicrosoftAdDomain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -219,7 +218,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::ResetAdminPassword;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -250,7 +249,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -260,7 +259,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .reset_admin_password(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ResetAdminPasswordRequest::name].
@@ -273,8 +272,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResetAdminPassword {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResetAdminPassword {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -284,8 +283,8 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::ListDomains;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -316,7 +315,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -326,13 +325,13 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .list_domains(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDomainsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListDomainsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -341,15 +340,17 @@ pub mod managed_identities_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDomainsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDomainsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -387,8 +388,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDomains {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDomains {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -398,7 +399,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::GetDomain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -426,7 +427,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -436,7 +437,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .get_domain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDomainRequest::name].
@@ -449,8 +450,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDomain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDomain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -460,7 +461,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::UpdateDomain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -489,7 +490,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -504,7 +505,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .update_domain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_domain`.
@@ -520,7 +521,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -593,8 +594,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDomain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDomain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -604,7 +605,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::DeleteDomain;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -633,7 +634,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -648,7 +649,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .delete_domain(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_domain`.
@@ -660,7 +661,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -697,8 +698,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDomain {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDomain {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -708,7 +709,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::AttachTrust;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -737,7 +738,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -752,7 +753,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .attach_trust(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `attach_trust`.
@@ -768,7 +769,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -827,8 +828,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AttachTrust {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AttachTrust {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -838,7 +839,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::ReconfigureTrust;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -870,7 +871,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -885,7 +886,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .reconfigure_trust(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reconfigure_trust`.
@@ -901,7 +902,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -959,8 +960,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReconfigureTrust {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReconfigureTrust {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -970,7 +971,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::DetachTrust;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -999,7 +1000,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1014,7 +1015,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .detach_trust(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `detach_trust`.
@@ -1030,7 +1031,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1089,8 +1090,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DetachTrust {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DetachTrust {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1100,7 +1101,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::ValidateTrust;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1129,7 +1130,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1144,7 +1145,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .validate_trust(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `validate_trust`.
@@ -1160,7 +1161,7 @@ pub mod managed_identities_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1219,8 +1220,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateTrust {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateTrust {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1230,8 +1231,8 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1267,7 +1268,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1277,15 +1278,15 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1294,17 +1295,17 @@ pub mod managed_identities_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1340,8 +1341,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1351,7 +1352,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1382,7 +1383,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1392,7 +1393,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1403,8 +1404,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1414,7 +1415,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1447,7 +1448,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1457,7 +1458,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1468,8 +1469,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1479,7 +1480,7 @@ pub mod managed_identities_service {
     /// # Example
     /// ```
     /// # use google_cloud_managedidentities_v1::builder::managed_identities_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedidentities_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1512,7 +1513,7 @@ pub mod managed_identities_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1522,7 +1523,7 @@ pub mod managed_identities_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1533,8 +1534,8 @@ pub mod managed_identities_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/managedidentities/v1/src/client.rs b/src/generated/cloud/managedidentities/v1/src/client.rs
index f652b5997d..a9117f6168 100644
--- a/src/generated/cloud/managedidentities/v1/src/client.rs
+++ b/src/generated/cloud/managedidentities/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_managedidentities_v1::client::ManagedIdentitiesService;
 /// let client = ManagedIdentitiesService::builder().build().await?;
 /// // use `client` to make requests to the Managed Service for Microsoft Active Directory API.
@@ -98,15 +98,13 @@ impl ManagedIdentitiesService {
     /// Returns a builder for [ManagedIdentitiesService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedidentities_v1::client::ManagedIdentitiesService;
     /// let client = ManagedIdentitiesService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::managed_identities_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::managed_identities_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::managed_identities_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -124,14 +122,14 @@ impl ManagedIdentitiesService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::ManagedIdentitiesService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -142,13 +140,13 @@ impl ManagedIdentitiesService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedIdentitiesService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedIdentitiesService> {
         super::transport::ManagedIdentitiesService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedIdentitiesService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedIdentitiesService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ManagedIdentitiesService::new)
diff --git a/src/generated/cloud/managedidentities/v1/src/lib.rs b/src/generated/cloud/managedidentities/v1/src/lib.rs
index 78a33cbd5a..2994db8eed 100644
--- a/src/generated/cloud/managedidentities/v1/src/lib.rs
+++ b/src/generated/cloud/managedidentities/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/managedidentities/v1/src/model.rs b/src/generated/cloud/managedidentities/v1/src/model.rs
index 0286f36144..436159b6dd 100644
--- a/src/generated/cloud/managedidentities/v1/src/model.rs
+++ b/src/generated/cloud/managedidentities/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
 extern crate lazy_static;
@@ -552,7 +552,7 @@ impl wkt::message::Message for ListDomainsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDomainsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDomainsResponse {
     type PageItem = crate::model::Domain;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/managedidentities/v1/src/stub.rs b/src/generated/cloud/managedidentities/v1/src/stub.rs
index f06a9bb406..f7d033ebe1 100644
--- a/src/generated/cloud/managedidentities/v1/src/stub.rs
+++ b/src/generated/cloud/managedidentities/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn create_microsoft_ad_domain(
         &self,
         _req: crate::model::CreateMicrosoftAdDomainRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn reset_admin_password(
         &self,
         _req: crate::model::ResetAdminPasswordRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResetAdminPasswordResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ResetAdminPasswordResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn list_domains(
         &self,
         _req: crate::model::ListDomainsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDomainsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDomainsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,10 +75,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn get_domain(
         &self,
         _req: crate::model::GetDomainRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Domain>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Domain>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,9 +85,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn update_domain(
         &self,
         _req: crate::model::UpdateDomainRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn delete_domain(
         &self,
         _req: crate::model::DeleteDomainRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn attach_trust(
         &self,
         _req: crate::model::AttachTrustRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn reconfigure_trust(
         &self,
         _req: crate::model::ReconfigureTrustRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +129,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn detach_trust(
         &self,
         _req: crate::model::DetachTrustRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +140,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn validate_trust(
         &self,
         _req: crate::model::ValidateTrustRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,10 +151,10 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -165,9 +164,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,8 +175,8 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -185,8 +184,8 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -196,9 +195,9 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -207,8 +206,8 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/managedidentities/v1/src/stub/dynamic.rs b/src/generated/cloud/managedidentities/v1/src/stub/dynamic.rs
index b4375e7d7c..b738c13997 100644
--- a/src/generated/cloud/managedidentities/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/managedidentities/v1/src/stub/dynamic.rs
@@ -20,98 +20,96 @@ pub trait ManagedIdentitiesService: std::fmt::Debug + Send + Sync {
     async fn create_microsoft_ad_domain(
         &self,
         req: crate::model::CreateMicrosoftAdDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reset_admin_password(
         &self,
         req: crate::model::ResetAdminPasswordRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResetAdminPasswordResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResetAdminPasswordResponse>>;
 
     async fn list_domains(
         &self,
         req: crate::model::ListDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDomainsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDomainsResponse>>;
 
     async fn get_domain(
         &self,
         req: crate::model::GetDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Domain>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Domain>>;
 
     async fn update_domain(
         &self,
         req: crate::model::UpdateDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_domain(
         &self,
         req: crate::model::DeleteDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn attach_trust(
         &self,
         req: crate::model::AttachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reconfigure_trust(
         &self,
         req: crate::model::ReconfigureTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn detach_trust(
         &self,
         req: crate::model::DetachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn validate_trust(
         &self,
         req: crate::model::ValidateTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ManagedIdentitiesService] also implement [ManagedIdentitiesService].
@@ -121,8 +119,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn create_microsoft_ad_domain(
         &self,
         req: crate::model::CreateMicrosoftAdDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_microsoft_ad_domain(self, req, options).await
     }
 
@@ -130,8 +128,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn reset_admin_password(
         &self,
         req: crate::model::ResetAdminPasswordRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResetAdminPasswordResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResetAdminPasswordResponse>> {
         T::reset_admin_password(self, req, options).await
     }
 
@@ -139,8 +137,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn list_domains(
         &self,
         req: crate::model::ListDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDomainsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDomainsResponse>> {
         T::list_domains(self, req, options).await
     }
 
@@ -148,8 +146,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn get_domain(
         &self,
         req: crate::model::GetDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Domain>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Domain>> {
         T::get_domain(self, req, options).await
     }
 
@@ -157,8 +155,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn update_domain(
         &self,
         req: crate::model::UpdateDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_domain(self, req, options).await
     }
 
@@ -166,8 +164,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn delete_domain(
         &self,
         req: crate::model::DeleteDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_domain(self, req, options).await
     }
 
@@ -175,8 +173,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn attach_trust(
         &self,
         req: crate::model::AttachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::attach_trust(self, req, options).await
     }
 
@@ -184,8 +182,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn reconfigure_trust(
         &self,
         req: crate::model::ReconfigureTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reconfigure_trust(self, req, options).await
     }
 
@@ -193,8 +191,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn detach_trust(
         &self,
         req: crate::model::DetachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::detach_trust(self, req, options).await
     }
 
@@ -202,8 +200,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn validate_trust(
         &self,
         req: crate::model::ValidateTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::validate_trust(self, req, options).await
     }
 
@@ -211,10 +209,9 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -222,8 +219,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -231,8 +228,8 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -240,22 +237,22 @@ impl<T: super::ManagedIdentitiesService> ManagedIdentitiesService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/managedidentities/v1/src/tracing.rs b/src/generated/cloud/managedidentities/v1/src/tracing.rs
index 86a7ed8b0a..c3b0aa4a46 100644
--- a/src/generated/cloud/managedidentities/v1/src/tracing.rs
+++ b/src/generated/cloud/managedidentities/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn create_microsoft_ad_domain(
         &self,
         req: crate::model::CreateMicrosoftAdDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_microsoft_ad_domain(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn reset_admin_password(
         &self,
         req: crate::model::ResetAdminPasswordRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResetAdminPasswordResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResetAdminPasswordResponse>> {
         self.inner.reset_admin_password(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn list_domains(
         &self,
         req: crate::model::ListDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDomainsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDomainsResponse>> {
         self.inner.list_domains(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn get_domain(
         &self,
         req: crate::model::GetDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Domain>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Domain>> {
         self.inner.get_domain(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_domain(
         &self,
         req: crate::model::UpdateDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_domain(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_domain(
         &self,
         req: crate::model::DeleteDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_domain(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn attach_trust(
         &self,
         req: crate::model::AttachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.attach_trust(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn reconfigure_trust(
         &self,
         req: crate::model::ReconfigureTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reconfigure_trust(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn detach_trust(
         &self,
         req: crate::model::DetachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.detach_trust(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn validate_trust(
         &self,
         req: crate::model::ValidateTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.validate_trust(req, options).await
     }
 
@@ -131,9 +131,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -141,8 +140,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -150,8 +149,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -159,22 +158,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/managedidentities/v1/src/transport.rs b/src/generated/cloud/managedidentities/v1/src/transport.rs
index 76027af5c1..b4b77663ac 100644
--- a/src/generated/cloud/managedidentities/v1/src/transport.rs
+++ b/src/generated/cloud/managedidentities/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ManagedIdentitiesService](super::stub::ManagedIdentitiesService) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ManagedIdentitiesService {
 }
 
 impl ManagedIdentitiesService {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn create_microsoft_ad_domain(
         &self,
         req: crate::model::CreateMicrosoftAdDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -85,9 +85,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -102,13 +102,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn reset_admin_password(
         &self,
         req: crate::model::ResetAdminPasswordRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResetAdminPasswordResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResetAdminPasswordResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -145,9 +145,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -162,13 +162,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn list_domains(
         &self,
         req: crate::model::ListDomainsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDomainsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDomainsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -207,9 +207,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -224,13 +224,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn get_domain(
         &self,
         req: crate::model::GetDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Domain>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Domain>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -267,9 +267,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -284,13 +284,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn update_domain(
         &self,
         req: crate::model::UpdateDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -345,9 +345,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -362,13 +362,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn delete_domain(
         &self,
         req: crate::model::DeleteDomainRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -405,9 +405,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -422,13 +422,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn attach_trust(
         &self,
         req: crate::model::AttachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -465,9 +465,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -482,13 +482,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn reconfigure_trust(
         &self,
         req: crate::model::ReconfigureTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -525,9 +525,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -542,13 +542,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn detach_trust(
         &self,
         req: crate::model::DetachTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -585,9 +585,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -602,13 +602,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn validate_trust(
         &self,
         req: crate::model::ValidateTrustRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -645,9 +645,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -662,14 +662,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -709,9 +708,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -726,13 +725,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -769,9 +768,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -786,13 +785,13 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -829,9 +828,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -840,24 +839,25 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -894,9 +894,9 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -905,25 +905,26 @@ impl super::stub::ManagedIdentitiesService for ManagedIdentitiesService {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/Cargo.toml b/src/generated/cloud/managedkafka/schemaregistry/v1/Cargo.toml
index 1dcdbfd891..077001a3f3 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/Cargo.toml
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/Cargo.toml
@@ -40,9 +40,9 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
 google-cloud-api.workspace         = true
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 lazy_static.workspace              = true
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/builder.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/builder.rs
index f89c4b4470..18aa5b9a91 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/builder.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod managed_schema_registry {
     /// A builder for [ManagedSchemaRegistry][crate::client::ManagedSchemaRegistry].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedkafka_schemaregistry_v1::*;
     /// # use builder::managed_schema_registry::ClientBuilder;
     /// # use client::ManagedSchemaRegistry;
@@ -30,19 +30,18 @@ pub mod managed_schema_registry {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ManagedSchemaRegistry;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ManagedSchemaRegistry;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod managed_schema_registry {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ManagedSchemaRegistry>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod managed_schema_registry {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,7 +75,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetSchemaRegistry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -107,7 +106,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,7 +116,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_schema_registry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaRegistryRequest::name].
@@ -130,8 +129,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchemaRegistry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchemaRegistry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -141,7 +140,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListSchemaRegistries;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -172,7 +171,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -182,7 +181,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_schema_registries(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListSchemaRegistriesRequest::parent].
@@ -195,8 +194,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSchemaRegistries {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSchemaRegistries {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -206,7 +205,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::CreateSchemaRegistry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -237,7 +236,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -247,7 +246,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .create_schema_registry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateSchemaRegistryRequest::parent].
@@ -290,8 +289,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSchemaRegistry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSchemaRegistry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -301,7 +300,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::DeleteSchemaRegistry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -332,7 +331,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -342,7 +341,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .delete_schema_registry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSchemaRegistryRequest::name].
@@ -355,8 +354,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSchemaRegistry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSchemaRegistry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -366,7 +365,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetContext;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -394,7 +393,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -404,7 +403,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_context(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetContextRequest::name].
@@ -417,8 +416,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetContext {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetContext {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -428,7 +427,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListContexts;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -456,7 +455,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -466,7 +465,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_contexts(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListContextsRequest::parent].
@@ -479,8 +478,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListContexts {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListContexts {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -490,7 +489,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -518,7 +517,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -528,7 +527,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaRequest::name].
@@ -559,8 +558,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -570,7 +569,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetRawSchema;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -598,7 +597,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -608,7 +607,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_raw_schema(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaRequest::name].
@@ -639,8 +638,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRawSchema {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRawSchema {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -650,7 +649,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListSchemaVersions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -681,7 +680,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -691,7 +690,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_schema_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListSchemaVersionsRequest::parent].
@@ -740,8 +739,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSchemaVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSchemaVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -751,7 +750,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListSchemaTypes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -779,7 +778,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -789,7 +788,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_schema_types(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListSchemaTypesRequest::parent].
@@ -802,8 +801,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSchemaTypes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSchemaTypes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -813,7 +812,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListSubjects;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -841,7 +840,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -851,7 +850,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_subjects(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListSubjectsRequest::parent].
@@ -900,8 +899,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSubjects {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSubjects {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -911,7 +910,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListSubjectsBySchemaId;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -942,7 +941,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -952,7 +951,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_subjects_by_schema_id(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListSubjectsBySchemaIdRequest::parent].
@@ -1001,8 +1000,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSubjectsBySchemaId {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSubjectsBySchemaId {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1012,7 +1011,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::DeleteSubject;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1040,7 +1039,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1050,7 +1049,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .delete_subject(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSubjectRequest::name].
@@ -1081,8 +1080,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSubject {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSubject {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1092,7 +1091,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::LookupVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1120,7 +1119,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1130,7 +1129,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .lookup_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::LookupVersionRequest::parent].
@@ -1216,8 +1215,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for LookupVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for LookupVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1227,7 +1226,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1255,7 +1254,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1265,7 +1264,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVersionRequest::name].
@@ -1296,8 +1295,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1307,7 +1306,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetRawSchemaVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1335,7 +1334,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1345,7 +1344,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_raw_schema_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVersionRequest::name].
@@ -1376,8 +1375,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRawSchemaVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRawSchemaVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1387,7 +1386,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListVersions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1415,7 +1414,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1425,7 +1424,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_versions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListVersionsRequest::parent].
@@ -1456,8 +1455,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVersions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVersions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1467,7 +1466,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::CreateVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1495,7 +1494,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1505,7 +1504,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .create_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateVersionRequest::parent].
@@ -1609,8 +1608,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1620,7 +1619,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::DeleteVersion;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1648,7 +1647,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1658,7 +1657,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .delete_version(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteVersionRequest::name].
@@ -1689,8 +1688,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVersion {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVersion {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1700,7 +1699,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListReferencedSchemas;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1731,7 +1730,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1741,7 +1740,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_referenced_schemas(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ListReferencedSchemasRequest::parent].
@@ -1754,8 +1753,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReferencedSchemas {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReferencedSchemas {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1765,7 +1764,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::CheckCompatibility;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1796,7 +1795,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1806,7 +1805,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .check_compatibility(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::CheckCompatibilityRequest::name].
@@ -1874,8 +1873,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CheckCompatibility {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CheckCompatibility {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1885,7 +1884,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetSchemaConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1913,7 +1912,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1923,7 +1922,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_schema_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaConfigRequest::name].
@@ -1954,8 +1953,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchemaConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchemaConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1965,7 +1964,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::UpdateSchemaConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1996,7 +1995,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2006,7 +2005,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .update_schema_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateSchemaConfigRequest::name].
@@ -2059,8 +2058,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSchemaConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSchemaConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2070,7 +2069,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::DeleteSchemaConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2101,7 +2100,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2111,7 +2110,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .delete_schema_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSchemaConfigRequest::name].
@@ -2124,8 +2123,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSchemaConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSchemaConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2135,7 +2134,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetSchemaMode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2163,7 +2162,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2173,7 +2172,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_schema_mode(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSchemaModeRequest::name].
@@ -2186,8 +2185,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSchemaMode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSchemaMode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2197,7 +2196,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::UpdateSchemaMode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2228,7 +2227,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2238,7 +2237,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .update_schema_mode(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::UpdateSchemaModeRequest::name].
@@ -2259,8 +2258,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSchemaMode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSchemaMode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2270,7 +2269,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::DeleteSchemaMode;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2301,7 +2300,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2311,7 +2310,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .delete_schema_mode(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteSchemaModeRequest::name].
@@ -2324,8 +2323,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSchemaMode {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSchemaMode {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2335,8 +2334,8 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2370,7 +2369,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2380,15 +2379,15 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2397,17 +2396,17 @@ pub mod managed_schema_registry {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2437,8 +2436,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2448,7 +2447,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2479,7 +2478,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2489,7 +2488,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2500,8 +2499,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2511,8 +2510,8 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2548,7 +2547,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2558,15 +2557,15 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2575,17 +2574,17 @@ pub mod managed_schema_registry {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2621,8 +2620,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2632,7 +2631,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2663,7 +2662,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2673,7 +2672,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2684,8 +2683,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2695,7 +2694,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2728,7 +2727,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2738,7 +2737,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2749,8 +2748,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2760,7 +2759,7 @@ pub mod managed_schema_registry {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_schemaregistry_v1::builder::managed_schema_registry::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_schemaregistry_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2793,7 +2792,7 @@ pub mod managed_schema_registry {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2803,7 +2802,7 @@ pub mod managed_schema_registry {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2814,8 +2813,8 @@ pub mod managed_schema_registry {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/client.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/client.rs
index 568f5cad16..08fb99caf3 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/client.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_managedkafka_schemaregistry_v1::client::ManagedSchemaRegistry;
 /// let client = ManagedSchemaRegistry::builder().build().await?;
 /// // use `client` to make requests to the Managed Service for Apache Kafka API.
@@ -115,15 +115,13 @@ impl ManagedSchemaRegistry {
     /// Returns a builder for [ManagedSchemaRegistry].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedkafka_schemaregistry_v1::client::ManagedSchemaRegistry;
     /// let client = ManagedSchemaRegistry::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::managed_schema_registry::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::managed_schema_registry::client::Factory,
-        )
+        crate::new_client_builder(super::builder::managed_schema_registry::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -141,14 +139,14 @@ impl ManagedSchemaRegistry {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ManagedSchemaRegistry>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ManagedSchemaRegistry>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -158,13 +156,13 @@ impl ManagedSchemaRegistry {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedSchemaRegistry> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedSchemaRegistry> {
         super::transport::ManagedSchemaRegistry::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedSchemaRegistry> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedSchemaRegistry> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ManagedSchemaRegistry::new)
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/lib.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/lib.rs
index 56c8cb2736..6777b8dc1c 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/lib.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/model.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/model.rs
index 8267461c9c..57e7523c96 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/model.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/model.rs
@@ -19,9 +19,9 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
 extern crate google_cloud_api;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate lazy_static;
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub.rs
index f0bcc1de1d..95387954c8 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_schema_registry(
         &self,
         _req: crate::model::GetSchemaRegistryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaRegistry>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaRegistry>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_schema_registries(
         &self,
         _req: crate::model::ListSchemaRegistriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSchemaRegistriesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSchemaRegistriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,9 +64,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn create_schema_registry(
         &self,
         _req: crate::model::CreateSchemaRegistryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaRegistry>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaRegistry>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,8 +75,8 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn delete_schema_registry(
         &self,
         _req: crate::model::DeleteSchemaRegistryRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -84,10 +84,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_context(
         &self,
         _req: crate::model::GetContextRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Context>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Context>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +94,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_contexts(
         &self,
         _req: crate::model::ListContextsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,10 +105,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_schema(
         &self,
         _req: crate::model::GetSchemaRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Schema>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Schema>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -117,9 +115,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_raw_schema(
         &self,
         _req: crate::model::GetSchemaRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,9 +126,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_schema_versions(
         &self,
         _req: crate::model::ListSchemaVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,9 +137,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_schema_types(
         &self,
         _req: crate::model::ListSchemaTypesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -150,9 +148,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_subjects(
         &self,
         _req: crate::model::ListSubjectsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -161,9 +159,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_subjects_by_schema_id(
         &self,
         _req: crate::model::ListSubjectsBySchemaIdRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -172,9 +170,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn delete_subject(
         &self,
         _req: crate::model::DeleteSubjectRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -183,9 +181,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn lookup_version(
         &self,
         _req: crate::model::LookupVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaVersion>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -194,9 +192,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_version(
         &self,
         _req: crate::model::GetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaVersion>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaVersion>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -205,9 +203,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_raw_schema_version(
         &self,
         _req: crate::model::GetVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -216,9 +214,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_versions(
         &self,
         _req: crate::model::ListVersionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -227,9 +225,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn create_version(
         &self,
         _req: crate::model::CreateVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CreateVersionResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CreateVersionResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -238,9 +236,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn delete_version(
         &self,
         _req: crate::model::DeleteVersionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -249,9 +247,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_referenced_schemas(
         &self,
         _req: crate::model::ListReferencedSchemasRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>,
+        Output = crate::Result<crate::Response<google_cloud_api::model::HttpBody>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -260,9 +258,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn check_compatibility(
         &self,
         _req: crate::model::CheckCompatibilityRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CheckCompatibilityResponse>>,
+        Output = crate::Result<crate::Response<crate::model::CheckCompatibilityResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -271,9 +269,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_schema_config(
         &self,
         _req: crate::model::GetSchemaConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaConfig>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -282,9 +280,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn update_schema_config(
         &self,
         _req: crate::model::UpdateSchemaConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaConfig>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -293,9 +291,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn delete_schema_config(
         &self,
         _req: crate::model::DeleteSchemaConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaConfig>>,
+        Output = crate::Result<crate::Response<crate::model::SchemaConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -304,10 +302,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_schema_mode(
         &self,
         _req: crate::model::GetSchemaModeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaMode>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SchemaMode>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -315,10 +312,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn update_schema_mode(
         &self,
         _req: crate::model::UpdateSchemaModeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaMode>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SchemaMode>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -326,10 +322,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn delete_schema_mode(
         &self,
         _req: crate::model::DeleteSchemaModeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SchemaMode>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::SchemaMode>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -337,10 +332,10 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -350,9 +345,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -361,10 +356,10 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -374,9 +369,9 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,8 +380,8 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -394,8 +389,8 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 }
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub/dynamic.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub/dynamic.rs
index 737dfe53a9..3a2ea60152 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/stub/dynamic.rs
@@ -20,202 +20,200 @@ pub trait ManagedSchemaRegistry: std::fmt::Debug + Send + Sync {
     async fn get_schema_registry(
         &self,
         req: crate::model::GetSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaRegistry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaRegistry>>;
 
     async fn list_schema_registries(
         &self,
         req: crate::model::ListSchemaRegistriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchemaRegistriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchemaRegistriesResponse>>;
 
     async fn create_schema_registry(
         &self,
         req: crate::model::CreateSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaRegistry>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaRegistry>>;
 
     async fn delete_schema_registry(
         &self,
         req: crate::model::DeleteSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>>;
 
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schema>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schema>>;
 
     async fn get_raw_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn list_schema_versions(
         &self,
         req: crate::model::ListSchemaVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn list_schema_types(
         &self,
         req: crate::model::ListSchemaTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn list_subjects(
         &self,
         req: crate::model::ListSubjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn list_subjects_by_schema_id(
         &self,
         req: crate::model::ListSubjectsBySchemaIdRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn delete_subject(
         &self,
         req: crate::model::DeleteSubjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn lookup_version(
         &self,
         req: crate::model::LookupVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaVersion>>;
 
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaVersion>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaVersion>>;
 
     async fn get_raw_schema_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CreateVersionResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CreateVersionResponse>>;
 
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn list_referenced_schemas(
         &self,
         req: crate::model::ListReferencedSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>>;
 
     async fn check_compatibility(
         &self,
         req: crate::model::CheckCompatibilityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckCompatibilityResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckCompatibilityResponse>>;
 
     async fn get_schema_config(
         &self,
         req: crate::model::GetSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaConfig>>;
 
     async fn update_schema_config(
         &self,
         req: crate::model::UpdateSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaConfig>>;
 
     async fn delete_schema_config(
         &self,
         req: crate::model::DeleteSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaConfig>>;
 
     async fn get_schema_mode(
         &self,
         req: crate::model::GetSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaMode>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaMode>>;
 
     async fn update_schema_mode(
         &self,
         req: crate::model::UpdateSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaMode>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaMode>>;
 
     async fn delete_schema_mode(
         &self,
         req: crate::model::DeleteSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaMode>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaMode>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 }
 
 /// All implementations of [super::ManagedSchemaRegistry] also implement [ManagedSchemaRegistry].
@@ -225,8 +223,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_schema_registry(
         &self,
         req: crate::model::GetSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaRegistry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaRegistry>> {
         T::get_schema_registry(self, req, options).await
     }
 
@@ -234,8 +232,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_schema_registries(
         &self,
         req: crate::model::ListSchemaRegistriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSchemaRegistriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSchemaRegistriesResponse>> {
         T::list_schema_registries(self, req, options).await
     }
 
@@ -243,8 +241,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn create_schema_registry(
         &self,
         req: crate::model::CreateSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaRegistry>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaRegistry>> {
         T::create_schema_registry(self, req, options).await
     }
 
@@ -252,8 +250,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn delete_schema_registry(
         &self,
         req: crate::model::DeleteSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_schema_registry(self, req, options).await
     }
 
@@ -261,8 +259,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Context>> {
         T::get_context(self, req, options).await
     }
 
@@ -270,8 +268,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_contexts(self, req, options).await
     }
 
@@ -279,8 +277,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Schema>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Schema>> {
         T::get_schema(self, req, options).await
     }
 
@@ -288,8 +286,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_raw_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::get_raw_schema(self, req, options).await
     }
 
@@ -297,8 +295,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_schema_versions(
         &self,
         req: crate::model::ListSchemaVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_schema_versions(self, req, options).await
     }
 
@@ -306,8 +304,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_schema_types(
         &self,
         req: crate::model::ListSchemaTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_schema_types(self, req, options).await
     }
 
@@ -315,8 +313,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_subjects(
         &self,
         req: crate::model::ListSubjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_subjects(self, req, options).await
     }
 
@@ -324,8 +322,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_subjects_by_schema_id(
         &self,
         req: crate::model::ListSubjectsBySchemaIdRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_subjects_by_schema_id(self, req, options).await
     }
 
@@ -333,8 +331,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn delete_subject(
         &self,
         req: crate::model::DeleteSubjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::delete_subject(self, req, options).await
     }
 
@@ -342,8 +340,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn lookup_version(
         &self,
         req: crate::model::LookupVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaVersion>> {
         T::lookup_version(self, req, options).await
     }
 
@@ -351,8 +349,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaVersion>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaVersion>> {
         T::get_version(self, req, options).await
     }
 
@@ -360,8 +358,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_raw_schema_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::get_raw_schema_version(self, req, options).await
     }
 
@@ -369,8 +367,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_versions(self, req, options).await
     }
 
@@ -378,8 +376,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CreateVersionResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CreateVersionResponse>> {
         T::create_version(self, req, options).await
     }
 
@@ -387,8 +385,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::delete_version(self, req, options).await
     }
 
@@ -396,8 +394,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_referenced_schemas(
         &self,
         req: crate::model::ListReferencedSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_api::model::HttpBody>> {
         T::list_referenced_schemas(self, req, options).await
     }
 
@@ -405,8 +403,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn check_compatibility(
         &self,
         req: crate::model::CheckCompatibilityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CheckCompatibilityResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CheckCompatibilityResponse>> {
         T::check_compatibility(self, req, options).await
     }
 
@@ -414,8 +412,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_schema_config(
         &self,
         req: crate::model::GetSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaConfig>> {
         T::get_schema_config(self, req, options).await
     }
 
@@ -423,8 +421,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn update_schema_config(
         &self,
         req: crate::model::UpdateSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaConfig>> {
         T::update_schema_config(self, req, options).await
     }
 
@@ -432,8 +430,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn delete_schema_config(
         &self,
         req: crate::model::DeleteSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaConfig>> {
         T::delete_schema_config(self, req, options).await
     }
 
@@ -441,8 +439,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_schema_mode(
         &self,
         req: crate::model::GetSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaMode>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaMode>> {
         T::get_schema_mode(self, req, options).await
     }
 
@@ -450,8 +448,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn update_schema_mode(
         &self,
         req: crate::model::UpdateSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaMode>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaMode>> {
         T::update_schema_mode(self, req, options).await
     }
 
@@ -459,8 +457,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn delete_schema_mode(
         &self,
         req: crate::model::DeleteSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SchemaMode>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SchemaMode>> {
         T::delete_schema_mode(self, req, options).await
     }
 
@@ -468,9 +466,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -478,8 +475,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -487,10 +484,9 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -498,8 +494,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -507,8 +503,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -516,8 +512,8 @@ impl<T: super::ManagedSchemaRegistry> ManagedSchemaRegistry for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/tracing.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/tracing.rs
index ae0d126fe6..8692570fbf 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/tracing.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn get_schema_registry(
         &self,
         req: crate::model::GetSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaRegistry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaRegistry>> {
         self.inner.get_schema_registry(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn list_schema_registries(
         &self,
         req: crate::model::ListSchemaRegistriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchemaRegistriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchemaRegistriesResponse>> {
         self.inner.list_schema_registries(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_schema_registry(
         &self,
         req: crate::model::CreateSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaRegistry>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaRegistry>> {
         self.inner.create_schema_registry(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn delete_schema_registry(
         &self,
         req: crate::model::DeleteSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_schema_registry(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         self.inner.get_context(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_contexts(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schema>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schema>> {
         self.inner.get_schema(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn get_raw_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.get_raw_schema(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_schema_versions(
         &self,
         req: crate::model::ListSchemaVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_schema_versions(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_schema_types(
         &self,
         req: crate::model::ListSchemaTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_schema_types(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_subjects(
         &self,
         req: crate::model::ListSubjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_subjects(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn list_subjects_by_schema_id(
         &self,
         req: crate::model::ListSubjectsBySchemaIdRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_subjects_by_schema_id(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn delete_subject(
         &self,
         req: crate::model::DeleteSubjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.delete_subject(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn lookup_version(
         &self,
         req: crate::model::LookupVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaVersion>> {
         self.inner.lookup_version(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaVersion>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaVersion>> {
         self.inner.get_version(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn get_raw_schema_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.get_raw_schema_version(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_versions(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CreateVersionResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CreateVersionResponse>> {
         self.inner.create_version(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.delete_version(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn list_referenced_schemas(
         &self,
         req: crate::model::ListReferencedSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         self.inner.list_referenced_schemas(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn check_compatibility(
         &self,
         req: crate::model::CheckCompatibilityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckCompatibilityResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckCompatibilityResponse>> {
         self.inner.check_compatibility(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn get_schema_config(
         &self,
         req: crate::model::GetSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaConfig>> {
         self.inner.get_schema_config(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn update_schema_config(
         &self,
         req: crate::model::UpdateSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaConfig>> {
         self.inner.update_schema_config(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn delete_schema_config(
         &self,
         req: crate::model::DeleteSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaConfig>> {
         self.inner.delete_schema_config(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn get_schema_mode(
         &self,
         req: crate::model::GetSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaMode>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaMode>> {
         self.inner.get_schema_mode(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn update_schema_mode(
         &self,
         req: crate::model::UpdateSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaMode>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaMode>> {
         self.inner.update_schema_mode(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn delete_schema_mode(
         &self,
         req: crate::model::DeleteSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaMode>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaMode>> {
         self.inner.delete_schema_mode(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -302,9 +302,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -312,8 +311,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -321,8 +320,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -330,8 +329,8 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 }
diff --git a/src/generated/cloud/managedkafka/schemaregistry/v1/src/transport.rs b/src/generated/cloud/managedkafka/schemaregistry/v1/src/transport.rs
index ee617aeeb5..3551d68235 100644
--- a/src/generated/cloud/managedkafka/schemaregistry/v1/src/transport.rs
+++ b/src/generated/cloud/managedkafka/schemaregistry/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ManagedSchemaRegistry](super::stub::ManagedSchemaRegistry) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ManagedSchemaRegistry {
 }
 
 impl ManagedSchemaRegistry {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_schema_registry(
         &self,
         req: crate::model::GetSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaRegistry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaRegistry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_schema_registries(
         &self,
         req: crate::model::ListSchemaRegistriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSchemaRegistriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSchemaRegistriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -150,9 +150,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -167,13 +167,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn create_schema_registry(
         &self,
         req: crate::model::CreateSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaRegistry>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaRegistry>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -210,9 +210,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -227,13 +227,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn delete_schema_registry(
         &self,
         req: crate::model::DeleteSchemaRegistryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -274,9 +274,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -285,24 +285,25 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_context(
         &self,
         req: crate::model::GetContextRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Context>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Context>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -347,9 +348,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -364,13 +365,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_contexts(
         &self,
         req: crate::model::ListContextsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -411,9 +412,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -428,13 +429,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Schema>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Schema>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -532,9 +533,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -549,13 +550,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_raw_schema(
         &self,
         req: crate::model::GetSchemaRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -653,9 +654,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -670,13 +671,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_schema_versions(
         &self,
         req: crate::model::ListSchemaVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -782,9 +783,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -799,13 +800,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_schema_types(
         &self,
         req: crate::model::ListSchemaTypesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -887,9 +888,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -904,13 +905,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_subjects(
         &self,
         req: crate::model::ListSubjectsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1008,9 +1009,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1025,13 +1026,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_subjects_by_schema_id(
         &self,
         req: crate::model::ListSubjectsBySchemaIdRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1137,9 +1138,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1154,13 +1155,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn delete_subject(
         &self,
         req: crate::model::DeleteSubjectRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1258,9 +1259,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1275,13 +1276,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn lookup_version(
         &self,
         req: crate::model::LookupVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1371,9 +1372,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1388,13 +1389,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaVersion>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaVersion>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -1438,9 +1439,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     "projects/*/locations/*/schemaRegistries/*/contexts/*/subjects/*/versions/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1455,13 +1456,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_raw_schema_version(
         &self,
         req: crate::model::GetVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -1505,9 +1506,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     "projects/*/locations/*/schemaRegistries/*/contexts/*/subjects/*/versions/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1522,13 +1523,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_versions(
         &self,
         req: crate::model::ListVersionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1626,9 +1627,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1643,13 +1644,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn create_version(
         &self,
         req: crate::model::CreateVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CreateVersionResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CreateVersionResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1739,9 +1740,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1756,13 +1757,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn delete_version(
         &self,
         req: crate::model::DeleteVersionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -1806,9 +1807,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     "projects/*/locations/*/schemaRegistries/*/contexts/*/subjects/*/versions/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1823,13 +1824,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_referenced_schemas(
         &self,
         req: crate::model::ListReferencedSchemasRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_api::model::HttpBody>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_api::model::HttpBody>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
         .or_else(|| {
             let path = format!(
@@ -1871,9 +1872,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     "projects/*/locations/*/schemaRegistries/*/contexts/*/subjects/*/versions/*");
                 paths.push(builder.build());
             }
-            gax::error::Error::binding(BindingError { paths })
+            google_cloud_gax::error::Error::binding(BindingError { paths })
         })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1888,13 +1889,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn check_compatibility(
         &self,
         req: crate::model::CheckCompatibilityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CheckCompatibilityResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CheckCompatibilityResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1984,9 +1985,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2001,13 +2002,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_schema_config(
         &self,
         req: crate::model::GetSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2103,9 +2104,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2120,13 +2121,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn update_schema_config(
         &self,
         req: crate::model::UpdateSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2216,9 +2217,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2233,13 +2234,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn delete_schema_config(
         &self,
         req: crate::model::DeleteSchemaConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2329,9 +2330,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2346,13 +2347,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_schema_mode(
         &self,
         req: crate::model::GetSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaMode>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaMode>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2442,9 +2443,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2459,13 +2460,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn update_schema_mode(
         &self,
         req: crate::model::UpdateSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaMode>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaMode>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2555,9 +2556,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2572,13 +2573,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn delete_schema_mode(
         &self,
         req: crate::model::DeleteSchemaModeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SchemaMode>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SchemaMode>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2668,9 +2669,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2685,13 +2686,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2721,9 +2722,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2738,13 +2739,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2781,9 +2782,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2798,14 +2799,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2847,9 +2847,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2864,13 +2864,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2911,9 +2911,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2928,13 +2928,13 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2975,9 +2975,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2986,24 +2986,25 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3044,9 +3045,9 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3055,11 +3056,12 @@ impl super::stub::ManagedSchemaRegistry for ManagedSchemaRegistry {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 }
diff --git a/src/generated/cloud/managedkafka/v1/Cargo.toml b/src/generated/cloud/managedkafka/v1/Cargo.toml
index c0fe28d375..3c048d0958 100644
--- a/src/generated/cloud/managedkafka/v1/Cargo.toml
+++ b/src/generated/cloud/managedkafka/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/managedkafka/v1/src/builder.rs b/src/generated/cloud/managedkafka/v1/src/builder.rs
index 50ec92b125..12843dbc96 100644
--- a/src/generated/cloud/managedkafka/v1/src/builder.rs
+++ b/src/generated/cloud/managedkafka/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod managed_kafka {
     /// A builder for [ManagedKafka][crate::client::ManagedKafka].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedkafka_v1::*;
     /// # use builder::managed_kafka::ClientBuilder;
     /// # use client::ManagedKafka;
@@ -30,19 +30,18 @@ pub mod managed_kafka {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ManagedKafka;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ManagedKafka;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod managed_kafka {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ManagedKafka>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod managed_kafka {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::ListClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .list_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListClustersResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListClustersResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod managed_kafka {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListClustersResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListClustersResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::GetCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .get_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetClusterRequest::name].
@@ -241,8 +242,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::CreateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .create_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_cluster`.
@@ -313,7 +314,7 @@ pub mod managed_kafka {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -386,8 +387,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -397,7 +398,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::UpdateCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -426,7 +427,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -441,7 +442,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .update_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_cluster`.
@@ -458,7 +459,7 @@ pub mod managed_kafka {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -537,8 +538,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -548,7 +549,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::DeleteCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -577,7 +578,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -592,7 +593,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .delete_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_cluster`.
@@ -604,7 +605,7 @@ pub mod managed_kafka {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -647,8 +648,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -658,8 +659,8 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::ListTopics;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -690,7 +691,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -700,13 +701,13 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .list_topics(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTopicsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTopicsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -715,15 +716,17 @@ pub mod managed_kafka {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTopicsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTopicsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -749,8 +752,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTopics {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTopics {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -760,7 +763,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::GetTopic;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -788,7 +791,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -798,7 +801,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .get_topic(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTopicRequest::name].
@@ -811,8 +814,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTopic {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTopic {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -822,7 +825,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::CreateTopic;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -850,7 +853,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -860,7 +863,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .create_topic(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTopicRequest::parent].
@@ -903,8 +906,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTopic {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTopic {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -914,7 +917,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::UpdateTopic;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -942,7 +945,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -952,7 +955,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .update_topic(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateTopicRequest::update_mask].
@@ -1001,8 +1004,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTopic {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTopic {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1012,7 +1015,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::DeleteTopic;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1040,7 +1043,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1050,7 +1053,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .delete_topic(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTopicRequest::name].
@@ -1063,8 +1066,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTopic {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTopic {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1074,8 +1077,8 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::ListConsumerGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1109,7 +1112,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1119,14 +1122,16 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .list_consumer_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConsumerGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConsumerGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1134,17 +1139,17 @@ pub mod managed_kafka {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConsumerGroupsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1170,8 +1175,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConsumerGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConsumerGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1181,7 +1186,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::GetConsumerGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1212,7 +1217,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1222,7 +1227,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .get_consumer_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConsumerGroupRequest::name].
@@ -1235,8 +1240,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConsumerGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConsumerGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1246,7 +1251,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::UpdateConsumerGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1277,7 +1282,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1287,7 +1292,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .update_consumer_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateConsumerGroupRequest::update_mask].
@@ -1336,8 +1341,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConsumerGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConsumerGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1347,7 +1352,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::DeleteConsumerGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1378,7 +1383,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1388,7 +1393,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .delete_consumer_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteConsumerGroupRequest::name].
@@ -1401,8 +1406,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConsumerGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConsumerGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1412,8 +1417,8 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::ListAcls;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1444,7 +1449,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1454,13 +1459,13 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .list_acls(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAclsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAclsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1469,15 +1474,15 @@ pub mod managed_kafka {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAclsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListAclsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1503,8 +1508,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAcls {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAcls {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1514,7 +1519,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::GetAcl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1542,7 +1547,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1552,7 +1557,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .get_acl(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAclRequest::name].
@@ -1565,8 +1570,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAcl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAcl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1576,7 +1581,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::CreateAcl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1604,7 +1609,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1614,7 +1619,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .create_acl(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateAclRequest::parent].
@@ -1657,8 +1662,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateAcl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateAcl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1668,7 +1673,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::UpdateAcl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1696,7 +1701,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1706,7 +1711,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .update_acl(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [acl][crate::model::UpdateAclRequest::acl].
@@ -1751,8 +1756,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAcl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAcl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1762,7 +1767,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::DeleteAcl;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1790,7 +1795,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1800,7 +1805,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .delete_acl(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAclRequest::name].
@@ -1813,8 +1818,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAcl {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAcl {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1824,7 +1829,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::AddAclEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1852,7 +1857,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1862,7 +1867,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .add_acl_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [acl][crate::model::AddAclEntryRequest::acl].
@@ -1897,8 +1902,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAclEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAclEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1908,7 +1913,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::RemoveAclEntry;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1936,7 +1941,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1946,7 +1951,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .remove_acl_entry(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [acl][crate::model::RemoveAclEntryRequest::acl].
@@ -1981,8 +1986,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveAclEntry {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveAclEntry {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1992,8 +1997,8 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2027,7 +2032,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2037,15 +2042,15 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2054,17 +2059,17 @@ pub mod managed_kafka {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2094,8 +2099,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2105,7 +2110,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2136,7 +2141,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2146,7 +2151,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2157,8 +2162,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2168,8 +2173,8 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2205,7 +2210,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2215,15 +2220,15 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2232,17 +2237,17 @@ pub mod managed_kafka {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2278,8 +2283,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2289,7 +2294,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2320,7 +2325,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2330,7 +2335,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2341,8 +2346,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2352,7 +2357,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2385,7 +2390,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2395,7 +2400,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2406,8 +2411,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2417,7 +2422,7 @@ pub mod managed_kafka {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2450,7 +2455,7 @@ pub mod managed_kafka {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2460,7 +2465,7 @@ pub mod managed_kafka {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2471,8 +2476,8 @@ pub mod managed_kafka {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2484,7 +2489,7 @@ pub mod managed_kafka_connect {
     /// A builder for [ManagedKafkaConnect][crate::client::ManagedKafkaConnect].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedkafka_v1::*;
     /// # use builder::managed_kafka_connect::ClientBuilder;
     /// # use client::ManagedKafkaConnect;
@@ -2494,19 +2499,18 @@ pub mod managed_kafka_connect {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ManagedKafkaConnect;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ManagedKafkaConnect;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -2517,7 +2521,7 @@ pub mod managed_kafka_connect {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ManagedKafkaConnect>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -2530,7 +2534,7 @@ pub mod managed_kafka_connect {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -2540,8 +2544,8 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::ListConnectClusters;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2575,7 +2579,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2585,14 +2589,16 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .list_connect_clusters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectClustersResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectClustersResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2600,17 +2606,17 @@ pub mod managed_kafka_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListConnectClustersResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2648,8 +2654,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnectClusters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnectClusters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2659,7 +2665,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::GetConnectCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2690,7 +2696,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2700,7 +2706,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .get_connect_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectClusterRequest::name].
@@ -2713,8 +2719,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnectCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnectCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2724,7 +2730,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::CreateConnectCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2756,7 +2762,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2771,7 +2777,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .create_connect_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_connect_cluster`.
@@ -2788,7 +2794,7 @@ pub mod managed_kafka_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2861,8 +2867,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnectCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnectCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2872,7 +2878,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::UpdateConnectCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2904,7 +2910,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2919,7 +2925,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .update_connect_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_connect_cluster`.
@@ -2936,7 +2942,7 @@ pub mod managed_kafka_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3015,8 +3021,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnectCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnectCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3026,7 +3032,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::DeleteConnectCluster;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3058,7 +3064,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3073,7 +3079,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .delete_connect_cluster(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_connect_cluster`.
@@ -3085,7 +3091,7 @@ pub mod managed_kafka_connect {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3128,8 +3134,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnectCluster {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnectCluster {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3139,8 +3145,8 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::ListConnectors;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3171,7 +3177,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3181,14 +3187,16 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .list_connectors(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListConnectorsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListConnectorsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3196,15 +3204,17 @@ pub mod managed_kafka_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListConnectorsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListConnectorsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3230,8 +3240,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListConnectors {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListConnectors {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3241,7 +3251,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::GetConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3269,7 +3279,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3279,7 +3289,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .get_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetConnectorRequest::name].
@@ -3292,8 +3302,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3303,7 +3313,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::CreateConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3331,7 +3341,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3341,7 +3351,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .create_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateConnectorRequest::parent].
@@ -3384,8 +3394,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3395,7 +3405,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::UpdateConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3423,7 +3433,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3433,7 +3443,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .update_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateConnectorRequest::update_mask].
@@ -3482,8 +3492,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3493,7 +3503,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::DeleteConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3521,7 +3531,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3531,7 +3541,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .delete_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteConnectorRequest::name].
@@ -3544,8 +3554,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3555,7 +3565,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::PauseConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3583,7 +3593,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3593,7 +3603,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .pause_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::PauseConnectorRequest::name].
@@ -3606,8 +3616,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for PauseConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for PauseConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3617,7 +3627,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::ResumeConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3645,7 +3655,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3655,7 +3665,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .resume_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::ResumeConnectorRequest::name].
@@ -3668,8 +3678,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3679,7 +3689,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::RestartConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3710,7 +3720,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3720,7 +3730,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .restart_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::RestartConnectorRequest::name].
@@ -3733,8 +3743,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestartConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestartConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3744,7 +3754,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::StopConnector;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3772,7 +3782,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3782,7 +3792,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .stop_connector(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::StopConnectorRequest::name].
@@ -3795,8 +3805,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopConnector {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopConnector {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3806,8 +3816,8 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3841,7 +3851,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3851,15 +3861,15 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3868,17 +3878,17 @@ pub mod managed_kafka_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3908,8 +3918,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3919,7 +3929,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3950,7 +3960,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3960,7 +3970,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3971,8 +3981,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3982,8 +3992,8 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4019,7 +4029,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4029,15 +4039,15 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4046,17 +4056,17 @@ pub mod managed_kafka_connect {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4092,8 +4102,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4103,7 +4113,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4134,7 +4144,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4144,7 +4154,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4155,8 +4165,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4166,7 +4176,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4199,7 +4209,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4209,7 +4219,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4220,8 +4230,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4231,7 +4241,7 @@ pub mod managed_kafka_connect {
     /// # Example
     /// ```
     /// # use google_cloud_managedkafka_v1::builder::managed_kafka_connect::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_managedkafka_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4264,7 +4274,7 @@ pub mod managed_kafka_connect {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4274,7 +4284,7 @@ pub mod managed_kafka_connect {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4285,8 +4295,8 @@ pub mod managed_kafka_connect {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/managedkafka/v1/src/client.rs b/src/generated/cloud/managedkafka/v1/src/client.rs
index 449a8a2495..f313dd47d1 100644
--- a/src/generated/cloud/managedkafka/v1/src/client.rs
+++ b/src/generated/cloud/managedkafka/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_managedkafka_v1::client::ManagedKafka;
 /// let client = ManagedKafka::builder().build().await?;
 /// // use `client` to make requests to the Managed Service for Apache Kafka API.
@@ -67,13 +67,13 @@ impl ManagedKafka {
     /// Returns a builder for [ManagedKafka].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedkafka_v1::client::ManagedKafka;
     /// let client = ManagedKafka::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::managed_kafka::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::managed_kafka::client::Factory)
+        crate::new_client_builder(super::builder::managed_kafka::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -91,14 +91,14 @@ impl ManagedKafka {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ManagedKafka>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ManagedKafka>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -107,13 +107,13 @@ impl ManagedKafka {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedKafka> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedKafka> {
         super::transport::ManagedKafka::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedKafka> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedKafka> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ManagedKafka::new)
@@ -300,7 +300,7 @@ impl ManagedKafka {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_managedkafka_v1::client::ManagedKafkaConnect;
 /// let client = ManagedKafkaConnect::builder().build().await?;
 /// // use `client` to make requests to the Managed Service for Apache Kafka API.
@@ -347,15 +347,13 @@ impl ManagedKafkaConnect {
     /// Returns a builder for [ManagedKafkaConnect].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_managedkafka_v1::client::ManagedKafkaConnect;
     /// let client = ManagedKafkaConnect::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::managed_kafka_connect::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::managed_kafka_connect::client::Factory,
-        )
+        crate::new_client_builder(super::builder::managed_kafka_connect::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -373,14 +371,14 @@ impl ManagedKafkaConnect {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ManagedKafkaConnect>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ManagedKafkaConnect>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -390,13 +388,13 @@ impl ManagedKafkaConnect {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedKafkaConnect> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedKafkaConnect> {
         super::transport::ManagedKafkaConnect::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ManagedKafkaConnect> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ManagedKafkaConnect> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ManagedKafkaConnect::new)
diff --git a/src/generated/cloud/managedkafka/v1/src/lib.rs b/src/generated/cloud/managedkafka/v1/src/lib.rs
index 9a96fb13c9..624c0815d7 100644
--- a/src/generated/cloud/managedkafka/v1/src/lib.rs
+++ b/src/generated/cloud/managedkafka/v1/src/lib.rs
@@ -45,8 +45,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -81,3 +81,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/managedkafka/v1/src/model.rs b/src/generated/cloud/managedkafka/v1/src/model.rs
index 395cb99e02..77ec366fd2 100644
--- a/src/generated/cloud/managedkafka/v1/src/model.rs
+++ b/src/generated/cloud/managedkafka/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -218,7 +218,7 @@ impl wkt::message::Message for ListClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListClustersResponse {
     type PageItem = crate::model::Cluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -703,7 +703,7 @@ impl wkt::message::Message for ListTopicsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTopicsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTopicsResponse {
     type PageItem = crate::model::Topic;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1107,7 +1107,7 @@ impl wkt::message::Message for ListConsumerGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConsumerGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConsumerGroupsResponse {
     type PageItem = crate::model::ConsumerGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1419,7 +1419,7 @@ impl wkt::message::Message for ListAclsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAclsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAclsResponse {
     type PageItem = crate::model::Acl;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2598,7 +2598,7 @@ impl wkt::message::Message for ListConnectClustersResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectClustersResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectClustersResponse {
     type PageItem = crate::model::ConnectCluster;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3003,7 +3003,7 @@ impl wkt::message::Message for ListConnectorsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListConnectorsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListConnectorsResponse {
     type PageItem = crate::model::Connector;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/managedkafka/v1/src/stub.rs b/src/generated/cloud/managedkafka/v1/src/stub.rs
index 0750d47245..0a736d5d88 100644
--- a/src/generated/cloud/managedkafka/v1/src/stub.rs
+++ b/src/generated/cloud/managedkafka/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn list_clusters(
         &self,
         _req: crate::model::ListClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn get_cluster(
         &self,
         _req: crate::model::GetClusterRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Cluster>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Cluster>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn create_cluster(
         &self,
         _req: crate::model::CreateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn update_cluster(
         &self,
         _req: crate::model::UpdateClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn delete_cluster(
         &self,
         _req: crate::model::DeleteClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn list_topics(
         &self,
         _req: crate::model::ListTopicsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTopicsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTopicsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,10 +107,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn get_topic(
         &self,
         _req: crate::model::GetTopicRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Topic>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Topic>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -119,10 +117,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn create_topic(
         &self,
         _req: crate::model::CreateTopicRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Topic>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Topic>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -130,10 +127,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn update_topic(
         &self,
         _req: crate::model::UpdateTopicRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Topic>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Topic>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -141,8 +137,8 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn delete_topic(
         &self,
         _req: crate::model::DeleteTopicRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -150,9 +146,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn list_consumer_groups(
         &self,
         _req: crate::model::ListConsumerGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConsumerGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConsumerGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -161,9 +157,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn get_consumer_group(
         &self,
         _req: crate::model::GetConsumerGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConsumerGroup>>,
+        Output = crate::Result<crate::Response<crate::model::ConsumerGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -172,9 +168,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn update_consumer_group(
         &self,
         _req: crate::model::UpdateConsumerGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConsumerGroup>>,
+        Output = crate::Result<crate::Response<crate::model::ConsumerGroup>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -183,8 +179,8 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn delete_consumer_group(
         &self,
         _req: crate::model::DeleteConsumerGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -192,9 +188,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn list_acls(
         &self,
         _req: crate::model::ListAclsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAclsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAclsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -203,9 +199,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn get_acl(
         &self,
         _req: crate::model::GetAclRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Acl>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Acl>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -213,9 +209,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn create_acl(
         &self,
         _req: crate::model::CreateAclRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Acl>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Acl>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -223,9 +219,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn update_acl(
         &self,
         _req: crate::model::UpdateAclRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Acl>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Acl>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -233,8 +229,8 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn delete_acl(
         &self,
         _req: crate::model::DeleteAclRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -242,9 +238,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn add_acl_entry(
         &self,
         _req: crate::model::AddAclEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::AddAclEntryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::AddAclEntryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +249,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn remove_acl_entry(
         &self,
         _req: crate::model::RemoveAclEntryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RemoveAclEntryResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RemoveAclEntryResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,10 +260,10 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -277,9 +273,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -288,10 +284,10 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -301,9 +297,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -312,8 +308,8 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -321,8 +317,8 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -332,9 +328,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -343,9 +339,9 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -365,9 +361,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn list_connect_clusters(
         &self,
         _req: crate::model::ListConnectClustersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectClustersResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectClustersResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -376,9 +372,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn get_connect_cluster(
         &self,
         _req: crate::model::GetConnectClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ConnectCluster>>,
+        Output = crate::Result<crate::Response<crate::model::ConnectCluster>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -387,9 +383,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn create_connect_cluster(
         &self,
         _req: crate::model::CreateConnectClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -398,9 +394,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn update_connect_cluster(
         &self,
         _req: crate::model::UpdateConnectClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,9 +405,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn delete_connect_cluster(
         &self,
         _req: crate::model::DeleteConnectClusterRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -420,9 +416,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn list_connectors(
         &self,
         _req: crate::model::ListConnectorsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListConnectorsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListConnectorsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -431,10 +427,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn get_connector(
         &self,
         _req: crate::model::GetConnectorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connector>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connector>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -442,10 +437,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn create_connector(
         &self,
         _req: crate::model::CreateConnectorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connector>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connector>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -453,10 +447,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn update_connector(
         &self,
         _req: crate::model::UpdateConnectorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Connector>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Connector>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -464,8 +457,8 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn delete_connector(
         &self,
         _req: crate::model::DeleteConnectorRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -473,9 +466,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn pause_connector(
         &self,
         _req: crate::model::PauseConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PauseConnectorResponse>>,
+        Output = crate::Result<crate::Response<crate::model::PauseConnectorResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -484,9 +477,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn resume_connector(
         &self,
         _req: crate::model::ResumeConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ResumeConnectorResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ResumeConnectorResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -495,9 +488,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn restart_connector(
         &self,
         _req: crate::model::RestartConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RestartConnectorResponse>>,
+        Output = crate::Result<crate::Response<crate::model::RestartConnectorResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -506,9 +499,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn stop_connector(
         &self,
         _req: crate::model::StopConnectorRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StopConnectorResponse>>,
+        Output = crate::Result<crate::Response<crate::model::StopConnectorResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -517,10 +510,10 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -530,9 +523,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -541,10 +534,10 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -554,9 +547,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -565,8 +558,8 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -574,8 +567,8 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -585,9 +578,9 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -596,8 +589,8 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/managedkafka/v1/src/stub/dynamic.rs b/src/generated/cloud/managedkafka/v1/src/stub/dynamic.rs
index f1e8331b1b..7ad543ac17 100644
--- a/src/generated/cloud/managedkafka/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/managedkafka/v1/src/stub/dynamic.rs
@@ -20,176 +20,174 @@ pub trait ManagedKafka: std::fmt::Debug + Send + Sync {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>>;
 
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>>;
 
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_topics(
         &self,
         req: crate::model::ListTopicsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTopicsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTopicsResponse>>;
 
     async fn get_topic(
         &self,
         req: crate::model::GetTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Topic>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Topic>>;
 
     async fn create_topic(
         &self,
         req: crate::model::CreateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Topic>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Topic>>;
 
     async fn update_topic(
         &self,
         req: crate::model::UpdateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Topic>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Topic>>;
 
     async fn delete_topic(
         &self,
         req: crate::model::DeleteTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_consumer_groups(
         &self,
         req: crate::model::ListConsumerGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConsumerGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConsumerGroupsResponse>>;
 
     async fn get_consumer_group(
         &self,
         req: crate::model::GetConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConsumerGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConsumerGroup>>;
 
     async fn update_consumer_group(
         &self,
         req: crate::model::UpdateConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConsumerGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConsumerGroup>>;
 
     async fn delete_consumer_group(
         &self,
         req: crate::model::DeleteConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn list_acls(
         &self,
         req: crate::model::ListAclsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAclsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAclsResponse>>;
 
     async fn get_acl(
         &self,
         req: crate::model::GetAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Acl>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Acl>>;
 
     async fn create_acl(
         &self,
         req: crate::model::CreateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Acl>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Acl>>;
 
     async fn update_acl(
         &self,
         req: crate::model::UpdateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Acl>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Acl>>;
 
     async fn delete_acl(
         &self,
         req: crate::model::DeleteAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn add_acl_entry(
         &self,
         req: crate::model::AddAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddAclEntryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddAclEntryResponse>>;
 
     async fn remove_acl_entry(
         &self,
         req: crate::model::RemoveAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveAclEntryResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveAclEntryResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ManagedKafka] also implement [ManagedKafka].
@@ -199,8 +197,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListClustersResponse>> {
         T::list_clusters(self, req, options).await
     }
 
@@ -208,8 +206,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Cluster>> {
         T::get_cluster(self, req, options).await
     }
 
@@ -217,8 +215,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_cluster(self, req, options).await
     }
 
@@ -226,8 +224,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_cluster(self, req, options).await
     }
 
@@ -235,8 +233,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_cluster(self, req, options).await
     }
 
@@ -244,8 +242,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn list_topics(
         &self,
         req: crate::model::ListTopicsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTopicsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTopicsResponse>> {
         T::list_topics(self, req, options).await
     }
 
@@ -253,8 +251,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn get_topic(
         &self,
         req: crate::model::GetTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Topic>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Topic>> {
         T::get_topic(self, req, options).await
     }
 
@@ -262,8 +260,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn create_topic(
         &self,
         req: crate::model::CreateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Topic>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Topic>> {
         T::create_topic(self, req, options).await
     }
 
@@ -271,8 +269,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn update_topic(
         &self,
         req: crate::model::UpdateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Topic>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Topic>> {
         T::update_topic(self, req, options).await
     }
 
@@ -280,8 +278,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn delete_topic(
         &self,
         req: crate::model::DeleteTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_topic(self, req, options).await
     }
 
@@ -289,8 +287,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn list_consumer_groups(
         &self,
         req: crate::model::ListConsumerGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConsumerGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConsumerGroupsResponse>> {
         T::list_consumer_groups(self, req, options).await
     }
 
@@ -298,8 +296,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn get_consumer_group(
         &self,
         req: crate::model::GetConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConsumerGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConsumerGroup>> {
         T::get_consumer_group(self, req, options).await
     }
 
@@ -307,8 +305,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn update_consumer_group(
         &self,
         req: crate::model::UpdateConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConsumerGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConsumerGroup>> {
         T::update_consumer_group(self, req, options).await
     }
 
@@ -316,8 +314,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn delete_consumer_group(
         &self,
         req: crate::model::DeleteConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_consumer_group(self, req, options).await
     }
 
@@ -325,8 +323,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn list_acls(
         &self,
         req: crate::model::ListAclsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAclsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAclsResponse>> {
         T::list_acls(self, req, options).await
     }
 
@@ -334,8 +332,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn get_acl(
         &self,
         req: crate::model::GetAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Acl>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Acl>> {
         T::get_acl(self, req, options).await
     }
 
@@ -343,8 +341,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn create_acl(
         &self,
         req: crate::model::CreateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Acl>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Acl>> {
         T::create_acl(self, req, options).await
     }
 
@@ -352,8 +350,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn update_acl(
         &self,
         req: crate::model::UpdateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Acl>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Acl>> {
         T::update_acl(self, req, options).await
     }
 
@@ -361,8 +359,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn delete_acl(
         &self,
         req: crate::model::DeleteAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_acl(self, req, options).await
     }
 
@@ -370,8 +368,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn add_acl_entry(
         &self,
         req: crate::model::AddAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AddAclEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AddAclEntryResponse>> {
         T::add_acl_entry(self, req, options).await
     }
 
@@ -379,8 +377,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn remove_acl_entry(
         &self,
         req: crate::model::RemoveAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RemoveAclEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RemoveAclEntryResponse>> {
         T::remove_acl_entry(self, req, options).await
     }
 
@@ -388,9 +386,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -398,8 +395,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -407,10 +404,9 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -418,8 +414,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -427,8 +423,8 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -436,22 +432,22 @@ impl<T: super::ManagedKafka> ManagedKafka for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -462,134 +458,132 @@ pub trait ManagedKafkaConnect: std::fmt::Debug + Send + Sync {
     async fn list_connect_clusters(
         &self,
         req: crate::model::ListConnectClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectClustersResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectClustersResponse>>;
 
     async fn get_connect_cluster(
         &self,
         req: crate::model::GetConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectCluster>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectCluster>>;
 
     async fn create_connect_cluster(
         &self,
         req: crate::model::CreateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_connect_cluster(
         &self,
         req: crate::model::UpdateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_connect_cluster(
         &self,
         req: crate::model::DeleteConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectorsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectorsResponse>>;
 
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>>;
 
     async fn create_connector(
         &self,
         req: crate::model::CreateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>>;
 
     async fn update_connector(
         &self,
         req: crate::model::UpdateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>>;
 
     async fn delete_connector(
         &self,
         req: crate::model::DeleteConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn pause_connector(
         &self,
         req: crate::model::PauseConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PauseConnectorResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PauseConnectorResponse>>;
 
     async fn resume_connector(
         &self,
         req: crate::model::ResumeConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResumeConnectorResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResumeConnectorResponse>>;
 
     async fn restart_connector(
         &self,
         req: crate::model::RestartConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestartConnectorResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestartConnectorResponse>>;
 
     async fn stop_connector(
         &self,
         req: crate::model::StopConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StopConnectorResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StopConnectorResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::ManagedKafkaConnect] also implement [ManagedKafkaConnect].
@@ -599,8 +593,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn list_connect_clusters(
         &self,
         req: crate::model::ListConnectClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectClustersResponse>> {
         T::list_connect_clusters(self, req, options).await
     }
 
@@ -608,8 +602,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn get_connect_cluster(
         &self,
         req: crate::model::GetConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ConnectCluster>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ConnectCluster>> {
         T::get_connect_cluster(self, req, options).await
     }
 
@@ -617,8 +611,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn create_connect_cluster(
         &self,
         req: crate::model::CreateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_connect_cluster(self, req, options).await
     }
 
@@ -626,8 +620,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn update_connect_cluster(
         &self,
         req: crate::model::UpdateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_connect_cluster(self, req, options).await
     }
 
@@ -635,8 +629,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn delete_connect_cluster(
         &self,
         req: crate::model::DeleteConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_connect_cluster(self, req, options).await
     }
 
@@ -644,8 +638,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListConnectorsResponse>> {
         T::list_connectors(self, req, options).await
     }
 
@@ -653,8 +647,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>> {
         T::get_connector(self, req, options).await
     }
 
@@ -662,8 +656,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn create_connector(
         &self,
         req: crate::model::CreateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>> {
         T::create_connector(self, req, options).await
     }
 
@@ -671,8 +665,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn update_connector(
         &self,
         req: crate::model::UpdateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Connector>> {
         T::update_connector(self, req, options).await
     }
 
@@ -680,8 +674,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn delete_connector(
         &self,
         req: crate::model::DeleteConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_connector(self, req, options).await
     }
 
@@ -689,8 +683,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn pause_connector(
         &self,
         req: crate::model::PauseConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PauseConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PauseConnectorResponse>> {
         T::pause_connector(self, req, options).await
     }
 
@@ -698,8 +692,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn resume_connector(
         &self,
         req: crate::model::ResumeConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ResumeConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ResumeConnectorResponse>> {
         T::resume_connector(self, req, options).await
     }
 
@@ -707,8 +701,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn restart_connector(
         &self,
         req: crate::model::RestartConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RestartConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RestartConnectorResponse>> {
         T::restart_connector(self, req, options).await
     }
 
@@ -716,8 +710,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn stop_connector(
         &self,
         req: crate::model::StopConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StopConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StopConnectorResponse>> {
         T::stop_connector(self, req, options).await
     }
 
@@ -725,9 +719,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -735,8 +728,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -744,10 +737,9 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -755,8 +747,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -764,8 +756,8 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -773,22 +765,22 @@ impl<T: super::ManagedKafkaConnect> ManagedKafkaConnect for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/managedkafka/v1/src/tracing.rs b/src/generated/cloud/managedkafka/v1/src/tracing.rs
index 3a1e8238f5..589a6524df 100644
--- a/src/generated/cloud/managedkafka/v1/src/tracing.rs
+++ b/src/generated/cloud/managedkafka/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         self.inner.list_clusters(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         self.inner.get_cluster(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_cluster(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_cluster(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_cluster(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_topics(
         &self,
         req: crate::model::ListTopicsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTopicsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTopicsResponse>> {
         self.inner.list_topics(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_topic(
         &self,
         req: crate::model::GetTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Topic>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Topic>> {
         self.inner.get_topic(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_topic(
         &self,
         req: crate::model::CreateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Topic>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Topic>> {
         self.inner.create_topic(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_topic(
         &self,
         req: crate::model::UpdateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Topic>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Topic>> {
         self.inner.update_topic(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn delete_topic(
         &self,
         req: crate::model::DeleteTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_topic(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn list_consumer_groups(
         &self,
         req: crate::model::ListConsumerGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConsumerGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConsumerGroupsResponse>> {
         self.inner.list_consumer_groups(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn get_consumer_group(
         &self,
         req: crate::model::GetConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConsumerGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConsumerGroup>> {
         self.inner.get_consumer_group(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn update_consumer_group(
         &self,
         req: crate::model::UpdateConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConsumerGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConsumerGroup>> {
         self.inner.update_consumer_group(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn delete_consumer_group(
         &self,
         req: crate::model::DeleteConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_consumer_group(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn list_acls(
         &self,
         req: crate::model::ListAclsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAclsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAclsResponse>> {
         self.inner.list_acls(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn get_acl(
         &self,
         req: crate::model::GetAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Acl>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Acl>> {
         self.inner.get_acl(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn create_acl(
         &self,
         req: crate::model::CreateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Acl>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Acl>> {
         self.inner.create_acl(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn update_acl(
         &self,
         req: crate::model::UpdateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Acl>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Acl>> {
         self.inner.update_acl(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn delete_acl(
         &self,
         req: crate::model::DeleteAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_acl(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn add_acl_entry(
         &self,
         req: crate::model::AddAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddAclEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddAclEntryResponse>> {
         self.inner.add_acl_entry(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn remove_acl_entry(
         &self,
         req: crate::model::RemoveAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveAclEntryResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveAclEntryResponse>> {
         self.inner.remove_acl_entry(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -248,9 +248,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -258,8 +257,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -267,8 +266,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -276,22 +275,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -322,8 +321,8 @@ where
     async fn list_connect_clusters(
         &self,
         req: crate::model::ListConnectClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectClustersResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectClustersResponse>> {
         self.inner.list_connect_clusters(req, options).await
     }
 
@@ -331,8 +330,8 @@ where
     async fn get_connect_cluster(
         &self,
         req: crate::model::GetConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectCluster>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectCluster>> {
         self.inner.get_connect_cluster(req, options).await
     }
 
@@ -340,8 +339,8 @@ where
     async fn create_connect_cluster(
         &self,
         req: crate::model::CreateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_connect_cluster(req, options).await
     }
 
@@ -349,8 +348,8 @@ where
     async fn update_connect_cluster(
         &self,
         req: crate::model::UpdateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_connect_cluster(req, options).await
     }
 
@@ -358,8 +357,8 @@ where
     async fn delete_connect_cluster(
         &self,
         req: crate::model::DeleteConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_connect_cluster(req, options).await
     }
 
@@ -367,8 +366,8 @@ where
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectorsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectorsResponse>> {
         self.inner.list_connectors(req, options).await
     }
 
@@ -376,8 +375,8 @@ where
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         self.inner.get_connector(req, options).await
     }
 
@@ -385,8 +384,8 @@ where
     async fn create_connector(
         &self,
         req: crate::model::CreateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         self.inner.create_connector(req, options).await
     }
 
@@ -394,8 +393,8 @@ where
     async fn update_connector(
         &self,
         req: crate::model::UpdateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         self.inner.update_connector(req, options).await
     }
 
@@ -403,8 +402,8 @@ where
     async fn delete_connector(
         &self,
         req: crate::model::DeleteConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_connector(req, options).await
     }
 
@@ -412,8 +411,8 @@ where
     async fn pause_connector(
         &self,
         req: crate::model::PauseConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PauseConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PauseConnectorResponse>> {
         self.inner.pause_connector(req, options).await
     }
 
@@ -421,8 +420,8 @@ where
     async fn resume_connector(
         &self,
         req: crate::model::ResumeConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResumeConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResumeConnectorResponse>> {
         self.inner.resume_connector(req, options).await
     }
 
@@ -430,8 +429,8 @@ where
     async fn restart_connector(
         &self,
         req: crate::model::RestartConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestartConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestartConnectorResponse>> {
         self.inner.restart_connector(req, options).await
     }
 
@@ -439,8 +438,8 @@ where
     async fn stop_connector(
         &self,
         req: crate::model::StopConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StopConnectorResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StopConnectorResponse>> {
         self.inner.stop_connector(req, options).await
     }
 
@@ -448,8 +447,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -457,8 +456,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -466,9 +465,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -476,8 +474,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -485,8 +483,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -494,22 +492,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/managedkafka/v1/src/transport.rs b/src/generated/cloud/managedkafka/v1/src/transport.rs
index f7b6bcfc42..08b12f573b 100644
--- a/src/generated/cloud/managedkafka/v1/src/transport.rs
+++ b/src/generated/cloud/managedkafka/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ManagedKafka](super::stub::ManagedKafka) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ManagedKafka {
 }
 
 impl ManagedKafka {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn list_clusters(
         &self,
         req: crate::model::ListClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn get_cluster(
         &self,
         req: crate::model::GetClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Cluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Cluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn create_cluster(
         &self,
         req: crate::model::CreateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn update_cluster(
         &self,
         req: crate::model::UpdateClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn delete_cluster(
         &self,
         req: crate::model::DeleteClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +381,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn list_topics(
         &self,
         req: crate::model::ListTopicsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTopicsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTopicsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -430,9 +430,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -447,13 +447,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn get_topic(
         &self,
         req: crate::model::GetTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Topic>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Topic>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -498,9 +498,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -515,13 +515,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn create_topic(
         &self,
         req: crate::model::CreateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Topic>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Topic>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -563,9 +563,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -580,13 +580,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn update_topic(
         &self,
         req: crate::model::UpdateTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Topic>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Topic>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -649,9 +649,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -666,13 +666,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn delete_topic(
         &self,
         req: crate::model::DeleteTopicRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -717,9 +717,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -728,24 +728,25 @@ impl super::stub::ManagedKafka for ManagedKafka {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_consumer_groups(
         &self,
         req: crate::model::ListConsumerGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConsumerGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConsumerGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -788,9 +789,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -805,13 +806,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn get_consumer_group(
         &self,
         req: crate::model::GetConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConsumerGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConsumerGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -856,9 +857,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -873,13 +874,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn update_consumer_group(
         &self,
         req: crate::model::UpdateConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConsumerGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConsumerGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -942,9 +943,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -959,13 +960,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn delete_consumer_group(
         &self,
         req: crate::model::DeleteConsumerGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1010,9 +1011,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1021,24 +1022,25 @@ impl super::stub::ManagedKafka for ManagedKafka {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn list_acls(
         &self,
         req: crate::model::ListAclsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAclsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAclsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1081,9 +1083,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1098,13 +1100,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn get_acl(
         &self,
         req: crate::model::GetAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Acl>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Acl>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1149,9 +1151,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1166,13 +1168,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn create_acl(
         &self,
         req: crate::model::CreateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Acl>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Acl>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1214,9 +1216,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1231,13 +1233,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn update_acl(
         &self,
         req: crate::model::UpdateAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Acl>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Acl>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1300,9 +1302,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1317,13 +1319,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn delete_acl(
         &self,
         req: crate::model::DeleteAclRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1368,9 +1370,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1379,24 +1381,25 @@ impl super::stub::ManagedKafka for ManagedKafka {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn add_acl_entry(
         &self,
         req: crate::model::AddAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AddAclEntryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AddAclEntryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1441,9 +1444,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1458,13 +1461,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn remove_acl_entry(
         &self,
         req: crate::model::RemoveAclEntryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RemoveAclEntryResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RemoveAclEntryResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1509,9 +1512,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1526,13 +1529,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1562,9 +1565,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1579,13 +1582,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1622,9 +1625,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1639,14 +1642,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1688,9 +1690,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1705,13 +1707,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1752,9 +1754,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1769,13 +1771,13 @@ impl super::stub::ManagedKafka for ManagedKafka {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1816,9 +1818,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1827,24 +1829,25 @@ impl super::stub::ManagedKafka for ManagedKafka {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1885,9 +1888,9 @@ impl super::stub::ManagedKafka for ManagedKafka {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1896,25 +1899,26 @@ impl super::stub::ManagedKafka for ManagedKafka {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1934,7 +1938,7 @@ impl std::fmt::Debug for ManagedKafkaConnect {
 }
 
 impl ManagedKafkaConnect {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -1944,13 +1948,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn list_connect_clusters(
         &self,
         req: crate::model::ListConnectClustersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectClustersResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectClustersResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1991,9 +1995,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2008,13 +2012,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn get_connect_cluster(
         &self,
         req: crate::model::GetConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ConnectCluster>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ConnectCluster>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2055,9 +2059,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2072,13 +2076,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn create_connect_cluster(
         &self,
         req: crate::model::CreateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2117,9 +2121,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2134,13 +2138,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn update_connect_cluster(
         &self,
         req: crate::model::UpdateConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2200,9 +2204,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2217,13 +2221,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn delete_connect_cluster(
         &self,
         req: crate::model::DeleteConnectClusterRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2265,9 +2269,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2282,13 +2286,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn list_connectors(
         &self,
         req: crate::model::ListConnectorsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListConnectorsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListConnectorsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2331,9 +2335,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2348,13 +2352,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn get_connector(
         &self,
         req: crate::model::GetConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2399,9 +2403,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2416,13 +2420,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn create_connector(
         &self,
         req: crate::model::CreateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2464,9 +2468,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2481,13 +2485,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn update_connector(
         &self,
         req: crate::model::UpdateConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Connector>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Connector>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2550,9 +2554,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2567,13 +2571,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn delete_connector(
         &self,
         req: crate::model::DeleteConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2618,9 +2622,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2629,24 +2633,25 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn pause_connector(
         &self,
         req: crate::model::PauseConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PauseConnectorResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PauseConnectorResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2691,9 +2696,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2708,13 +2713,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn resume_connector(
         &self,
         req: crate::model::ResumeConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ResumeConnectorResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ResumeConnectorResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2759,9 +2764,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2776,13 +2781,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn restart_connector(
         &self,
         req: crate::model::RestartConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RestartConnectorResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RestartConnectorResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2827,9 +2832,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2844,13 +2849,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn stop_connector(
         &self,
         req: crate::model::StopConnectorRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StopConnectorResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StopConnectorResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2895,9 +2900,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2912,13 +2917,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2948,9 +2953,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2965,13 +2970,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3008,9 +3013,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3025,14 +3030,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3074,9 +3078,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3091,13 +3095,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3138,9 +3142,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3155,13 +3159,13 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3202,9 +3206,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3213,24 +3217,25 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3271,9 +3276,9 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3282,25 +3287,26 @@ impl super::stub::ManagedKafkaConnect for ManagedKafkaConnect {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/memcache/v1/Cargo.toml b/src/generated/cloud/memcache/v1/Cargo.toml
index 460354a9dd..21522ad28a 100644
--- a/src/generated/cloud/memcache/v1/Cargo.toml
+++ b/src/generated/cloud/memcache/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/memcache/v1/src/builder.rs b/src/generated/cloud/memcache/v1/src/builder.rs
index 42f3ecf226..9b93783f8b 100644
--- a/src/generated/cloud/memcache/v1/src/builder.rs
+++ b/src/generated/cloud/memcache/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cloud_memcache {
     /// A builder for [CloudMemcache][crate::client::CloudMemcache].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_memcache_v1::*;
     /// # use builder::cloud_memcache::ClientBuilder;
     /// # use client::CloudMemcache;
@@ -30,19 +30,18 @@ pub mod cloud_memcache {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CloudMemcache;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CloudMemcache;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cloud_memcache {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CloudMemcache>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cloud_memcache {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod cloud_memcache {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -241,8 +242,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -313,7 +314,7 @@ pub mod cloud_memcache {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -380,8 +381,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -391,7 +392,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -420,7 +421,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -435,7 +436,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -452,7 +453,7 @@ pub mod cloud_memcache {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -525,8 +526,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -536,7 +537,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::UpdateParameters;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -568,7 +569,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -583,7 +584,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .update_parameters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_parameters`.
@@ -600,7 +601,7 @@ pub mod cloud_memcache {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -677,8 +678,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateParameters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateParameters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -688,7 +689,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -717,7 +718,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -732,7 +733,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -744,7 +745,7 @@ pub mod cloud_memcache {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -781,8 +782,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -792,7 +793,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::ApplyParameters;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -821,7 +822,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -836,7 +837,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .apply_parameters(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `apply_parameters`.
@@ -853,7 +854,7 @@ pub mod cloud_memcache {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -907,8 +908,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ApplyParameters {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ApplyParameters {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -918,7 +919,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::RescheduleMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -950,7 +951,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -965,7 +966,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .reschedule_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reschedule_maintenance`.
@@ -982,7 +983,7 @@ pub mod cloud_memcache {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1050,8 +1051,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RescheduleMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RescheduleMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1061,8 +1062,8 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1096,7 +1097,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1106,15 +1107,15 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1123,17 +1124,17 @@ pub mod cloud_memcache {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1163,8 +1164,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1174,7 +1175,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1205,7 +1206,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1215,7 +1216,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1226,8 +1227,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1237,8 +1238,8 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1274,7 +1275,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1284,15 +1285,15 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1301,17 +1302,17 @@ pub mod cloud_memcache {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1347,8 +1348,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1358,7 +1359,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1389,7 +1390,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1399,7 +1400,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1410,8 +1411,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1421,7 +1422,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1454,7 +1455,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1464,7 +1465,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -1475,8 +1476,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1486,7 +1487,7 @@ pub mod cloud_memcache {
     /// # Example
     /// ```
     /// # use google_cloud_memcache_v1::builder::cloud_memcache::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memcache_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1519,7 +1520,7 @@ pub mod cloud_memcache {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1529,7 +1530,7 @@ pub mod cloud_memcache {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -1540,8 +1541,8 @@ pub mod cloud_memcache {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/memcache/v1/src/client.rs b/src/generated/cloud/memcache/v1/src/client.rs
index 95289a920c..556a325427 100644
--- a/src/generated/cloud/memcache/v1/src/client.rs
+++ b/src/generated/cloud/memcache/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_memcache_v1::client::CloudMemcache;
 /// let client = CloudMemcache::builder().build().await?;
 /// // use `client` to make requests to the Cloud Memorystore for Memcached API.
@@ -81,13 +81,13 @@ impl CloudMemcache {
     /// Returns a builder for [CloudMemcache].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_memcache_v1::client::CloudMemcache;
     /// let client = CloudMemcache::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cloud_memcache::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::cloud_memcache::client::Factory)
+        crate::new_client_builder(super::builder::cloud_memcache::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -105,14 +105,14 @@ impl CloudMemcache {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::CloudMemcache>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::CloudMemcache>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -121,13 +121,13 @@ impl CloudMemcache {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudMemcache> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudMemcache> {
         super::transport::CloudMemcache::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CloudMemcache> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CloudMemcache> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CloudMemcache::new)
diff --git a/src/generated/cloud/memcache/v1/src/lib.rs b/src/generated/cloud/memcache/v1/src/lib.rs
index 9a5315b5f0..d33f4622ca 100644
--- a/src/generated/cloud/memcache/v1/src/lib.rs
+++ b/src/generated/cloud/memcache/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/memcache/v1/src/model.rs b/src/generated/cloud/memcache/v1/src/model.rs
index 5924acf1e7..284a3d4e43 100644
--- a/src/generated/cloud/memcache/v1/src/model.rs
+++ b/src/generated/cloud/memcache/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -2034,7 +2034,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/memcache/v1/src/stub.rs b/src/generated/cloud/memcache/v1/src/stub.rs
index 09a6a6e170..cc3d3a08d0 100644
--- a/src/generated/cloud/memcache/v1/src/stub.rs
+++ b/src/generated/cloud/memcache/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn update_parameters(
         &self,
         _req: crate::model::UpdateParametersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn apply_parameters(
         &self,
         _req: crate::model::ApplyParametersRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn reschedule_maintenance(
         &self,
         _req: crate::model::RescheduleMaintenanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,10 +129,10 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -143,9 +142,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,10 +153,10 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -167,9 +166,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,8 +177,8 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -187,8 +186,8 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -198,9 +197,9 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -209,8 +208,8 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/memcache/v1/src/stub/dynamic.rs b/src/generated/cloud/memcache/v1/src/stub/dynamic.rs
index 087def1afd..ceb1c0bbd4 100644
--- a/src/generated/cloud/memcache/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/memcache/v1/src/stub/dynamic.rs
@@ -20,98 +20,96 @@ pub trait CloudMemcache: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_parameters(
         &self,
         req: crate::model::UpdateParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn apply_parameters(
         &self,
         req: crate::model::ApplyParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CloudMemcache] also implement [CloudMemcache].
@@ -121,8 +119,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -130,8 +128,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -139,8 +137,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -148,8 +146,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -157,8 +155,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn update_parameters(
         &self,
         req: crate::model::UpdateParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_parameters(self, req, options).await
     }
 
@@ -166,8 +164,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -175,8 +173,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn apply_parameters(
         &self,
         req: crate::model::ApplyParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::apply_parameters(self, req, options).await
     }
 
@@ -184,8 +182,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reschedule_maintenance(self, req, options).await
     }
 
@@ -193,9 +191,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -203,8 +200,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -212,10 +209,9 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -223,8 +219,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -232,8 +228,8 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -241,22 +237,22 @@ impl<T: super::CloudMemcache> CloudMemcache for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/memcache/v1/src/tracing.rs b/src/generated/cloud/memcache/v1/src/tracing.rs
index f8fa8cbd62..dd29ae0d66 100644
--- a/src/generated/cloud/memcache/v1/src/tracing.rs
+++ b/src/generated/cloud/memcache/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn update_parameters(
         &self,
         req: crate::model::UpdateParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_parameters(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn apply_parameters(
         &self,
         req: crate::model::ApplyParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.apply_parameters(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reschedule_maintenance(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -131,9 +131,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -141,8 +140,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -150,8 +149,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -159,22 +158,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/memcache/v1/src/transport.rs b/src/generated/cloud/memcache/v1/src/transport.rs
index 2ba2638657..97f0f58ec9 100644
--- a/src/generated/cloud/memcache/v1/src/transport.rs
+++ b/src/generated/cloud/memcache/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [CloudMemcache](super::stub::CloudMemcache) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for CloudMemcache {
 }
 
 impl CloudMemcache {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn update_parameters(
         &self,
         req: crate::model::UpdateParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -378,13 +378,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn apply_parameters(
         &self,
         req: crate::model::ApplyParametersRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +489,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,13 +506,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -553,9 +553,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -570,13 +570,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -606,9 +606,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -623,13 +623,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -666,9 +666,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -683,14 +683,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -732,9 +731,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -749,13 +748,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -796,9 +795,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -813,13 +812,13 @@ impl super::stub::CloudMemcache for CloudMemcache {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -860,9 +859,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -871,24 +870,25 @@ impl super::stub::CloudMemcache for CloudMemcache {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -929,9 +929,9 @@ impl super::stub::CloudMemcache for CloudMemcache {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -940,25 +940,26 @@ impl super::stub::CloudMemcache for CloudMemcache {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/memorystore/v1/Cargo.toml b/src/generated/cloud/memorystore/v1/Cargo.toml
index 4ad4bba0ee..e5884f2d77 100644
--- a/src/generated/cloud/memorystore/v1/Cargo.toml
+++ b/src/generated/cloud/memorystore/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/memorystore/v1/src/builder.rs b/src/generated/cloud/memorystore/v1/src/builder.rs
index 768963e2ca..e122654032 100644
--- a/src/generated/cloud/memorystore/v1/src/builder.rs
+++ b/src/generated/cloud/memorystore/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod memorystore {
     /// A builder for [Memorystore][crate::client::Memorystore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_memorystore_v1::*;
     /// # use builder::memorystore::ClientBuilder;
     /// # use client::Memorystore;
@@ -30,19 +30,18 @@ pub mod memorystore {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::Memorystore;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = Memorystore;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod memorystore {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::Memorystore>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod memorystore {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::ListInstances;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod memorystore {
             (*self.0.stub)
                 .list_instances(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInstancesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListInstancesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod memorystore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListInstancesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListInstancesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInstances {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInstances {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::GetInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .get_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInstanceRequest::name].
@@ -241,8 +242,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::CreateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .create_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_instance`.
@@ -313,7 +314,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -386,8 +387,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -397,7 +398,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::UpdateInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -426,7 +427,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -441,7 +442,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .update_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_instance`.
@@ -458,7 +459,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -533,8 +534,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -544,7 +545,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::DeleteInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -573,7 +574,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -588,7 +589,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .delete_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_instance`.
@@ -600,7 +601,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -643,8 +644,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -654,7 +655,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::GetCertificateAuthority;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -687,7 +688,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -697,7 +698,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .get_certificate_authority(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetCertificateAuthorityRequest::name].
@@ -710,8 +711,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetCertificateAuthority {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetCertificateAuthority {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -721,7 +722,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::RescheduleMaintenance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -753,7 +754,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -768,7 +769,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .reschedule_maintenance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reschedule_maintenance`.
@@ -785,7 +786,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -853,8 +854,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RescheduleMaintenance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RescheduleMaintenance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -864,8 +865,8 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::ListBackupCollections;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -899,7 +900,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -909,14 +910,16 @@ pub mod memorystore {
             (*self.0.stub)
                 .list_backup_collections(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupCollectionsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupCollectionsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -924,17 +927,17 @@ pub mod memorystore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBackupCollectionsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -960,8 +963,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupCollections {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupCollections {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -971,7 +974,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::GetBackupCollection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1002,7 +1005,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1012,7 +1015,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .get_backup_collection(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupCollectionRequest::name].
@@ -1025,8 +1028,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupCollection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupCollection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1036,8 +1039,8 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1068,7 +1071,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1078,13 +1081,13 @@ pub mod memorystore {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1093,15 +1096,17 @@ pub mod memorystore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1127,8 +1132,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1138,7 +1143,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1166,7 +1171,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1176,7 +1181,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -1189,8 +1194,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1200,7 +1205,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1229,7 +1234,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1244,7 +1249,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -1256,7 +1261,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1299,8 +1304,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1310,7 +1315,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::ExportBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1339,7 +1344,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1354,7 +1359,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .export_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_backup`.
@@ -1371,7 +1376,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1432,8 +1437,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1443,7 +1448,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::BackupInstance;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1472,7 +1477,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1487,7 +1492,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .backup_instance(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `backup_instance`.
@@ -1504,7 +1509,7 @@ pub mod memorystore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1577,8 +1582,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BackupInstance {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BackupInstance {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1588,8 +1593,8 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1623,7 +1628,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1633,15 +1638,15 @@ pub mod memorystore {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1650,17 +1655,17 @@ pub mod memorystore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1690,8 +1695,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1701,7 +1706,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1732,7 +1737,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1742,7 +1747,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1753,8 +1758,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1764,8 +1769,8 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1801,7 +1806,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1811,15 +1816,15 @@ pub mod memorystore {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1828,17 +1833,17 @@ pub mod memorystore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1874,8 +1879,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1885,7 +1890,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1916,7 +1921,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1926,7 +1931,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -1937,8 +1942,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1948,7 +1953,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1981,7 +1986,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1991,7 +1996,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2002,8 +2007,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2013,7 +2018,7 @@ pub mod memorystore {
     /// # Example
     /// ```
     /// # use google_cloud_memorystore_v1::builder::memorystore::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_memorystore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2046,7 +2051,7 @@ pub mod memorystore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2056,7 +2061,7 @@ pub mod memorystore {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2067,8 +2072,8 @@ pub mod memorystore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/memorystore/v1/src/client.rs b/src/generated/cloud/memorystore/v1/src/client.rs
index a5ed30d92e..590a06def3 100644
--- a/src/generated/cloud/memorystore/v1/src/client.rs
+++ b/src/generated/cloud/memorystore/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_memorystore_v1::client::Memorystore;
 /// let client = Memorystore::builder().build().await?;
 /// // use `client` to make requests to the Memorystore API.
@@ -66,13 +66,13 @@ impl Memorystore {
     /// Returns a builder for [Memorystore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_memorystore_v1::client::Memorystore;
     /// let client = Memorystore::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::memorystore::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::memorystore::client::Factory)
+        crate::new_client_builder(super::builder::memorystore::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl Memorystore {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::Memorystore>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::Memorystore>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl Memorystore {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Memorystore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Memorystore> {
         super::transport::Memorystore::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::Memorystore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::Memorystore> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::Memorystore::new)
diff --git a/src/generated/cloud/memorystore/v1/src/lib.rs b/src/generated/cloud/memorystore/v1/src/lib.rs
index ccaabfbe3d..d1d0227c66 100644
--- a/src/generated/cloud/memorystore/v1/src/lib.rs
+++ b/src/generated/cloud/memorystore/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/memorystore/v1/src/model.rs b/src/generated/cloud/memorystore/v1/src/model.rs
index f6745d9496..4174bf35d7 100644
--- a/src/generated/cloud/memorystore/v1/src/model.rs
+++ b/src/generated/cloud/memorystore/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -6516,7 +6516,7 @@ impl wkt::message::Message for ListInstancesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInstancesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInstancesResponse {
     type PageItem = crate::model::Instance;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7033,7 +7033,7 @@ impl wkt::message::Message for ListBackupCollectionsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupCollectionsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupCollectionsResponse {
     type PageItem = crate::model::BackupCollection;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7237,7 +7237,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/memorystore/v1/src/stub.rs b/src/generated/cloud/memorystore/v1/src/stub.rs
index d30db7ed12..10177f6b42 100644
--- a/src/generated/cloud/memorystore/v1/src/stub.rs
+++ b/src/generated/cloud/memorystore/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn list_instances(
         &self,
         _req: crate::model::ListInstancesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInstancesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn get_instance(
         &self,
         _req: crate::model::GetInstanceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Instance>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Instance>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn create_instance(
         &self,
         _req: crate::model::CreateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn update_instance(
         &self,
         _req: crate::model::UpdateInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn delete_instance(
         &self,
         _req: crate::model::DeleteInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn get_certificate_authority(
         &self,
         _req: crate::model::GetCertificateAuthorityRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::CertificateAuthority>>,
+        Output = crate::Result<crate::Response<crate::model::CertificateAuthority>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn reschedule_maintenance(
         &self,
         _req: crate::model::RescheduleMaintenanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,11 +118,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn list_backup_collections(
         &self,
         _req: crate::model::ListBackupCollectionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListBackupCollectionsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListBackupCollectionsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -132,9 +129,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn get_backup_collection(
         &self,
         _req: crate::model::GetBackupCollectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupCollection>>,
+        Output = crate::Result<crate::Response<crate::model::BackupCollection>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -143,9 +140,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -154,10 +151,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -165,9 +161,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -176,9 +172,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn export_backup(
         &self,
         _req: crate::model::ExportBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -187,9 +183,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn backup_instance(
         &self,
         _req: crate::model::BackupInstanceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -198,10 +194,10 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -211,9 +207,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -222,10 +218,10 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -235,9 +231,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -246,8 +242,8 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -255,8 +251,8 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -266,9 +262,9 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -277,8 +273,8 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/memorystore/v1/src/stub/dynamic.rs b/src/generated/cloud/memorystore/v1/src/stub/dynamic.rs
index d6a23a869f..02459adfcf 100644
--- a/src/generated/cloud/memorystore/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/memorystore/v1/src/stub/dynamic.rs
@@ -20,134 +20,132 @@ pub trait Memorystore: std::fmt::Debug + Send + Sync {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>>;
 
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>>;
 
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_certificate_authority(
         &self,
         req: crate::model::GetCertificateAuthorityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateAuthority>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateAuthority>>;
 
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backup_collections(
         &self,
         req: crate::model::ListBackupCollectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupCollectionsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupCollectionsResponse>>;
 
     async fn get_backup_collection(
         &self,
         req: crate::model::GetBackupCollectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupCollection>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupCollection>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_backup(
         &self,
         req: crate::model::ExportBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn backup_instance(
         &self,
         req: crate::model::BackupInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::Memorystore] also implement [Memorystore].
@@ -157,8 +155,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInstancesResponse>> {
         T::list_instances(self, req, options).await
     }
 
@@ -166,8 +164,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Instance>> {
         T::get_instance(self, req, options).await
     }
 
@@ -175,8 +173,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_instance(self, req, options).await
     }
 
@@ -184,8 +182,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_instance(self, req, options).await
     }
 
@@ -193,8 +191,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_instance(self, req, options).await
     }
 
@@ -202,8 +200,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn get_certificate_authority(
         &self,
         req: crate::model::GetCertificateAuthorityRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::CertificateAuthority>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::CertificateAuthority>> {
         T::get_certificate_authority(self, req, options).await
     }
 
@@ -211,8 +209,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reschedule_maintenance(self, req, options).await
     }
 
@@ -220,8 +218,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn list_backup_collections(
         &self,
         req: crate::model::ListBackupCollectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupCollectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupCollectionsResponse>> {
         T::list_backup_collections(self, req, options).await
     }
 
@@ -229,8 +227,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn get_backup_collection(
         &self,
         req: crate::model::GetBackupCollectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupCollection>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupCollection>> {
         T::get_backup_collection(self, req, options).await
     }
 
@@ -238,8 +236,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -247,8 +245,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -256,8 +254,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -265,8 +263,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn export_backup(
         &self,
         req: crate::model::ExportBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_backup(self, req, options).await
     }
 
@@ -274,8 +272,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn backup_instance(
         &self,
         req: crate::model::BackupInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::backup_instance(self, req, options).await
     }
 
@@ -283,9 +281,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -293,8 +290,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -302,10 +299,9 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -313,8 +309,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -322,8 +318,8 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -331,22 +327,22 @@ impl<T: super::Memorystore> Memorystore for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/memorystore/v1/src/tracing.rs b/src/generated/cloud/memorystore/v1/src/tracing.rs
index 87f3e789a9..d4d89a57d0 100644
--- a/src/generated/cloud/memorystore/v1/src/tracing.rs
+++ b/src/generated/cloud/memorystore/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         self.inner.list_instances(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         self.inner.get_instance(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_instance(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_instance(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_instance(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_certificate_authority(
         &self,
         req: crate::model::GetCertificateAuthorityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateAuthority>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateAuthority>> {
         self.inner.get_certificate_authority(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reschedule_maintenance(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_backup_collections(
         &self,
         req: crate::model::ListBackupCollectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupCollectionsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupCollectionsResponse>> {
         self.inner.list_backup_collections(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_backup_collection(
         &self,
         req: crate::model::GetBackupCollectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupCollection>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupCollection>> {
         self.inner.get_backup_collection(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn export_backup(
         &self,
         req: crate::model::ExportBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_backup(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn backup_instance(
         &self,
         req: crate::model::BackupInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.backup_instance(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -185,9 +185,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -195,8 +194,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -204,8 +203,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -213,22 +212,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/memorystore/v1/src/transport.rs b/src/generated/cloud/memorystore/v1/src/transport.rs
index cd4a7e000f..42b905da20 100644
--- a/src/generated/cloud/memorystore/v1/src/transport.rs
+++ b/src/generated/cloud/memorystore/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [Memorystore](super::stub::Memorystore) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for Memorystore {
 }
 
 impl Memorystore {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn list_instances(
         &self,
         req: crate::model::ListInstancesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInstancesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInstancesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn get_instance(
         &self,
         req: crate::model::GetInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Instance>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Instance>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn create_instance(
         &self,
         req: crate::model::CreateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn update_instance(
         &self,
         req: crate::model::UpdateInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn delete_instance(
         &self,
         req: crate::model::DeleteInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +381,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn get_certificate_authority(
         &self,
         req: crate::model::GetCertificateAuthorityRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::CertificateAuthority>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::CertificateAuthority>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -428,9 +428,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -445,13 +445,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn reschedule_maintenance(
         &self,
         req: crate::model::RescheduleMaintenanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -492,9 +492,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -509,13 +509,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn list_backup_collections(
         &self,
         req: crate::model::ListBackupCollectionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupCollectionsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupCollectionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -554,9 +554,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -571,13 +571,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn get_backup_collection(
         &self,
         req: crate::model::GetBackupCollectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupCollection>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupCollection>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -618,9 +618,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -635,13 +635,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -684,9 +684,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -701,13 +701,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -752,9 +752,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -769,13 +769,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -821,9 +821,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -838,13 +838,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn export_backup(
         &self,
         req: crate::model::ExportBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -889,9 +889,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -906,13 +906,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn backup_instance(
         &self,
         req: crate::model::BackupInstanceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -953,9 +953,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -970,13 +970,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1006,9 +1006,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1023,13 +1023,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1066,9 +1066,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1083,14 +1083,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1132,9 +1131,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1149,13 +1148,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1196,9 +1195,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1213,13 +1212,13 @@ impl super::stub::Memorystore for Memorystore {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1260,9 +1259,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1271,24 +1270,25 @@ impl super::stub::Memorystore for Memorystore {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1329,9 +1329,9 @@ impl super::stub::Memorystore for Memorystore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1340,25 +1340,26 @@ impl super::stub::Memorystore for Memorystore {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/metastore/v1/Cargo.toml b/src/generated/cloud/metastore/v1/Cargo.toml
index b591a30f49..6b06755177 100644
--- a/src/generated/cloud/metastore/v1/Cargo.toml
+++ b/src/generated/cloud/metastore/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/metastore/v1/src/builder.rs b/src/generated/cloud/metastore/v1/src/builder.rs
index f4a650255c..522cd49307 100644
--- a/src/generated/cloud/metastore/v1/src/builder.rs
+++ b/src/generated/cloud/metastore/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod dataproc_metastore {
     /// A builder for [DataprocMetastore][crate::client::DataprocMetastore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_metastore_v1::*;
     /// # use builder::dataproc_metastore::ClientBuilder;
     /// # use client::DataprocMetastore;
@@ -30,19 +30,18 @@ pub mod dataproc_metastore {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataprocMetastore;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataprocMetastore;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod dataproc_metastore {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataprocMetastore>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod dataproc_metastore {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::ListServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .list_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServicesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListServicesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod dataproc_metastore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListServicesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListServicesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::GetService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .get_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceRequest::name].
@@ -241,8 +242,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::CreateService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -281,7 +282,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -296,7 +297,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .create_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service`.
@@ -313,7 +314,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -386,8 +387,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -397,7 +398,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::UpdateService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -426,7 +427,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -441,7 +442,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .update_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_service`.
@@ -458,7 +459,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -537,8 +538,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -548,7 +549,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::DeleteService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -577,7 +578,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -592,7 +593,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .delete_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service`.
@@ -604,7 +605,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -647,8 +648,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -658,8 +659,8 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::ListMetadataImports;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -693,7 +694,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -703,14 +704,16 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .list_metadata_imports(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListMetadataImportsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListMetadataImportsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -718,17 +721,17 @@ pub mod dataproc_metastore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMetadataImportsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -766,8 +769,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMetadataImports {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMetadataImports {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -777,7 +780,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::GetMetadataImport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -808,7 +811,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -818,7 +821,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .get_metadata_import(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMetadataImportRequest::name].
@@ -831,8 +834,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMetadataImport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMetadataImport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -842,7 +845,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::CreateMetadataImport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -874,7 +877,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -889,7 +892,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .create_metadata_import(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_metadata_import`.
@@ -906,7 +909,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -979,8 +982,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMetadataImport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMetadataImport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -990,7 +993,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::UpdateMetadataImport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1022,7 +1025,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1037,7 +1040,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .update_metadata_import(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_metadata_import`.
@@ -1054,7 +1057,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1133,8 +1136,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMetadataImport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMetadataImport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1144,7 +1147,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::ExportMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1173,7 +1176,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1188,7 +1191,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .export_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `export_metadata`.
@@ -1205,7 +1208,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1284,8 +1287,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ExportMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ExportMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1295,7 +1298,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::RestoreService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1324,7 +1327,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1339,7 +1342,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .restore_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_service`.
@@ -1356,7 +1359,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1416,8 +1419,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1427,8 +1430,8 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1459,7 +1462,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1469,13 +1472,13 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1484,15 +1487,17 @@ pub mod dataproc_metastore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1530,8 +1535,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1541,7 +1546,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1569,7 +1574,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1579,7 +1584,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -1592,8 +1597,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1603,7 +1608,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::CreateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1632,7 +1637,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1647,7 +1652,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .create_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup`.
@@ -1664,7 +1669,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1737,8 +1742,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1748,7 +1753,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1777,7 +1782,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1792,7 +1797,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -1804,7 +1809,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1847,8 +1852,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1858,7 +1863,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::QueryMetadata;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1887,7 +1892,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1902,7 +1907,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .query_metadata(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `query_metadata`.
@@ -1921,7 +1926,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1966,8 +1971,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryMetadata {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryMetadata {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1977,7 +1982,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::MoveTableToDatabase;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2009,7 +2014,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2024,7 +2029,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .move_table_to_database(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `move_table_to_database`.
@@ -2043,7 +2048,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2104,8 +2109,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for MoveTableToDatabase {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for MoveTableToDatabase {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2115,7 +2120,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::AlterMetadataResourceLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2149,7 +2154,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2164,7 +2169,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .alter_metadata_resource_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `alter_metadata_resource_location`.
@@ -2183,7 +2188,7 @@ pub mod dataproc_metastore {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2236,8 +2241,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AlterMetadataResourceLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AlterMetadataResourceLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2247,8 +2252,8 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2282,7 +2287,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2292,15 +2297,15 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2309,17 +2314,17 @@ pub mod dataproc_metastore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2349,8 +2354,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2360,7 +2365,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2391,7 +2396,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2401,7 +2406,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2412,8 +2417,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2423,7 +2428,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2454,7 +2459,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2464,7 +2469,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2517,8 +2522,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2528,7 +2533,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2559,7 +2564,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2569,7 +2574,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -2600,8 +2605,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2611,7 +2616,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2644,7 +2649,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2654,7 +2659,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2680,8 +2685,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2691,8 +2696,8 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2728,7 +2733,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2738,15 +2743,15 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2755,17 +2760,17 @@ pub mod dataproc_metastore {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2801,8 +2806,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2812,7 +2817,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2843,7 +2848,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2853,7 +2858,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2864,8 +2869,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2875,7 +2880,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2908,7 +2913,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2918,7 +2923,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2929,8 +2934,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2940,7 +2945,7 @@ pub mod dataproc_metastore {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2973,7 +2978,7 @@ pub mod dataproc_metastore {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2983,7 +2988,7 @@ pub mod dataproc_metastore {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -2994,8 +2999,8 @@ pub mod dataproc_metastore {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3007,7 +3012,7 @@ pub mod dataproc_metastore_federation {
     /// A builder for [DataprocMetastoreFederation][crate::client::DataprocMetastoreFederation].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_metastore_v1::*;
     /// # use builder::dataproc_metastore_federation::ClientBuilder;
     /// # use client::DataprocMetastoreFederation;
@@ -3017,19 +3022,18 @@ pub mod dataproc_metastore_federation {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataprocMetastoreFederation;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataprocMetastoreFederation;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3040,7 +3044,7 @@ pub mod dataproc_metastore_federation {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataprocMetastoreFederation>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3053,7 +3057,7 @@ pub mod dataproc_metastore_federation {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3063,8 +3067,8 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::ListFederations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3095,7 +3099,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3105,14 +3109,16 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .list_federations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListFederationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListFederationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3120,15 +3126,17 @@ pub mod dataproc_metastore_federation {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListFederationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListFederationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3166,8 +3174,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListFederations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListFederations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3177,7 +3185,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::GetFederation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3205,7 +3213,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3215,7 +3223,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .get_federation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFederationRequest::name].
@@ -3228,8 +3236,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFederation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFederation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3239,7 +3247,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::CreateFederation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3271,7 +3279,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3286,7 +3294,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .create_federation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_federation`.
@@ -3303,7 +3311,7 @@ pub mod dataproc_metastore_federation {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3376,8 +3384,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateFederation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateFederation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3387,7 +3395,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::UpdateFederation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3419,7 +3427,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3434,7 +3442,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .update_federation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_federation`.
@@ -3451,7 +3459,7 @@ pub mod dataproc_metastore_federation {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3530,8 +3538,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFederation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFederation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3541,7 +3549,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::DeleteFederation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3573,7 +3581,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3588,7 +3596,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .delete_federation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_federation`.
@@ -3600,7 +3608,7 @@ pub mod dataproc_metastore_federation {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3643,8 +3651,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteFederation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteFederation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3654,8 +3662,8 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3689,7 +3697,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3699,15 +3707,15 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3716,17 +3724,17 @@ pub mod dataproc_metastore_federation {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3756,8 +3764,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3767,7 +3775,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3798,7 +3806,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3808,7 +3816,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -3819,8 +3827,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3830,7 +3838,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3861,7 +3869,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3871,7 +3879,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -3924,8 +3932,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3935,7 +3943,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3966,7 +3974,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3976,7 +3984,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4007,8 +4015,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4018,7 +4026,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4051,7 +4059,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4061,7 +4069,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4087,8 +4095,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4098,8 +4106,8 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4135,7 +4143,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4145,15 +4153,15 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4162,17 +4170,17 @@ pub mod dataproc_metastore_federation {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4208,8 +4216,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4219,7 +4227,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4250,7 +4258,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4260,7 +4268,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -4271,8 +4279,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4282,7 +4290,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4315,7 +4323,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4325,7 +4333,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -4336,8 +4344,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4347,7 +4355,7 @@ pub mod dataproc_metastore_federation {
     /// # Example
     /// ```
     /// # use google_cloud_metastore_v1::builder::dataproc_metastore_federation::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_metastore_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4380,7 +4388,7 @@ pub mod dataproc_metastore_federation {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4390,7 +4398,7 @@ pub mod dataproc_metastore_federation {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -4401,8 +4409,8 @@ pub mod dataproc_metastore_federation {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/metastore/v1/src/client.rs b/src/generated/cloud/metastore/v1/src/client.rs
index 6169e58088..63b303c741 100644
--- a/src/generated/cloud/metastore/v1/src/client.rs
+++ b/src/generated/cloud/metastore/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_metastore_v1::client::DataprocMetastore;
 /// let client = DataprocMetastore::builder().build().await?;
 /// // use `client` to make requests to the Dataproc Metastore API.
@@ -86,15 +86,13 @@ impl DataprocMetastore {
     /// Returns a builder for [DataprocMetastore].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_metastore_v1::client::DataprocMetastore;
     /// let client = DataprocMetastore::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dataproc_metastore::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::dataproc_metastore::client::Factory,
-        )
+        crate::new_client_builder(super::builder::dataproc_metastore::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -112,14 +110,14 @@ impl DataprocMetastore {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataprocMetastore>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataprocMetastore>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -129,13 +127,13 @@ impl DataprocMetastore {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataprocMetastore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataprocMetastore> {
         super::transport::DataprocMetastore::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataprocMetastore> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataprocMetastore> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataprocMetastore::new)
@@ -432,7 +430,7 @@ impl DataprocMetastore {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_metastore_v1::client::DataprocMetastoreFederation;
 /// let client = DataprocMetastoreFederation::builder().build().await?;
 /// // use `client` to make requests to the Dataproc Metastore API.
@@ -491,15 +489,13 @@ impl DataprocMetastoreFederation {
     /// Returns a builder for [DataprocMetastoreFederation].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_metastore_v1::client::DataprocMetastoreFederation;
     /// let client = DataprocMetastoreFederation::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::dataproc_metastore_federation::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::dataproc_metastore_federation::client::Factory,
-        )
+        crate::new_client_builder(super::builder::dataproc_metastore_federation::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -517,14 +513,14 @@ impl DataprocMetastoreFederation {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::DataprocMetastoreFederation>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -535,13 +531,13 @@ impl DataprocMetastoreFederation {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataprocMetastoreFederation> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataprocMetastoreFederation> {
         super::transport::DataprocMetastoreFederation::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataprocMetastoreFederation> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataprocMetastoreFederation> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataprocMetastoreFederation::new)
diff --git a/src/generated/cloud/metastore/v1/src/lib.rs b/src/generated/cloud/metastore/v1/src/lib.rs
index a1c9c33290..2e50a8e0f1 100644
--- a/src/generated/cloud/metastore/v1/src/lib.rs
+++ b/src/generated/cloud/metastore/v1/src/lib.rs
@@ -47,8 +47,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -83,3 +83,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/metastore/v1/src/model.rs b/src/generated/cloud/metastore/v1/src/model.rs
index 0937de086e..c3b9219991 100644
--- a/src/generated/cloud/metastore/v1/src/model.rs
+++ b/src/generated/cloud/metastore/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -4638,7 +4638,7 @@ impl wkt::message::Message for ListServicesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServicesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServicesResponse {
     type PageItem = crate::model::Service;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5206,7 +5206,7 @@ impl wkt::message::Message for ListMetadataImportsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMetadataImportsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListMetadataImportsResponse {
     type PageItem = crate::model::MetadataImport;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5711,7 +5711,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7801,7 +7801,7 @@ impl wkt::message::Message for ListFederationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListFederationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListFederationsResponse {
     type PageItem = crate::model::Federation;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/metastore/v1/src/stub.rs b/src/generated/cloud/metastore/v1/src/stub.rs
index e182292198..1ab5c905c8 100644
--- a/src/generated/cloud/metastore/v1/src/stub.rs
+++ b/src/generated/cloud/metastore/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn list_services(
         &self,
         _req: crate::model::ListServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServicesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServicesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn get_service(
         &self,
         _req: crate::model::GetServiceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Service>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Service>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,9 +63,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn create_service(
         &self,
         _req: crate::model::CreateServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -75,9 +74,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn update_service(
         &self,
         _req: crate::model::UpdateServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn delete_service(
         &self,
         _req: crate::model::DeleteServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn list_metadata_imports(
         &self,
         _req: crate::model::ListMetadataImportsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListMetadataImportsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListMetadataImportsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn get_metadata_import(
         &self,
         _req: crate::model::GetMetadataImportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MetadataImport>>,
+        Output = crate::Result<crate::Response<crate::model::MetadataImport>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn create_metadata_import(
         &self,
         _req: crate::model::CreateMetadataImportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,9 +129,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn update_metadata_import(
         &self,
         _req: crate::model::UpdateMetadataImportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,9 +140,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn export_metadata(
         &self,
         _req: crate::model::ExportMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +151,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn restore_service(
         &self,
         _req: crate::model::RestoreServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +162,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,10 +173,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -185,9 +183,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn create_backup(
         &self,
         _req: crate::model::CreateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -196,9 +194,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -207,9 +205,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn query_metadata(
         &self,
         _req: crate::model::QueryMetadataRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -218,9 +216,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn move_table_to_database(
         &self,
         _req: crate::model::MoveTableToDatabaseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -229,9 +227,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn alter_metadata_resource_location(
         &self,
         _req: crate::model::AlterMetadataResourceLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,10 +238,10 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -253,9 +251,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,9 +262,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -275,9 +273,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -286,10 +284,10 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -299,10 +297,10 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -312,9 +310,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -323,8 +321,8 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -332,8 +330,8 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -343,9 +341,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -354,9 +352,9 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -376,9 +374,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn list_federations(
         &self,
         _req: crate::model::ListFederationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListFederationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListFederationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -387,10 +385,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn get_federation(
         &self,
         _req: crate::model::GetFederationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Federation>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Federation>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -398,9 +395,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn create_federation(
         &self,
         _req: crate::model::CreateFederationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -409,9 +406,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn update_federation(
         &self,
         _req: crate::model::UpdateFederationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -420,9 +417,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn delete_federation(
         &self,
         _req: crate::model::DeleteFederationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -431,10 +428,10 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -444,9 +441,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -455,9 +452,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -466,9 +463,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -477,10 +474,10 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -490,10 +487,10 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -503,9 +500,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -514,8 +511,8 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -523,8 +520,8 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -534,9 +531,9 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -545,8 +542,8 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/metastore/v1/src/stub/dynamic.rs b/src/generated/cloud/metastore/v1/src/stub/dynamic.rs
index 775675c8f7..3d0c66d3d9 100644
--- a/src/generated/cloud/metastore/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/metastore/v1/src/stub/dynamic.rs
@@ -20,178 +20,174 @@ pub trait DataprocMetastore: std::fmt::Debug + Send + Sync {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>>;
 
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>>;
 
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_metadata_imports(
         &self,
         req: crate::model::ListMetadataImportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataImportsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataImportsResponse>>;
 
     async fn get_metadata_import(
         &self,
         req: crate::model::GetMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataImport>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataImport>>;
 
     async fn create_metadata_import(
         &self,
         req: crate::model::CreateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_metadata_import(
         &self,
         req: crate::model::UpdateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn export_metadata(
         &self,
         req: crate::model::ExportMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_service(
         &self,
         req: crate::model::RestoreServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn query_metadata(
         &self,
         req: crate::model::QueryMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn move_table_to_database(
         &self,
         req: crate::model::MoveTableToDatabaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn alter_metadata_resource_location(
         &self,
         req: crate::model::AlterMetadataResourceLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataprocMetastore] also implement [DataprocMetastore].
@@ -201,8 +197,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServicesResponse>> {
         T::list_services(self, req, options).await
     }
 
@@ -210,8 +206,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Service>> {
         T::get_service(self, req, options).await
     }
 
@@ -219,8 +215,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service(self, req, options).await
     }
 
@@ -228,8 +224,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_service(self, req, options).await
     }
 
@@ -237,8 +233,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service(self, req, options).await
     }
 
@@ -246,8 +242,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn list_metadata_imports(
         &self,
         req: crate::model::ListMetadataImportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListMetadataImportsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMetadataImportsResponse>> {
         T::list_metadata_imports(self, req, options).await
     }
 
@@ -255,8 +251,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn get_metadata_import(
         &self,
         req: crate::model::GetMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MetadataImport>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MetadataImport>> {
         T::get_metadata_import(self, req, options).await
     }
 
@@ -264,8 +260,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn create_metadata_import(
         &self,
         req: crate::model::CreateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_metadata_import(self, req, options).await
     }
 
@@ -273,8 +269,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn update_metadata_import(
         &self,
         req: crate::model::UpdateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_metadata_import(self, req, options).await
     }
 
@@ -282,8 +278,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn export_metadata(
         &self,
         req: crate::model::ExportMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::export_metadata(self, req, options).await
     }
 
@@ -291,8 +287,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn restore_service(
         &self,
         req: crate::model::RestoreServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_service(self, req, options).await
     }
 
@@ -300,8 +296,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -309,8 +305,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -318,8 +314,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup(self, req, options).await
     }
 
@@ -327,8 +323,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -336,8 +332,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn query_metadata(
         &self,
         req: crate::model::QueryMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::query_metadata(self, req, options).await
     }
 
@@ -345,8 +341,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn move_table_to_database(
         &self,
         req: crate::model::MoveTableToDatabaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::move_table_to_database(self, req, options).await
     }
 
@@ -354,8 +350,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn alter_metadata_resource_location(
         &self,
         req: crate::model::AlterMetadataResourceLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::alter_metadata_resource_location(self, req, options).await
     }
 
@@ -363,9 +359,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -373,8 +368,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -382,8 +377,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -391,8 +386,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -400,10 +395,9 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -411,10 +405,9 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -422,8 +415,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -431,8 +424,8 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -440,22 +433,22 @@ impl<T: super::DataprocMetastore> DataprocMetastore for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -466,100 +459,96 @@ pub trait DataprocMetastoreFederation: std::fmt::Debug + Send + Sync {
     async fn list_federations(
         &self,
         req: crate::model::ListFederationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFederationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFederationsResponse>>;
 
     async fn get_federation(
         &self,
         req: crate::model::GetFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Federation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Federation>>;
 
     async fn create_federation(
         &self,
         req: crate::model::CreateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_federation(
         &self,
         req: crate::model::UpdateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_federation(
         &self,
         req: crate::model::DeleteFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataprocMetastoreFederation] also implement [DataprocMetastoreFederation].
@@ -569,8 +558,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn list_federations(
         &self,
         req: crate::model::ListFederationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListFederationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListFederationsResponse>> {
         T::list_federations(self, req, options).await
     }
 
@@ -578,8 +567,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn get_federation(
         &self,
         req: crate::model::GetFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Federation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Federation>> {
         T::get_federation(self, req, options).await
     }
 
@@ -587,8 +576,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn create_federation(
         &self,
         req: crate::model::CreateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_federation(self, req, options).await
     }
 
@@ -596,8 +585,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn update_federation(
         &self,
         req: crate::model::UpdateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_federation(self, req, options).await
     }
 
@@ -605,8 +594,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn delete_federation(
         &self,
         req: crate::model::DeleteFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_federation(self, req, options).await
     }
 
@@ -614,9 +603,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -624,8 +612,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -633,8 +621,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -642,8 +630,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -651,10 +639,9 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -662,10 +649,9 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -673,8 +659,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -682,8 +668,8 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -691,22 +677,22 @@ impl<T: super::DataprocMetastoreFederation> DataprocMetastoreFederation for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/metastore/v1/src/tracing.rs b/src/generated/cloud/metastore/v1/src/tracing.rs
index 915578d3c3..2bb7e7ed47 100644
--- a/src/generated/cloud/metastore/v1/src/tracing.rs
+++ b/src/generated/cloud/metastore/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         self.inner.list_services(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         self.inner.get_service(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_service(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_service(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_service(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_metadata_imports(
         &self,
         req: crate::model::ListMetadataImportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataImportsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataImportsResponse>> {
         self.inner.list_metadata_imports(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn get_metadata_import(
         &self,
         req: crate::model::GetMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataImport>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataImport>> {
         self.inner.get_metadata_import(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn create_metadata_import(
         &self,
         req: crate::model::CreateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_metadata_import(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn update_metadata_import(
         &self,
         req: crate::model::UpdateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_metadata_import(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn export_metadata(
         &self,
         req: crate::model::ExportMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.export_metadata(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn restore_service(
         &self,
         req: crate::model::RestoreServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_service(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn query_metadata(
         &self,
         req: crate::model::QueryMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.query_metadata(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn move_table_to_database(
         &self,
         req: crate::model::MoveTableToDatabaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.move_table_to_database(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn alter_metadata_resource_location(
         &self,
         req: crate::model::AlterMetadataResourceLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .alter_metadata_resource_location(req, options)
             .await
@@ -205,8 +205,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -214,8 +214,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -223,8 +223,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -232,8 +232,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -241,9 +241,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -251,9 +250,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -261,8 +259,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -270,8 +268,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -279,22 +277,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -325,8 +323,8 @@ where
     async fn list_federations(
         &self,
         req: crate::model::ListFederationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFederationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFederationsResponse>> {
         self.inner.list_federations(req, options).await
     }
 
@@ -334,8 +332,8 @@ where
     async fn get_federation(
         &self,
         req: crate::model::GetFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Federation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Federation>> {
         self.inner.get_federation(req, options).await
     }
 
@@ -343,8 +341,8 @@ where
     async fn create_federation(
         &self,
         req: crate::model::CreateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_federation(req, options).await
     }
 
@@ -352,8 +350,8 @@ where
     async fn update_federation(
         &self,
         req: crate::model::UpdateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_federation(req, options).await
     }
 
@@ -361,8 +359,8 @@ where
     async fn delete_federation(
         &self,
         req: crate::model::DeleteFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_federation(req, options).await
     }
 
@@ -370,8 +368,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -379,8 +377,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -388,8 +386,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -397,8 +395,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -406,9 +404,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -416,9 +413,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -426,8 +422,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -435,8 +431,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -444,22 +440,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/metastore/v1/src/transport.rs b/src/generated/cloud/metastore/v1/src/transport.rs
index 032c7abeb2..d71c224f7c 100644
--- a/src/generated/cloud/metastore/v1/src/transport.rs
+++ b/src/generated/cloud/metastore/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [DataprocMetastore](super::stub::DataprocMetastore) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for DataprocMetastore {
 }
 
 impl DataprocMetastore {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn list_services(
         &self,
         req: crate::model::ListServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServicesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServicesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn get_service(
         &self,
         req: crate::model::GetServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Service>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Service>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn create_service(
         &self,
         req: crate::model::CreateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn update_service(
         &self,
         req: crate::model::UpdateServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn delete_service(
         &self,
         req: crate::model::DeleteServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -381,13 +381,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn list_metadata_imports(
         &self,
         req: crate::model::ListMetadataImportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMetadataImportsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMetadataImportsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -432,9 +432,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -449,13 +449,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn get_metadata_import(
         &self,
         req: crate::model::GetMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MetadataImport>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MetadataImport>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -500,9 +500,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -517,13 +517,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn create_metadata_import(
         &self,
         req: crate::model::CreateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -566,9 +566,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -583,13 +583,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn update_metadata_import(
         &self,
         req: crate::model::UpdateMetadataImportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -653,9 +653,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -670,13 +670,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn export_metadata(
         &self,
         req: crate::model::ExportMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -717,9 +717,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -734,13 +734,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn restore_service(
         &self,
         req: crate::model::RestoreServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -781,9 +781,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -798,13 +798,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -849,9 +849,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -866,13 +866,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -917,9 +917,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -934,13 +934,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -983,9 +983,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1000,13 +1000,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1052,9 +1052,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1069,13 +1069,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn query_metadata(
         &self,
         req: crate::model::QueryMetadataRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1116,9 +1116,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1133,13 +1133,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn move_table_to_database(
         &self,
         req: crate::model::MoveTableToDatabaseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1180,9 +1180,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1197,13 +1197,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn alter_metadata_resource_location(
         &self,
         req: crate::model::AlterMetadataResourceLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1244,9 +1244,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1261,13 +1261,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1297,9 +1297,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1314,13 +1314,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1357,9 +1357,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1374,13 +1374,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1499,9 +1499,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1516,13 +1516,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1677,9 +1677,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1694,14 +1694,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1779,9 +1778,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1796,14 +1795,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1845,9 +1843,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1862,13 +1860,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1909,9 +1907,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1926,13 +1924,13 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1973,9 +1971,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1984,24 +1982,25 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2042,9 +2041,9 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2053,25 +2052,26 @@ impl super::stub::DataprocMetastore for DataprocMetastore {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -2091,7 +2091,7 @@ impl std::fmt::Debug for DataprocMetastoreFederation {
 }
 
 impl DataprocMetastoreFederation {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -2101,13 +2101,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn list_federations(
         &self,
         req: crate::model::ListFederationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListFederationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListFederationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2148,9 +2148,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2165,13 +2165,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn get_federation(
         &self,
         req: crate::model::GetFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Federation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Federation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2212,9 +2212,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2229,13 +2229,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn create_federation(
         &self,
         req: crate::model::CreateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2274,9 +2274,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2291,13 +2291,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn update_federation(
         &self,
         req: crate::model::UpdateFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2357,9 +2357,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2374,13 +2374,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn delete_federation(
         &self,
         req: crate::model::DeleteFederationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2422,9 +2422,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2439,13 +2439,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2475,9 +2475,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2492,13 +2492,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2535,9 +2535,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2552,13 +2552,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2677,9 +2677,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2694,13 +2694,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2855,9 +2855,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2872,14 +2872,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2957,9 +2956,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2974,14 +2973,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3023,9 +3021,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3040,13 +3038,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3087,9 +3085,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3104,13 +3102,13 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3151,9 +3149,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3162,24 +3160,25 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3220,9 +3219,9 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3231,25 +3230,26 @@ impl super::stub::DataprocMetastoreFederation for DataprocMetastoreFederation {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/migrationcenter/v1/Cargo.toml b/src/generated/cloud/migrationcenter/v1/Cargo.toml
index fbeeb7b9e0..a79606cb5c 100644
--- a/src/generated/cloud/migrationcenter/v1/Cargo.toml
+++ b/src/generated/cloud/migrationcenter/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/migrationcenter/v1/src/builder.rs b/src/generated/cloud/migrationcenter/v1/src/builder.rs
index 6c5eca3985..6a35a76264 100644
--- a/src/generated/cloud/migrationcenter/v1/src/builder.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod migration_center {
     /// A builder for [MigrationCenter][crate::client::MigrationCenter].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_migrationcenter_v1::*;
     /// # use builder::migration_center::ClientBuilder;
     /// # use client::MigrationCenter;
@@ -30,19 +30,18 @@ pub mod migration_center {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::MigrationCenter;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = MigrationCenter;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod migration_center {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::MigrationCenter>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod migration_center {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListAssets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListAssetsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListAssetsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListAssetsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListAssetsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -185,8 +186,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -196,7 +197,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -224,7 +225,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -234,7 +235,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetAssetRequest::name].
@@ -253,8 +254,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -264,7 +265,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::UpdateAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -292,7 +293,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -302,7 +303,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .update_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateAssetRequest::update_mask].
@@ -357,8 +358,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -368,7 +369,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::BatchUpdateAssets;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -399,7 +400,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -409,7 +410,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .batch_update_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchUpdateAssetsRequest::parent].
@@ -435,8 +436,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchUpdateAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchUpdateAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -446,7 +447,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteAsset;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -474,7 +475,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -484,7 +485,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_asset(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteAssetRequest::name].
@@ -503,8 +504,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteAsset {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteAsset {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -514,7 +515,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::BatchDeleteAssets;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -545,7 +546,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -555,7 +556,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .batch_delete_assets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::BatchDeleteAssetsRequest::parent].
@@ -587,8 +588,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for BatchDeleteAssets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for BatchDeleteAssets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -598,7 +599,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ReportAssetFrames;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -629,7 +630,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -639,7 +640,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .report_asset_frames(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::ReportAssetFramesRequest::parent].
@@ -678,8 +679,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReportAssetFrames {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReportAssetFrames {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -689,7 +690,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::AggregateAssetsValues;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -720,7 +721,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -730,7 +731,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .aggregate_assets_values(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::AggregateAssetsValuesRequest::parent].
@@ -760,8 +761,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AggregateAssetsValues {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AggregateAssetsValues {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -771,7 +772,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreateImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -800,7 +801,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -815,7 +816,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_import_job`.
@@ -832,7 +833,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -905,8 +906,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -916,8 +917,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListImportJobs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -948,7 +949,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -958,14 +959,16 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_import_jobs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListImportJobsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListImportJobsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -973,15 +976,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListImportJobsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListImportJobsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1025,8 +1030,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListImportJobs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListImportJobs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1036,7 +1041,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1064,7 +1069,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1074,7 +1079,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetImportJobRequest::name].
@@ -1093,8 +1098,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1104,7 +1109,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1133,7 +1138,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1148,7 +1153,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_import_job`.
@@ -1160,7 +1165,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1209,8 +1214,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1220,7 +1225,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::UpdateImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1249,7 +1254,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1264,7 +1269,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .update_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_import_job`.
@@ -1281,7 +1286,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1360,8 +1365,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1371,7 +1376,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ValidateImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1403,7 +1408,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1418,7 +1423,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .validate_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `validate_import_job`.
@@ -1430,7 +1435,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1473,8 +1478,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1484,7 +1489,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::RunImportJob;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1513,7 +1518,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1528,7 +1533,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .run_import_job(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `run_import_job`.
@@ -1540,7 +1545,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1583,8 +1588,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RunImportJob {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RunImportJob {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1594,7 +1599,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetImportDataFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1625,7 +1630,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1635,7 +1640,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_import_data_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetImportDataFileRequest::name].
@@ -1648,8 +1653,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetImportDataFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetImportDataFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1659,8 +1664,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListImportDataFiles;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1694,7 +1699,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1704,14 +1709,16 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_import_data_files(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListImportDataFilesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListImportDataFilesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1719,17 +1726,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListImportDataFilesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1767,8 +1774,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListImportDataFiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListImportDataFiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1778,7 +1785,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreateImportDataFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1810,7 +1817,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1825,7 +1832,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_import_data_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_import_data_file`.
@@ -1842,7 +1849,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1915,8 +1922,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateImportDataFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateImportDataFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1926,7 +1933,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteImportDataFile;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1958,7 +1965,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1973,7 +1980,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_import_data_file(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_import_data_file`.
@@ -1985,7 +1992,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2028,8 +2035,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteImportDataFile {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteImportDataFile {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2039,8 +2046,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2071,7 +2078,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2081,13 +2088,13 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGroupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListGroupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2096,15 +2103,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGroupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGroupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2142,8 +2151,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2153,7 +2162,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2181,7 +2190,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2191,7 +2200,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGroupRequest::name].
@@ -2204,8 +2213,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2215,7 +2224,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreateGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2244,7 +2253,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2259,7 +2268,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_group`.
@@ -2276,7 +2285,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2349,8 +2358,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2360,7 +2369,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::UpdateGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2389,7 +2398,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2404,7 +2413,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .update_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_group`.
@@ -2421,7 +2430,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2500,8 +2509,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2511,7 +2520,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2540,7 +2549,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2555,7 +2564,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_group`.
@@ -2567,7 +2576,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2610,8 +2619,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2621,7 +2630,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::AddAssetsToGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2653,7 +2662,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2668,7 +2677,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .add_assets_to_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `add_assets_to_group`.
@@ -2685,7 +2694,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2756,8 +2765,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AddAssetsToGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AddAssetsToGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2767,7 +2776,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::RemoveAssetsFromGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2799,7 +2808,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2814,7 +2823,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .remove_assets_from_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `remove_assets_from_group`.
@@ -2831,7 +2840,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2902,8 +2911,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RemoveAssetsFromGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RemoveAssetsFromGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2913,8 +2922,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListErrorFrames;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2945,7 +2954,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2955,14 +2964,16 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_error_frames(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListErrorFramesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListErrorFramesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2970,15 +2981,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListErrorFramesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListErrorFramesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3010,8 +3023,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListErrorFrames {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListErrorFrames {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3021,7 +3034,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetErrorFrame;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3049,7 +3062,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3059,7 +3072,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_error_frame(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetErrorFrameRequest::name].
@@ -3078,8 +3091,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetErrorFrame {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetErrorFrame {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3089,8 +3102,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListSources;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3121,7 +3134,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3131,13 +3144,13 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_sources(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSourcesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSourcesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3146,15 +3159,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSourcesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSourcesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3192,8 +3207,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSources {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSources {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3203,7 +3218,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3231,7 +3246,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3241,7 +3256,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSourceRequest::name].
@@ -3254,8 +3269,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3265,7 +3280,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreateSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3294,7 +3309,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3309,7 +3324,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_source`.
@@ -3326,7 +3341,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3399,8 +3414,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3410,7 +3425,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::UpdateSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3439,7 +3454,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3454,7 +3469,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .update_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_source`.
@@ -3471,7 +3486,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3550,8 +3565,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3561,7 +3576,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteSource;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3590,7 +3605,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3605,7 +3620,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_source(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_source`.
@@ -3617,7 +3632,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3660,8 +3675,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSource {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSource {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3671,8 +3686,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListPreferenceSets;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3706,7 +3721,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3716,14 +3731,16 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_preference_sets(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPreferenceSetsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPreferenceSetsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3731,17 +3748,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPreferenceSetsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3773,8 +3790,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPreferenceSets {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPreferenceSets {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3784,7 +3801,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetPreferenceSet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3815,7 +3832,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3825,7 +3842,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_preference_set(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPreferenceSetRequest::name].
@@ -3838,8 +3855,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPreferenceSet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPreferenceSet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3849,7 +3866,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreatePreferenceSet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3881,7 +3898,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3896,7 +3913,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_preference_set(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_preference_set`.
@@ -3913,7 +3930,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3986,8 +4003,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePreferenceSet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePreferenceSet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3997,7 +4014,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::UpdatePreferenceSet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4029,7 +4046,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4044,7 +4061,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .update_preference_set(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_preference_set`.
@@ -4061,7 +4078,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4140,8 +4157,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdatePreferenceSet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdatePreferenceSet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4151,7 +4168,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeletePreferenceSet;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4183,7 +4200,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4198,7 +4215,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_preference_set(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_preference_set`.
@@ -4210,7 +4227,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4253,8 +4270,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePreferenceSet {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePreferenceSet {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4264,7 +4281,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4292,7 +4309,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4302,7 +4319,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSettingsRequest::name].
@@ -4315,8 +4332,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4326,7 +4343,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::UpdateSettings;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4355,7 +4372,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4370,7 +4387,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .update_settings(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_settings`.
@@ -4387,7 +4404,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4466,8 +4483,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSettings {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSettings {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4477,7 +4494,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreateReportConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4509,7 +4526,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4524,7 +4541,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_report_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_report_config`.
@@ -4541,7 +4558,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4614,8 +4631,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReportConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReportConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4625,7 +4642,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetReportConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4653,7 +4670,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4663,7 +4680,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_report_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReportConfigRequest::name].
@@ -4676,8 +4693,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReportConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReportConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4687,8 +4704,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListReportConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4722,7 +4739,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4732,14 +4749,16 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_report_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReportConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReportConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4747,15 +4766,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListReportConfigsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListReportConfigsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4793,8 +4814,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReportConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReportConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4804,7 +4825,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteReportConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4836,7 +4857,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4851,7 +4872,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_report_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_report_config`.
@@ -4863,7 +4884,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4912,8 +4933,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReportConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReportConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4923,7 +4944,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CreateReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4952,7 +4973,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4967,7 +4988,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .create_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_report`.
@@ -4984,7 +5005,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5057,8 +5078,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5068,7 +5089,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5096,7 +5117,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5106,7 +5127,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReportRequest::name].
@@ -5125,8 +5146,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5136,8 +5157,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListReports;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5168,7 +5189,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5178,13 +5199,13 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_reports(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReportsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListReportsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5193,15 +5214,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListReportsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListReportsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5245,8 +5268,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReports {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReports {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5256,7 +5279,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteReport;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5285,7 +5308,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5300,7 +5323,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_report(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_report`.
@@ -5312,7 +5335,7 @@ pub mod migration_center {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5355,8 +5378,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReport {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReport {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5366,8 +5389,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5401,7 +5424,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5411,15 +5434,15 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5428,17 +5451,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5468,8 +5491,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5479,7 +5502,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5510,7 +5533,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5520,7 +5543,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -5531,8 +5554,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5542,8 +5565,8 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5579,7 +5602,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5589,15 +5612,15 @@ pub mod migration_center {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5606,17 +5629,17 @@ pub mod migration_center {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5652,8 +5675,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5663,7 +5686,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5694,7 +5717,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5704,7 +5727,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5715,8 +5738,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5726,7 +5749,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5759,7 +5782,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5769,7 +5792,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5780,8 +5803,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5791,7 +5814,7 @@ pub mod migration_center {
     /// # Example
     /// ```
     /// # use google_cloud_migrationcenter_v1::builder::migration_center::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_migrationcenter_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5824,7 +5847,7 @@ pub mod migration_center {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5834,7 +5857,7 @@ pub mod migration_center {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5845,8 +5868,8 @@ pub mod migration_center {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/migrationcenter/v1/src/client.rs b/src/generated/cloud/migrationcenter/v1/src/client.rs
index b7580ad207..106b30830b 100644
--- a/src/generated/cloud/migrationcenter/v1/src/client.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_migrationcenter_v1::client::MigrationCenter;
 /// let client = MigrationCenter::builder().build().await?;
 /// // use `client` to make requests to the Migration Center API.
@@ -66,15 +66,13 @@ impl MigrationCenter {
     /// Returns a builder for [MigrationCenter].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_migrationcenter_v1::client::MigrationCenter;
     /// let client = MigrationCenter::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::migration_center::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::migration_center::client::Factory,
-        )
+        crate::new_client_builder(super::builder::migration_center::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,15 +90,14 @@ impl MigrationCenter {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::MigrationCenter>>
-    {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::MigrationCenter>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -109,13 +106,13 @@ impl MigrationCenter {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MigrationCenter> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MigrationCenter> {
         super::transport::MigrationCenter::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::MigrationCenter> {
+    ) -> crate::ClientBuilderResult<impl super::stub::MigrationCenter> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::MigrationCenter::new)
diff --git a/src/generated/cloud/migrationcenter/v1/src/lib.rs b/src/generated/cloud/migrationcenter/v1/src/lib.rs
index b5a92ee720..2c3053463e 100644
--- a/src/generated/cloud/migrationcenter/v1/src/lib.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/migrationcenter/v1/src/model.rs b/src/generated/cloud/migrationcenter/v1/src/model.rs
index 7c80a9af30..8af3557d71 100644
--- a/src/generated/cloud/migrationcenter/v1/src/model.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -3277,7 +3277,7 @@ impl wkt::message::Message for ListAssetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListAssetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListAssetsResponse {
     type PageItem = crate::model::Asset;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4231,7 +4231,7 @@ impl wkt::message::Message for ListImportJobsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListImportJobsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListImportJobsResponse {
     type PageItem = crate::model::ImportJob;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4835,7 +4835,7 @@ impl wkt::message::Message for ListImportDataFilesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListImportDataFilesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListImportDataFilesResponse {
     type PageItem = crate::model::ImportDataFile;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5199,7 +5199,7 @@ impl wkt::message::Message for ListGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGroupsResponse {
     type PageItem = crate::model::Group;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5945,7 +5945,7 @@ impl wkt::message::Message for ListErrorFramesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListErrorFramesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListErrorFramesResponse {
     type PageItem = crate::model::ErrorFrame;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6186,7 +6186,7 @@ impl wkt::message::Message for ListSourcesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSourcesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSourcesResponse {
     type PageItem = crate::model::Source;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6694,7 +6694,7 @@ impl wkt::message::Message for ListPreferenceSetsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPreferenceSetsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPreferenceSetsResponse {
     type PageItem = crate::model::PreferenceSet;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7644,7 +7644,7 @@ impl wkt::message::Message for ListReportsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReportsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReportsResponse {
     type PageItem = crate::model::Report;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7927,7 +7927,7 @@ impl wkt::message::Message for ListReportConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReportConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReportConfigsResponse {
     type PageItem = crate::model::ReportConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/migrationcenter/v1/src/stub.rs b/src/generated/cloud/migrationcenter/v1/src/stub.rs
index af1f20baf8..986fcd9930 100644
--- a/src/generated/cloud/migrationcenter/v1/src/stub.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_assets(
         &self,
         _req: crate::model::ListAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListAssetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListAssetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_asset(
         &self,
         _req: crate::model::GetAssetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Asset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Asset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +63,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn update_asset(
         &self,
         _req: crate::model::UpdateAssetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Asset>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Asset>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +73,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn batch_update_assets(
         &self,
         _req: crate::model::BatchUpdateAssetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BatchUpdateAssetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::BatchUpdateAssetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,8 +84,8 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_asset(
         &self,
         _req: crate::model::DeleteAssetRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,8 +93,8 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn batch_delete_assets(
         &self,
         _req: crate::model::BatchDeleteAssetsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -104,9 +102,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn report_asset_frames(
         &self,
         _req: crate::model::ReportAssetFramesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReportAssetFramesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ReportAssetFramesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -115,11 +113,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn aggregate_assets_values(
         &self,
         _req: crate::model::AggregateAssetsValuesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::AggregateAssetsValuesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::AggregateAssetsValuesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,9 +124,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_import_job(
         &self,
         _req: crate::model::CreateImportJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -139,9 +135,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_import_jobs(
         &self,
         _req: crate::model::ListImportJobsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListImportJobsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListImportJobsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -150,10 +146,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_import_job(
         &self,
         _req: crate::model::GetImportJobRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImportJob>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ImportJob>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -161,9 +156,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_import_job(
         &self,
         _req: crate::model::DeleteImportJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -172,9 +167,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn update_import_job(
         &self,
         _req: crate::model::UpdateImportJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -183,9 +178,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn validate_import_job(
         &self,
         _req: crate::model::ValidateImportJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -194,9 +189,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn run_import_job(
         &self,
         _req: crate::model::RunImportJobRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -205,9 +200,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_import_data_file(
         &self,
         _req: crate::model::GetImportDataFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ImportDataFile>>,
+        Output = crate::Result<crate::Response<crate::model::ImportDataFile>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -216,9 +211,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_import_data_files(
         &self,
         _req: crate::model::ListImportDataFilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListImportDataFilesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListImportDataFilesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -227,9 +222,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_import_data_file(
         &self,
         _req: crate::model::CreateImportDataFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -238,9 +233,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_import_data_file(
         &self,
         _req: crate::model::DeleteImportDataFileRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -249,9 +244,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_groups(
         &self,
         _req: crate::model::ListGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -260,10 +255,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_group(
         &self,
         _req: crate::model::GetGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Group>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Group>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -271,9 +265,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_group(
         &self,
         _req: crate::model::CreateGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -282,9 +276,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn update_group(
         &self,
         _req: crate::model::UpdateGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -293,9 +287,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_group(
         &self,
         _req: crate::model::DeleteGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -304,9 +298,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn add_assets_to_group(
         &self,
         _req: crate::model::AddAssetsToGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -315,9 +309,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn remove_assets_from_group(
         &self,
         _req: crate::model::RemoveAssetsFromGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -326,9 +320,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_error_frames(
         &self,
         _req: crate::model::ListErrorFramesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListErrorFramesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListErrorFramesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -337,10 +331,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_error_frame(
         &self,
         _req: crate::model::GetErrorFrameRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ErrorFrame>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::ErrorFrame>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -348,9 +341,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_sources(
         &self,
         _req: crate::model::ListSourcesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSourcesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSourcesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -359,10 +352,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_source(
         &self,
         _req: crate::model::GetSourceRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Source>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Source>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -370,9 +362,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_source(
         &self,
         _req: crate::model::CreateSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -381,9 +373,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn update_source(
         &self,
         _req: crate::model::UpdateSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -392,9 +384,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_source(
         &self,
         _req: crate::model::DeleteSourceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -403,9 +395,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_preference_sets(
         &self,
         _req: crate::model::ListPreferenceSetsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListPreferenceSetsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListPreferenceSetsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -414,9 +406,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_preference_set(
         &self,
         _req: crate::model::GetPreferenceSetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PreferenceSet>>,
+        Output = crate::Result<crate::Response<crate::model::PreferenceSet>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -425,9 +417,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_preference_set(
         &self,
         _req: crate::model::CreatePreferenceSetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -436,9 +428,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn update_preference_set(
         &self,
         _req: crate::model::UpdatePreferenceSetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -447,9 +439,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_preference_set(
         &self,
         _req: crate::model::DeletePreferenceSetRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -458,10 +450,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_settings(
         &self,
         _req: crate::model::GetSettingsRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Settings>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Settings>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -469,9 +460,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn update_settings(
         &self,
         _req: crate::model::UpdateSettingsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -480,9 +471,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_report_config(
         &self,
         _req: crate::model::CreateReportConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -491,9 +482,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_report_config(
         &self,
         _req: crate::model::GetReportConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ReportConfig>>,
+        Output = crate::Result<crate::Response<crate::model::ReportConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -502,9 +493,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_report_configs(
         &self,
         _req: crate::model::ListReportConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReportConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReportConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -513,9 +504,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_report_config(
         &self,
         _req: crate::model::DeleteReportConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -524,9 +515,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn create_report(
         &self,
         _req: crate::model::CreateReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -535,10 +526,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_report(
         &self,
         _req: crate::model::GetReportRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Report>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Report>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -546,9 +536,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_reports(
         &self,
         _req: crate::model::ListReportsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReportsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReportsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -557,9 +547,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_report(
         &self,
         _req: crate::model::DeleteReportRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -568,10 +558,10 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -581,9 +571,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -592,10 +582,10 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -605,9 +595,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -616,8 +606,8 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -625,8 +615,8 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -636,9 +626,9 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -647,8 +637,8 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/migrationcenter/v1/src/stub/dynamic.rs b/src/generated/cloud/migrationcenter/v1/src/stub/dynamic.rs
index e526c08276..ddf3d88ec5 100644
--- a/src/generated/cloud/migrationcenter/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/stub/dynamic.rs
@@ -20,338 +20,336 @@ pub trait MigrationCenter: std::fmt::Debug + Send + Sync {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssetsResponse>>;
 
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Asset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Asset>>;
 
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Asset>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Asset>>;
 
     async fn batch_update_assets(
         &self,
         req: crate::model::BatchUpdateAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchUpdateAssetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchUpdateAssetsResponse>>;
 
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn batch_delete_assets(
         &self,
         req: crate::model::BatchDeleteAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn report_asset_frames(
         &self,
         req: crate::model::ReportAssetFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportAssetFramesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportAssetFramesResponse>>;
 
     async fn aggregate_assets_values(
         &self,
         req: crate::model::AggregateAssetsValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AggregateAssetsValuesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AggregateAssetsValuesResponse>>;
 
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListImportJobsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListImportJobsResponse>>;
 
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportJob>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportJob>>;
 
     async fn delete_import_job(
         &self,
         req: crate::model::DeleteImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_import_job(
         &self,
         req: crate::model::UpdateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn validate_import_job(
         &self,
         req: crate::model::ValidateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn run_import_job(
         &self,
         req: crate::model::RunImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_import_data_file(
         &self,
         req: crate::model::GetImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportDataFile>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportDataFile>>;
 
     async fn list_import_data_files(
         &self,
         req: crate::model::ListImportDataFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListImportDataFilesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListImportDataFilesResponse>>;
 
     async fn create_import_data_file(
         &self,
         req: crate::model::CreateImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_import_data_file(
         &self,
         req: crate::model::DeleteImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGroupsResponse>>;
 
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Group>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Group>>;
 
     async fn create_group(
         &self,
         req: crate::model::CreateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_group(
         &self,
         req: crate::model::DeleteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn add_assets_to_group(
         &self,
         req: crate::model::AddAssetsToGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn remove_assets_from_group(
         &self,
         req: crate::model::RemoveAssetsFromGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_error_frames(
         &self,
         req: crate::model::ListErrorFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListErrorFramesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListErrorFramesResponse>>;
 
     async fn get_error_frame(
         &self,
         req: crate::model::GetErrorFrameRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ErrorFrame>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ErrorFrame>>;
 
     async fn list_sources(
         &self,
         req: crate::model::ListSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSourcesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSourcesResponse>>;
 
     async fn get_source(
         &self,
         req: crate::model::GetSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Source>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Source>>;
 
     async fn create_source(
         &self,
         req: crate::model::CreateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_source(
         &self,
         req: crate::model::UpdateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_source(
         &self,
         req: crate::model::DeleteSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_preference_sets(
         &self,
         req: crate::model::ListPreferenceSetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPreferenceSetsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPreferenceSetsResponse>>;
 
     async fn get_preference_set(
         &self,
         req: crate::model::GetPreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PreferenceSet>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PreferenceSet>>;
 
     async fn create_preference_set(
         &self,
         req: crate::model::CreatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_preference_set(
         &self,
         req: crate::model::UpdatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_preference_set(
         &self,
         req: crate::model::DeletePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>>;
 
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_report_config(
         &self,
         req: crate::model::CreateReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_report_config(
         &self,
         req: crate::model::GetReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportConfig>>;
 
     async fn list_report_configs(
         &self,
         req: crate::model::ListReportConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReportConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReportConfigsResponse>>;
 
     async fn delete_report_config(
         &self,
         req: crate::model::DeleteReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_report(
         &self,
         req: crate::model::CreateReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_report(
         &self,
         req: crate::model::GetReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Report>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Report>>;
 
     async fn list_reports(
         &self,
         req: crate::model::ListReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReportsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReportsResponse>>;
 
     async fn delete_report(
         &self,
         req: crate::model::DeleteReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::MigrationCenter] also implement [MigrationCenter].
@@ -361,8 +359,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListAssetsResponse>> {
         T::list_assets(self, req, options).await
     }
 
@@ -370,8 +368,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Asset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Asset>> {
         T::get_asset(self, req, options).await
     }
 
@@ -379,8 +377,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Asset>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Asset>> {
         T::update_asset(self, req, options).await
     }
 
@@ -388,8 +386,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn batch_update_assets(
         &self,
         req: crate::model::BatchUpdateAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BatchUpdateAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BatchUpdateAssetsResponse>> {
         T::batch_update_assets(self, req, options).await
     }
 
@@ -397,8 +395,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_asset(self, req, options).await
     }
 
@@ -406,8 +404,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn batch_delete_assets(
         &self,
         req: crate::model::BatchDeleteAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::batch_delete_assets(self, req, options).await
     }
 
@@ -415,8 +413,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn report_asset_frames(
         &self,
         req: crate::model::ReportAssetFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportAssetFramesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportAssetFramesResponse>> {
         T::report_asset_frames(self, req, options).await
     }
 
@@ -424,8 +422,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn aggregate_assets_values(
         &self,
         req: crate::model::AggregateAssetsValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::AggregateAssetsValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::AggregateAssetsValuesResponse>> {
         T::aggregate_assets_values(self, req, options).await
     }
 
@@ -433,8 +431,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_import_job(self, req, options).await
     }
 
@@ -442,8 +440,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListImportJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListImportJobsResponse>> {
         T::list_import_jobs(self, req, options).await
     }
 
@@ -451,8 +449,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportJob>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportJob>> {
         T::get_import_job(self, req, options).await
     }
 
@@ -460,8 +458,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_import_job(
         &self,
         req: crate::model::DeleteImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_import_job(self, req, options).await
     }
 
@@ -469,8 +467,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn update_import_job(
         &self,
         req: crate::model::UpdateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_import_job(self, req, options).await
     }
 
@@ -478,8 +476,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn validate_import_job(
         &self,
         req: crate::model::ValidateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::validate_import_job(self, req, options).await
     }
 
@@ -487,8 +485,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn run_import_job(
         &self,
         req: crate::model::RunImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::run_import_job(self, req, options).await
     }
 
@@ -496,8 +494,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_import_data_file(
         &self,
         req: crate::model::GetImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ImportDataFile>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ImportDataFile>> {
         T::get_import_data_file(self, req, options).await
     }
 
@@ -505,8 +503,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_import_data_files(
         &self,
         req: crate::model::ListImportDataFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListImportDataFilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListImportDataFilesResponse>> {
         T::list_import_data_files(self, req, options).await
     }
 
@@ -514,8 +512,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_import_data_file(
         &self,
         req: crate::model::CreateImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_import_data_file(self, req, options).await
     }
 
@@ -523,8 +521,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_import_data_file(
         &self,
         req: crate::model::DeleteImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_import_data_file(self, req, options).await
     }
 
@@ -532,8 +530,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGroupsResponse>> {
         T::list_groups(self, req, options).await
     }
 
@@ -541,8 +539,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Group>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Group>> {
         T::get_group(self, req, options).await
     }
 
@@ -550,8 +548,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_group(
         &self,
         req: crate::model::CreateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_group(self, req, options).await
     }
 
@@ -559,8 +557,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_group(self, req, options).await
     }
 
@@ -568,8 +566,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_group(
         &self,
         req: crate::model::DeleteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_group(self, req, options).await
     }
 
@@ -577,8 +575,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn add_assets_to_group(
         &self,
         req: crate::model::AddAssetsToGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::add_assets_to_group(self, req, options).await
     }
 
@@ -586,8 +584,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn remove_assets_from_group(
         &self,
         req: crate::model::RemoveAssetsFromGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::remove_assets_from_group(self, req, options).await
     }
 
@@ -595,8 +593,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_error_frames(
         &self,
         req: crate::model::ListErrorFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListErrorFramesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListErrorFramesResponse>> {
         T::list_error_frames(self, req, options).await
     }
 
@@ -604,8 +602,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_error_frame(
         &self,
         req: crate::model::GetErrorFrameRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ErrorFrame>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ErrorFrame>> {
         T::get_error_frame(self, req, options).await
     }
 
@@ -613,8 +611,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_sources(
         &self,
         req: crate::model::ListSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSourcesResponse>> {
         T::list_sources(self, req, options).await
     }
 
@@ -622,8 +620,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_source(
         &self,
         req: crate::model::GetSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Source>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Source>> {
         T::get_source(self, req, options).await
     }
 
@@ -631,8 +629,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_source(
         &self,
         req: crate::model::CreateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_source(self, req, options).await
     }
 
@@ -640,8 +638,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn update_source(
         &self,
         req: crate::model::UpdateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_source(self, req, options).await
     }
 
@@ -649,8 +647,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_source(
         &self,
         req: crate::model::DeleteSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_source(self, req, options).await
     }
 
@@ -658,8 +656,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_preference_sets(
         &self,
         req: crate::model::ListPreferenceSetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPreferenceSetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPreferenceSetsResponse>> {
         T::list_preference_sets(self, req, options).await
     }
 
@@ -667,8 +665,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_preference_set(
         &self,
         req: crate::model::GetPreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PreferenceSet>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PreferenceSet>> {
         T::get_preference_set(self, req, options).await
     }
 
@@ -676,8 +674,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_preference_set(
         &self,
         req: crate::model::CreatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_preference_set(self, req, options).await
     }
 
@@ -685,8 +683,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn update_preference_set(
         &self,
         req: crate::model::UpdatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_preference_set(self, req, options).await
     }
 
@@ -694,8 +692,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_preference_set(
         &self,
         req: crate::model::DeletePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_preference_set(self, req, options).await
     }
 
@@ -703,8 +701,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Settings>> {
         T::get_settings(self, req, options).await
     }
 
@@ -712,8 +710,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_settings(self, req, options).await
     }
 
@@ -721,8 +719,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_report_config(
         &self,
         req: crate::model::CreateReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_report_config(self, req, options).await
     }
 
@@ -730,8 +728,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_report_config(
         &self,
         req: crate::model::GetReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ReportConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ReportConfig>> {
         T::get_report_config(self, req, options).await
     }
 
@@ -739,8 +737,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_report_configs(
         &self,
         req: crate::model::ListReportConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReportConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReportConfigsResponse>> {
         T::list_report_configs(self, req, options).await
     }
 
@@ -748,8 +746,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_report_config(
         &self,
         req: crate::model::DeleteReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_report_config(self, req, options).await
     }
 
@@ -757,8 +755,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn create_report(
         &self,
         req: crate::model::CreateReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_report(self, req, options).await
     }
 
@@ -766,8 +764,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_report(
         &self,
         req: crate::model::GetReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Report>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Report>> {
         T::get_report(self, req, options).await
     }
 
@@ -775,8 +773,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_reports(
         &self,
         req: crate::model::ListReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReportsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReportsResponse>> {
         T::list_reports(self, req, options).await
     }
 
@@ -784,8 +782,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_report(
         &self,
         req: crate::model::DeleteReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_report(self, req, options).await
     }
 
@@ -793,9 +791,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -803,8 +800,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -812,10 +809,9 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -823,8 +819,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -832,8 +828,8 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -841,22 +837,22 @@ impl<T: super::MigrationCenter> MigrationCenter for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/migrationcenter/v1/src/tracing.rs b/src/generated/cloud/migrationcenter/v1/src/tracing.rs
index 7effa695a8..25a911bce5 100644
--- a/src/generated/cloud/migrationcenter/v1/src/tracing.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssetsResponse>> {
         self.inner.list_assets(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Asset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Asset>> {
         self.inner.get_asset(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Asset>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Asset>> {
         self.inner.update_asset(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn batch_update_assets(
         &self,
         req: crate::model::BatchUpdateAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchUpdateAssetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchUpdateAssetsResponse>> {
         self.inner.batch_update_assets(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_asset(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn batch_delete_assets(
         &self,
         req: crate::model::BatchDeleteAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.batch_delete_assets(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn report_asset_frames(
         &self,
         req: crate::model::ReportAssetFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportAssetFramesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportAssetFramesResponse>> {
         self.inner.report_asset_frames(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn aggregate_assets_values(
         &self,
         req: crate::model::AggregateAssetsValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AggregateAssetsValuesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AggregateAssetsValuesResponse>> {
         self.inner.aggregate_assets_values(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_import_job(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListImportJobsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListImportJobsResponse>> {
         self.inner.list_import_jobs(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportJob>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportJob>> {
         self.inner.get_import_job(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn delete_import_job(
         &self,
         req: crate::model::DeleteImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_import_job(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn update_import_job(
         &self,
         req: crate::model::UpdateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_import_job(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn validate_import_job(
         &self,
         req: crate::model::ValidateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.validate_import_job(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn run_import_job(
         &self,
         req: crate::model::RunImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.run_import_job(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn get_import_data_file(
         &self,
         req: crate::model::GetImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportDataFile>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportDataFile>> {
         self.inner.get_import_data_file(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn list_import_data_files(
         &self,
         req: crate::model::ListImportDataFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListImportDataFilesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListImportDataFilesResponse>> {
         self.inner.list_import_data_files(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn create_import_data_file(
         &self,
         req: crate::model::CreateImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_import_data_file(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn delete_import_data_file(
         &self,
         req: crate::model::DeleteImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_import_data_file(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGroupsResponse>> {
         self.inner.list_groups(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Group>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Group>> {
         self.inner.get_group(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn create_group(
         &self,
         req: crate::model::CreateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_group(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_group(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn delete_group(
         &self,
         req: crate::model::DeleteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_group(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn add_assets_to_group(
         &self,
         req: crate::model::AddAssetsToGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.add_assets_to_group(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn remove_assets_from_group(
         &self,
         req: crate::model::RemoveAssetsFromGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.remove_assets_from_group(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn list_error_frames(
         &self,
         req: crate::model::ListErrorFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListErrorFramesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListErrorFramesResponse>> {
         self.inner.list_error_frames(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn get_error_frame(
         &self,
         req: crate::model::GetErrorFrameRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ErrorFrame>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ErrorFrame>> {
         self.inner.get_error_frame(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn list_sources(
         &self,
         req: crate::model::ListSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSourcesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSourcesResponse>> {
         self.inner.list_sources(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn get_source(
         &self,
         req: crate::model::GetSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Source>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Source>> {
         self.inner.get_source(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn create_source(
         &self,
         req: crate::model::CreateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_source(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn update_source(
         &self,
         req: crate::model::UpdateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_source(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn delete_source(
         &self,
         req: crate::model::DeleteSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_source(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn list_preference_sets(
         &self,
         req: crate::model::ListPreferenceSetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPreferenceSetsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPreferenceSetsResponse>> {
         self.inner.list_preference_sets(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn get_preference_set(
         &self,
         req: crate::model::GetPreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PreferenceSet>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PreferenceSet>> {
         self.inner.get_preference_set(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn create_preference_set(
         &self,
         req: crate::model::CreatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_preference_set(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn update_preference_set(
         &self,
         req: crate::model::UpdatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_preference_set(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn delete_preference_set(
         &self,
         req: crate::model::DeletePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_preference_set(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         self.inner.get_settings(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_settings(req, options).await
     }
 
@@ -401,8 +401,8 @@ where
     async fn create_report_config(
         &self,
         req: crate::model::CreateReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_report_config(req, options).await
     }
 
@@ -410,8 +410,8 @@ where
     async fn get_report_config(
         &self,
         req: crate::model::GetReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportConfig>> {
         self.inner.get_report_config(req, options).await
     }
 
@@ -419,8 +419,8 @@ where
     async fn list_report_configs(
         &self,
         req: crate::model::ListReportConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReportConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReportConfigsResponse>> {
         self.inner.list_report_configs(req, options).await
     }
 
@@ -428,8 +428,8 @@ where
     async fn delete_report_config(
         &self,
         req: crate::model::DeleteReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_report_config(req, options).await
     }
 
@@ -437,8 +437,8 @@ where
     async fn create_report(
         &self,
         req: crate::model::CreateReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_report(req, options).await
     }
 
@@ -446,8 +446,8 @@ where
     async fn get_report(
         &self,
         req: crate::model::GetReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Report>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Report>> {
         self.inner.get_report(req, options).await
     }
 
@@ -455,8 +455,8 @@ where
     async fn list_reports(
         &self,
         req: crate::model::ListReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReportsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReportsResponse>> {
         self.inner.list_reports(req, options).await
     }
 
@@ -464,8 +464,8 @@ where
     async fn delete_report(
         &self,
         req: crate::model::DeleteReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_report(req, options).await
     }
 
@@ -473,8 +473,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -482,8 +482,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -491,9 +491,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -501,8 +500,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -510,8 +509,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -519,22 +518,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/migrationcenter/v1/src/transport.rs b/src/generated/cloud/migrationcenter/v1/src/transport.rs
index fb73e72948..9608802d6f 100644
--- a/src/generated/cloud/migrationcenter/v1/src/transport.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [MigrationCenter](super::stub::MigrationCenter) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for MigrationCenter {
 }
 
 impl MigrationCenter {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_assets(
         &self,
         req: crate::model::ListAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListAssetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListAssetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -91,9 +91,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -108,13 +108,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_asset(
         &self,
         req: crate::model::GetAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Asset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Asset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -156,9 +156,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -173,13 +173,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn update_asset(
         &self,
         req: crate::model::UpdateAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Asset>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Asset>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -239,9 +239,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -256,13 +256,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn batch_update_assets(
         &self,
         req: crate::model::BatchUpdateAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BatchUpdateAssetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BatchUpdateAssetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_asset(
         &self,
         req: crate::model::DeleteAssetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -375,24 +375,25 @@ impl super::stub::MigrationCenter for MigrationCenter {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn batch_delete_assets(
         &self,
         req: crate::model::BatchDeleteAssetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -429,9 +430,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -440,24 +441,25 @@ impl super::stub::MigrationCenter for MigrationCenter {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn report_asset_frames(
         &self,
         req: crate::model::ReportAssetFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportAssetFramesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportAssetFramesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -495,9 +497,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -512,13 +514,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn aggregate_assets_values(
         &self,
         req: crate::model::AggregateAssetsValuesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::AggregateAssetsValuesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::AggregateAssetsValuesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -555,9 +557,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -572,13 +574,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_import_job(
         &self,
         req: crate::model::CreateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -617,9 +619,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -634,13 +636,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_import_jobs(
         &self,
         req: crate::model::ListImportJobsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListImportJobsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListImportJobsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -682,9 +684,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -699,13 +701,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_import_job(
         &self,
         req: crate::model::GetImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportJob>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportJob>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -747,9 +749,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -764,13 +766,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_import_job(
         &self,
         req: crate::model::DeleteImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -813,9 +815,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -830,13 +832,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn update_import_job(
         &self,
         req: crate::model::UpdateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -896,9 +898,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -913,13 +915,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn validate_import_job(
         &self,
         req: crate::model::ValidateImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -960,9 +962,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -977,13 +979,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn run_import_job(
         &self,
         req: crate::model::RunImportJobRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1024,9 +1026,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1041,13 +1043,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_import_data_file(
         &self,
         req: crate::model::GetImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ImportDataFile>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ImportDataFile>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1092,9 +1094,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1109,13 +1111,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_import_data_files(
         &self,
         req: crate::model::ListImportDataFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListImportDataFilesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListImportDataFilesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1160,9 +1162,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1177,13 +1179,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_import_data_file(
         &self,
         req: crate::model::CreateImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1226,9 +1228,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1243,13 +1245,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_import_data_file(
         &self,
         req: crate::model::DeleteImportDataFileRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1295,9 +1297,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1312,13 +1314,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1359,9 +1361,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1376,13 +1378,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Group>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Group>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1423,9 +1425,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1440,13 +1442,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_group(
         &self,
         req: crate::model::CreateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1485,9 +1487,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1502,13 +1504,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1568,9 +1570,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1585,13 +1587,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_group(
         &self,
         req: crate::model::DeleteGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1633,9 +1635,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1650,13 +1652,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn add_assets_to_group(
         &self,
         req: crate::model::AddAssetsToGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1697,9 +1699,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1714,13 +1716,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn remove_assets_from_group(
         &self,
         req: crate::model::RemoveAssetsFromGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1761,9 +1763,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1778,13 +1780,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_error_frames(
         &self,
         req: crate::model::ListErrorFramesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListErrorFramesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListErrorFramesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1828,9 +1830,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1845,13 +1847,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_error_frame(
         &self,
         req: crate::model::GetErrorFrameRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ErrorFrame>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ErrorFrame>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1897,9 +1899,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1914,13 +1916,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_sources(
         &self,
         req: crate::model::ListSourcesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSourcesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSourcesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1961,9 +1963,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1978,13 +1980,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_source(
         &self,
         req: crate::model::GetSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Source>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Source>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2025,9 +2027,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2042,13 +2044,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_source(
         &self,
         req: crate::model::CreateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2087,9 +2089,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2104,13 +2106,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn update_source(
         &self,
         req: crate::model::UpdateSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2170,9 +2172,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2187,13 +2189,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_source(
         &self,
         req: crate::model::DeleteSourceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2235,9 +2237,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2252,13 +2254,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_preference_sets(
         &self,
         req: crate::model::ListPreferenceSetsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPreferenceSetsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPreferenceSetsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2298,9 +2300,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2315,13 +2317,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_preference_set(
         &self,
         req: crate::model::GetPreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PreferenceSet>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PreferenceSet>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2362,9 +2364,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2379,13 +2381,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_preference_set(
         &self,
         req: crate::model::CreatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2424,9 +2426,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2441,13 +2443,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn update_preference_set(
         &self,
         req: crate::model::UpdatePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2507,9 +2509,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2524,13 +2526,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_preference_set(
         &self,
         req: crate::model::DeletePreferenceSetRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2572,9 +2574,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2589,13 +2591,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_settings(
         &self,
         req: crate::model::GetSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Settings>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Settings>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2634,9 +2636,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2651,13 +2653,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn update_settings(
         &self,
         req: crate::model::UpdateSettingsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2715,9 +2717,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2732,13 +2734,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_report_config(
         &self,
         req: crate::model::CreateReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2777,9 +2779,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2794,13 +2796,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_report_config(
         &self,
         req: crate::model::GetReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ReportConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ReportConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2841,9 +2843,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2858,13 +2860,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_report_configs(
         &self,
         req: crate::model::ListReportConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReportConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReportConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2905,9 +2907,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2922,13 +2924,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_report_config(
         &self,
         req: crate::model::DeleteReportConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2971,9 +2973,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2988,13 +2990,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn create_report(
         &self,
         req: crate::model::CreateReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3037,9 +3039,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3054,13 +3056,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_report(
         &self,
         req: crate::model::GetReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Report>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Report>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3106,9 +3108,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3123,13 +3125,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_reports(
         &self,
         req: crate::model::ListReportsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReportsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReportsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3175,9 +3177,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3192,13 +3194,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_report(
         &self,
         req: crate::model::DeleteReportRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3244,9 +3246,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3261,13 +3263,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3297,9 +3299,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3314,13 +3316,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3357,9 +3359,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3374,14 +3376,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3423,9 +3424,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3440,13 +3441,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3487,9 +3488,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3504,13 +3505,13 @@ impl super::stub::MigrationCenter for MigrationCenter {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3551,9 +3552,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3562,24 +3563,25 @@ impl super::stub::MigrationCenter for MigrationCenter {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3620,9 +3622,9 @@ impl super::stub::MigrationCenter for MigrationCenter {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3631,25 +3633,26 @@ impl super::stub::MigrationCenter for MigrationCenter {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/modelarmor/v1/Cargo.toml b/src/generated/cloud/modelarmor/v1/Cargo.toml
index 1d7aa6c52b..229a317536 100644
--- a/src/generated/cloud/modelarmor/v1/Cargo.toml
+++ b/src/generated/cloud/modelarmor/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace           = true
 bytes.workspace                 = true
-gax.workspace                   = true
 gaxi                            = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace      = true
 google-cloud-location.workspace = true
 lazy_static.workspace           = true
 serde.workspace                 = true
diff --git a/src/generated/cloud/modelarmor/v1/src/builder.rs b/src/generated/cloud/modelarmor/v1/src/builder.rs
index 7b6d009366..8f1211c9d0 100644
--- a/src/generated/cloud/modelarmor/v1/src/builder.rs
+++ b/src/generated/cloud/modelarmor/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod model_armor {
     /// A builder for [ModelArmor][crate::client::ModelArmor].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_modelarmor_v1::*;
     /// # use builder::model_armor::ClientBuilder;
     /// # use client::ModelArmor;
@@ -30,19 +30,18 @@ pub mod model_armor {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::ModelArmor;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = ModelArmor;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod model_armor {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::ModelArmor>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod model_armor {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::ListTemplates;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -108,7 +107,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -118,13 +117,13 @@ pub mod model_armor {
             (*self.0.stub)
                 .list_templates(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListTemplatesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListTemplatesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -133,15 +132,17 @@ pub mod model_armor {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListTemplatesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListTemplatesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -179,8 +180,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListTemplates {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListTemplates {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -190,7 +191,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::GetTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -218,7 +219,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -228,7 +229,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .get_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetTemplateRequest::name].
@@ -241,8 +242,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -252,7 +253,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::CreateTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -280,7 +281,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -290,7 +291,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .create_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [parent][crate::model::CreateTemplateRequest::parent].
@@ -339,8 +340,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -350,7 +351,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::UpdateTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -378,7 +379,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -388,7 +389,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .update_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [update_mask][crate::model::UpdateTemplateRequest::update_mask].
@@ -443,8 +444,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -454,7 +455,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::DeleteTemplate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -482,7 +483,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -492,7 +493,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .delete_template(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::DeleteTemplateRequest::name].
@@ -511,8 +512,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteTemplate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteTemplate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -522,7 +523,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::GetFloorSetting;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -550,7 +551,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -560,7 +561,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .get_floor_setting(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetFloorSettingRequest::name].
@@ -573,8 +574,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetFloorSetting {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetFloorSetting {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -584,7 +585,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::UpdateFloorSetting;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -615,7 +616,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -625,7 +626,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .update_floor_setting(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [floor_setting][crate::model::UpdateFloorSettingRequest::floor_setting].
@@ -670,8 +671,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateFloorSetting {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateFloorSetting {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -681,7 +682,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::SanitizeUserPrompt;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -712,7 +713,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -722,7 +723,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .sanitize_user_prompt(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::SanitizeUserPromptRequest::name].
@@ -778,8 +779,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SanitizeUserPrompt {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SanitizeUserPrompt {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -789,7 +790,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::SanitizeModelResponse;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -820,7 +821,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -830,7 +831,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .sanitize_model_response(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::SanitizeModelResponseRequest::name].
@@ -892,8 +893,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SanitizeModelResponse {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SanitizeModelResponse {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -903,8 +904,8 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -938,7 +939,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -948,15 +949,15 @@ pub mod model_armor {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -965,17 +966,17 @@ pub mod model_armor {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1005,8 +1006,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1016,7 +1017,7 @@ pub mod model_armor {
     /// # Example
     /// ```
     /// # use google_cloud_modelarmor_v1::builder::model_armor::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_modelarmor_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1047,7 +1048,7 @@ pub mod model_armor {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1057,7 +1058,7 @@ pub mod model_armor {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -1068,8 +1069,8 @@ pub mod model_armor {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/modelarmor/v1/src/client.rs b/src/generated/cloud/modelarmor/v1/src/client.rs
index 40001628a6..773ba2a6c7 100644
--- a/src/generated/cloud/modelarmor/v1/src/client.rs
+++ b/src/generated/cloud/modelarmor/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_modelarmor_v1::client::ModelArmor;
 /// let client = ModelArmor::builder().build().await?;
 /// // use `client` to make requests to the Model Armor API.
@@ -66,13 +66,13 @@ impl ModelArmor {
     /// Returns a builder for [ModelArmor].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_modelarmor_v1::client::ModelArmor;
     /// let client = ModelArmor::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::model_armor::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::model_armor::client::Factory)
+        crate::new_client_builder(super::builder::model_armor::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl ModelArmor {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::ModelArmor>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::ModelArmor>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl ModelArmor {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelArmor> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelArmor> {
         super::transport::ModelArmor::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::ModelArmor> {
+    ) -> crate::ClientBuilderResult<impl super::stub::ModelArmor> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::ModelArmor::new)
diff --git a/src/generated/cloud/modelarmor/v1/src/lib.rs b/src/generated/cloud/modelarmor/v1/src/lib.rs
index f6a75fc092..7adf4f87af 100644
--- a/src/generated/cloud/modelarmor/v1/src/lib.rs
+++ b/src/generated/cloud/modelarmor/v1/src/lib.rs
@@ -44,8 +44,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -80,3 +80,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/modelarmor/v1/src/model.rs b/src/generated/cloud/modelarmor/v1/src/model.rs
index de25cb196f..5f60b88a4b 100644
--- a/src/generated/cloud/modelarmor/v1/src/model.rs
+++ b/src/generated/cloud/modelarmor/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate lazy_static;
 extern crate serde;
@@ -1464,7 +1464,7 @@ impl wkt::message::Message for ListTemplatesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListTemplatesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListTemplatesResponse {
     type PageItem = crate::model::Template;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/modelarmor/v1/src/stub.rs b/src/generated/cloud/modelarmor/v1/src/stub.rs
index 84c0c30bbc..8537e6187e 100644
--- a/src/generated/cloud/modelarmor/v1/src/stub.rs
+++ b/src/generated/cloud/modelarmor/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn list_templates(
         &self,
         _req: crate::model::ListTemplatesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListTemplatesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListTemplatesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,10 +53,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn get_template(
         &self,
         _req: crate::model::GetTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Template>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Template>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -64,10 +63,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn create_template(
         &self,
         _req: crate::model::CreateTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Template>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Template>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,10 +73,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn update_template(
         &self,
         _req: crate::model::UpdateTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Template>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Template>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -86,8 +83,8 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn delete_template(
         &self,
         _req: crate::model::DeleteTemplateRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -95,9 +92,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn get_floor_setting(
         &self,
         _req: crate::model::GetFloorSettingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FloorSetting>>,
+        Output = crate::Result<crate::Response<crate::model::FloorSetting>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -106,9 +103,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn update_floor_setting(
         &self,
         _req: crate::model::UpdateFloorSettingRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::FloorSetting>>,
+        Output = crate::Result<crate::Response<crate::model::FloorSetting>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -117,9 +114,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn sanitize_user_prompt(
         &self,
         _req: crate::model::SanitizeUserPromptRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::SanitizeUserPromptResponse>>,
+        Output = crate::Result<crate::Response<crate::model::SanitizeUserPromptResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -128,11 +125,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn sanitize_model_response(
         &self,
         _req: crate::model::SanitizeModelResponseRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::SanitizeModelResponseResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::SanitizeModelResponseResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -141,10 +136,10 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -154,9 +149,9 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
diff --git a/src/generated/cloud/modelarmor/v1/src/stub/dynamic.rs b/src/generated/cloud/modelarmor/v1/src/stub/dynamic.rs
index ce96c07f8a..267fc5b9e5 100644
--- a/src/generated/cloud/modelarmor/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/modelarmor/v1/src/stub/dynamic.rs
@@ -20,68 +20,68 @@ pub trait ModelArmor: std::fmt::Debug + Send + Sync {
     async fn list_templates(
         &self,
         req: crate::model::ListTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTemplatesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTemplatesResponse>>;
 
     async fn get_template(
         &self,
         req: crate::model::GetTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Template>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Template>>;
 
     async fn create_template(
         &self,
         req: crate::model::CreateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Template>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Template>>;
 
     async fn update_template(
         &self,
         req: crate::model::UpdateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Template>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Template>>;
 
     async fn delete_template(
         &self,
         req: crate::model::DeleteTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn get_floor_setting(
         &self,
         req: crate::model::GetFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FloorSetting>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FloorSetting>>;
 
     async fn update_floor_setting(
         &self,
         req: crate::model::UpdateFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FloorSetting>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FloorSetting>>;
 
     async fn sanitize_user_prompt(
         &self,
         req: crate::model::SanitizeUserPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SanitizeUserPromptResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SanitizeUserPromptResponse>>;
 
     async fn sanitize_model_response(
         &self,
         req: crate::model::SanitizeModelResponseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SanitizeModelResponseResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SanitizeModelResponseResponse>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 }
 
 /// All implementations of [super::ModelArmor] also implement [ModelArmor].
@@ -91,8 +91,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn list_templates(
         &self,
         req: crate::model::ListTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListTemplatesResponse>> {
         T::list_templates(self, req, options).await
     }
 
@@ -100,8 +100,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn get_template(
         &self,
         req: crate::model::GetTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Template>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Template>> {
         T::get_template(self, req, options).await
     }
 
@@ -109,8 +109,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn create_template(
         &self,
         req: crate::model::CreateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Template>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Template>> {
         T::create_template(self, req, options).await
     }
 
@@ -118,8 +118,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn update_template(
         &self,
         req: crate::model::UpdateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Template>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Template>> {
         T::update_template(self, req, options).await
     }
 
@@ -127,8 +127,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn delete_template(
         &self,
         req: crate::model::DeleteTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_template(self, req, options).await
     }
 
@@ -136,8 +136,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn get_floor_setting(
         &self,
         req: crate::model::GetFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FloorSetting>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FloorSetting>> {
         T::get_floor_setting(self, req, options).await
     }
 
@@ -145,8 +145,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn update_floor_setting(
         &self,
         req: crate::model::UpdateFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::FloorSetting>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::FloorSetting>> {
         T::update_floor_setting(self, req, options).await
     }
 
@@ -154,8 +154,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn sanitize_user_prompt(
         &self,
         req: crate::model::SanitizeUserPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SanitizeUserPromptResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SanitizeUserPromptResponse>> {
         T::sanitize_user_prompt(self, req, options).await
     }
 
@@ -163,8 +163,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn sanitize_model_response(
         &self,
         req: crate::model::SanitizeModelResponseRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::SanitizeModelResponseResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::SanitizeModelResponseResponse>> {
         T::sanitize_model_response(self, req, options).await
     }
 
@@ -172,9 +172,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -182,8 +181,8 @@ impl<T: super::ModelArmor> ModelArmor for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 }
diff --git a/src/generated/cloud/modelarmor/v1/src/tracing.rs b/src/generated/cloud/modelarmor/v1/src/tracing.rs
index de84920239..8e2b37bdbe 100644
--- a/src/generated/cloud/modelarmor/v1/src/tracing.rs
+++ b/src/generated/cloud/modelarmor/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_templates(
         &self,
         req: crate::model::ListTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTemplatesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTemplatesResponse>> {
         self.inner.list_templates(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_template(
         &self,
         req: crate::model::GetTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Template>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Template>> {
         self.inner.get_template(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_template(
         &self,
         req: crate::model::CreateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Template>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Template>> {
         self.inner.create_template(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_template(
         &self,
         req: crate::model::UpdateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Template>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Template>> {
         self.inner.update_template(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_template(
         &self,
         req: crate::model::DeleteTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_template(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn get_floor_setting(
         &self,
         req: crate::model::GetFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FloorSetting>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FloorSetting>> {
         self.inner.get_floor_setting(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn update_floor_setting(
         &self,
         req: crate::model::UpdateFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FloorSetting>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FloorSetting>> {
         self.inner.update_floor_setting(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn sanitize_user_prompt(
         &self,
         req: crate::model::SanitizeUserPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SanitizeUserPromptResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SanitizeUserPromptResponse>> {
         self.inner.sanitize_user_prompt(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn sanitize_model_response(
         &self,
         req: crate::model::SanitizeModelResponseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SanitizeModelResponseResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SanitizeModelResponseResponse>> {
         self.inner.sanitize_model_response(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 }
diff --git a/src/generated/cloud/modelarmor/v1/src/transport.rs b/src/generated/cloud/modelarmor/v1/src/transport.rs
index 618386cc0a..3db0d1faf6 100644
--- a/src/generated/cloud/modelarmor/v1/src/transport.rs
+++ b/src/generated/cloud/modelarmor/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [ModelArmor](super::stub::ModelArmor) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for ModelArmor {
 }
 
 impl ModelArmor {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn list_templates(
         &self,
         req: crate::model::ListTemplatesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListTemplatesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListTemplatesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn get_template(
         &self,
         req: crate::model::GetTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Template>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Template>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -154,9 +154,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -171,13 +171,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn create_template(
         &self,
         req: crate::model::CreateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Template>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Template>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -216,9 +216,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -233,13 +233,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn update_template(
         &self,
         req: crate::model::UpdateTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Template>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Template>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -299,9 +299,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -316,13 +316,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn delete_template(
         &self,
         req: crate::model::DeleteTemplateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -364,9 +364,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -375,24 +375,25 @@ impl super::stub::ModelArmor for ModelArmor {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn get_floor_setting(
         &self,
         req: crate::model::GetFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FloorSetting>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FloorSetting>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -501,9 +502,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -518,13 +519,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn update_floor_setting(
         &self,
         req: crate::model::UpdateFloorSettingRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::FloorSetting>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::FloorSetting>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -687,9 +688,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -704,13 +705,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn sanitize_user_prompt(
         &self,
         req: crate::model::SanitizeUserPromptRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SanitizeUserPromptResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SanitizeUserPromptResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -751,9 +752,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -768,13 +769,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn sanitize_model_response(
         &self,
         req: crate::model::SanitizeModelResponseRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::SanitizeModelResponseResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::SanitizeModelResponseResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -815,9 +816,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -832,13 +833,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -868,9 +869,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -885,13 +886,13 @@ impl super::stub::ModelArmor for ModelArmor {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -928,9 +929,9 @@ impl super::stub::ModelArmor for ModelArmor {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
diff --git a/src/generated/cloud/netapp/v1/Cargo.toml b/src/generated/cloud/netapp/v1/Cargo.toml
index c89a129411..f0a6f560e6 100644
--- a/src/generated/cloud/netapp/v1/Cargo.toml
+++ b/src/generated/cloud/netapp/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
 google-cloud-lro.workspace         = true
diff --git a/src/generated/cloud/netapp/v1/src/builder.rs b/src/generated/cloud/netapp/v1/src/builder.rs
index 2809a902e1..bb3d1a69c1 100644
--- a/src/generated/cloud/netapp/v1/src/builder.rs
+++ b/src/generated/cloud/netapp/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod net_app {
     /// A builder for [NetApp][crate::client::NetApp].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_netapp_v1::*;
     /// # use builder::net_app::ClientBuilder;
     /// # use client::NetApp;
@@ -30,19 +30,18 @@ pub mod net_app {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::NetApp;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = NetApp;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod net_app {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::NetApp>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -64,7 +63,7 @@ pub mod net_app {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -74,8 +73,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListStoragePools;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -107,7 +106,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -117,14 +116,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_storage_pools(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListStoragePoolsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListStoragePoolsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -132,15 +133,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListStoragePoolsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListStoragePoolsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -178,8 +181,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListStoragePools {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListStoragePools {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -189,7 +192,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateStoragePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -219,7 +222,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -234,7 +237,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_storage_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_storage_pool`.
@@ -251,7 +254,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -318,8 +321,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateStoragePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateStoragePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -329,7 +332,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetStoragePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -355,7 +358,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -365,7 +368,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_storage_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetStoragePoolRequest::name].
@@ -378,8 +381,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetStoragePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetStoragePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -389,7 +392,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateStoragePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -419,7 +422,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -434,7 +437,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_storage_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_storage_pool`.
@@ -451,7 +454,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -524,8 +527,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateStoragePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateStoragePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -535,7 +538,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteStoragePool;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -565,7 +568,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -580,7 +583,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_storage_pool(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_storage_pool`.
@@ -592,7 +595,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -629,8 +632,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteStoragePool {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteStoragePool {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -640,7 +643,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ValidateDirectoryService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -672,7 +675,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -687,7 +690,7 @@ pub mod net_app {
             (*self.0.stub)
                 .validate_directory_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `validate_directory_service`.
@@ -699,7 +702,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -745,8 +748,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ValidateDirectoryService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ValidateDirectoryService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -756,7 +759,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::SwitchActiveReplicaZone;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -788,7 +791,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -803,7 +806,7 @@ pub mod net_app {
             (*self.0.stub)
                 .switch_active_replica_zone(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `switch_active_replica_zone`.
@@ -820,7 +823,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -857,8 +860,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SwitchActiveReplicaZone {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SwitchActiveReplicaZone {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -868,8 +871,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListVolumes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -898,7 +901,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -908,13 +911,13 @@ pub mod net_app {
             (*self.0.stub)
                 .list_volumes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListVolumesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListVolumesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -923,15 +926,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListVolumesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListVolumesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -969,8 +974,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListVolumes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListVolumes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -980,7 +985,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1006,7 +1011,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1016,7 +1021,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetVolumeRequest::name].
@@ -1029,8 +1034,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1040,7 +1045,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1067,7 +1072,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1082,7 +1087,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_volume`.
@@ -1099,7 +1104,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1166,8 +1171,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1177,7 +1182,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1204,7 +1209,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1219,7 +1224,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_volume`.
@@ -1236,7 +1241,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1309,8 +1314,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1320,7 +1325,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1347,7 +1352,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1362,7 +1367,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_volume`.
@@ -1374,7 +1379,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1417,8 +1422,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1428,7 +1433,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::RevertVolume;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1455,7 +1460,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1470,7 +1475,7 @@ pub mod net_app {
             (*self.0.stub)
                 .revert_volume(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `revert_volume`.
@@ -1487,7 +1492,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1532,8 +1537,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RevertVolume {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RevertVolume {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1543,8 +1548,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListSnapshots;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1573,7 +1578,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1583,13 +1588,13 @@ pub mod net_app {
             (*self.0.stub)
                 .list_snapshots(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSnapshotsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSnapshotsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1598,15 +1603,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSnapshotsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSnapshotsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1644,8 +1651,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSnapshots {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSnapshots {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1655,7 +1662,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1681,7 +1688,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1691,7 +1698,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSnapshotRequest::name].
@@ -1704,8 +1711,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1715,7 +1722,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1742,7 +1749,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1757,7 +1764,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_snapshot`.
@@ -1774,7 +1781,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1841,8 +1848,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1852,7 +1859,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1879,7 +1886,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1894,7 +1901,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_snapshot`.
@@ -1906,7 +1913,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1943,8 +1950,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1954,7 +1961,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateSnapshot;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1981,7 +1988,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1996,7 +2003,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_snapshot(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_snapshot`.
@@ -2013,7 +2020,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2086,8 +2093,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSnapshot {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSnapshot {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2097,8 +2104,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListActiveDirectories;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2130,7 +2137,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2140,14 +2147,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_active_directories(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListActiveDirectoriesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListActiveDirectoriesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2155,17 +2164,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListActiveDirectoriesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2203,8 +2212,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListActiveDirectories {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListActiveDirectories {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2214,7 +2223,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetActiveDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2243,7 +2252,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2253,7 +2262,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_active_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetActiveDirectoryRequest::name].
@@ -2266,8 +2275,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetActiveDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetActiveDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2277,7 +2286,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateActiveDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2307,7 +2316,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2322,7 +2331,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_active_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_active_directory`.
@@ -2339,7 +2348,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2406,8 +2415,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateActiveDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateActiveDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2417,7 +2426,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateActiveDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2447,7 +2456,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2462,7 +2471,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_active_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_active_directory`.
@@ -2479,7 +2488,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2552,8 +2561,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateActiveDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateActiveDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2563,7 +2572,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteActiveDirectory;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2593,7 +2602,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2608,7 +2617,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_active_directory(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_active_directory`.
@@ -2620,7 +2629,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2657,8 +2666,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteActiveDirectory {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteActiveDirectory {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2668,8 +2677,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListKmsConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2698,7 +2707,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2708,14 +2717,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_kms_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListKmsConfigsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListKmsConfigsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -2723,15 +2734,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListKmsConfigsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListKmsConfigsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2769,8 +2782,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListKmsConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListKmsConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2780,7 +2793,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateKmsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2807,7 +2820,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2822,7 +2835,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_kms_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_kms_config`.
@@ -2839,7 +2852,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2906,8 +2919,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateKmsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateKmsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2917,7 +2930,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetKmsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2943,7 +2956,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2953,7 +2966,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_kms_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetKmsConfigRequest::name].
@@ -2966,8 +2979,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetKmsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetKmsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2977,7 +2990,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateKmsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3004,7 +3017,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3019,7 +3032,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_kms_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_kms_config`.
@@ -3036,7 +3049,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3109,8 +3122,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateKmsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateKmsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3120,7 +3133,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::EncryptVolumes;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3147,7 +3160,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3162,7 +3175,7 @@ pub mod net_app {
             (*self.0.stub)
                 .encrypt_volumes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `encrypt_volumes`.
@@ -3179,7 +3192,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3216,8 +3229,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EncryptVolumes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EncryptVolumes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3227,7 +3240,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::VerifyKmsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3253,7 +3266,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3263,7 +3276,7 @@ pub mod net_app {
             (*self.0.stub)
                 .verify_kms_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::VerifyKmsConfigRequest::name].
@@ -3276,8 +3289,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for VerifyKmsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for VerifyKmsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3287,7 +3300,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteKmsConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3314,7 +3327,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3329,7 +3342,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_kms_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_kms_config`.
@@ -3341,7 +3354,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3378,8 +3391,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteKmsConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteKmsConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3389,8 +3402,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListReplications;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3422,7 +3435,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3432,14 +3445,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_replications(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListReplicationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListReplicationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3447,15 +3462,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListReplicationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListReplicationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3493,8 +3510,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListReplications {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListReplications {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3504,7 +3521,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3530,7 +3547,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3540,7 +3557,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetReplicationRequest::name].
@@ -3553,8 +3570,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3564,7 +3581,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3594,7 +3611,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3609,7 +3626,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_replication`.
@@ -3626,7 +3643,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3693,8 +3710,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3704,7 +3721,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3734,7 +3751,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3749,7 +3766,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_replication`.
@@ -3761,7 +3778,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3798,8 +3815,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3809,7 +3826,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3839,7 +3856,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3854,7 +3871,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_replication`.
@@ -3871,7 +3888,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3944,8 +3961,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3955,7 +3972,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::StopReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3982,7 +3999,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3997,7 +4014,7 @@ pub mod net_app {
             (*self.0.stub)
                 .stop_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `stop_replication`.
@@ -4014,7 +4031,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4057,8 +4074,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for StopReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for StopReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4068,7 +4085,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ResumeReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4098,7 +4115,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4113,7 +4130,7 @@ pub mod net_app {
             (*self.0.stub)
                 .resume_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `resume_replication`.
@@ -4130,7 +4147,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4167,8 +4184,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ResumeReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ResumeReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4178,7 +4195,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ReverseReplicationDirection;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4210,7 +4227,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4225,7 +4242,7 @@ pub mod net_app {
             (*self.0.stub)
                 .reverse_replication_direction(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reverse_replication_direction`.
@@ -4242,7 +4259,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4279,8 +4296,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ReverseReplicationDirection {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ReverseReplicationDirection {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4290,7 +4307,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::EstablishPeering;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4320,7 +4337,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4335,7 +4352,7 @@ pub mod net_app {
             (*self.0.stub)
                 .establish_peering(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `establish_peering`.
@@ -4352,7 +4369,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4424,8 +4441,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for EstablishPeering {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for EstablishPeering {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4435,7 +4452,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::SyncReplication;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4462,7 +4479,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4477,7 +4494,7 @@ pub mod net_app {
             (*self.0.stub)
                 .sync_replication(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `sync_replication`.
@@ -4494,7 +4511,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4531,8 +4548,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SyncReplication {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SyncReplication {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4542,7 +4559,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4572,7 +4589,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4587,7 +4604,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_vault`.
@@ -4604,7 +4621,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4671,8 +4688,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4682,7 +4699,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4708,7 +4725,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4718,7 +4735,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupVaultRequest::name].
@@ -4731,8 +4748,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4742,8 +4759,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListBackupVaults;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4775,7 +4792,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4785,14 +4802,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_backup_vaults(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupVaultsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupVaultsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -4800,15 +4819,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupVaultsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupVaultsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4846,8 +4867,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupVaults {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupVaults {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4857,7 +4878,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4887,7 +4908,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4902,7 +4923,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_vault`.
@@ -4919,7 +4940,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4992,8 +5013,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5003,7 +5024,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteBackupVault;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5033,7 +5054,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5048,7 +5069,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_backup_vault(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_vault`.
@@ -5060,7 +5081,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5097,8 +5118,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupVault {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupVault {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5108,7 +5129,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5135,7 +5156,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5150,7 +5171,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup`.
@@ -5167,7 +5188,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5234,8 +5255,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5245,7 +5266,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5271,7 +5292,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5281,7 +5302,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupRequest::name].
@@ -5294,8 +5315,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5305,8 +5326,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListBackups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5335,7 +5356,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5345,13 +5366,13 @@ pub mod net_app {
             (*self.0.stub)
                 .list_backups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListBackupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5360,15 +5381,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListBackupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListBackupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5406,8 +5429,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5417,7 +5440,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5444,7 +5467,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5459,7 +5482,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup`.
@@ -5471,7 +5494,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5508,8 +5531,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5519,7 +5542,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateBackup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5546,7 +5569,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5561,7 +5584,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_backup(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup`.
@@ -5578,7 +5601,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5651,8 +5674,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5662,7 +5685,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateBackupPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5692,7 +5715,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5707,7 +5730,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_backup_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_backup_policy`.
@@ -5724,7 +5747,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5791,8 +5814,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateBackupPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateBackupPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5802,7 +5825,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetBackupPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5828,7 +5851,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5838,7 +5861,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_backup_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetBackupPolicyRequest::name].
@@ -5851,8 +5874,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetBackupPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetBackupPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5862,8 +5885,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListBackupPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5895,7 +5918,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5905,14 +5928,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_backup_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListBackupPoliciesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListBackupPoliciesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -5920,17 +5945,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListBackupPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5968,8 +5993,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListBackupPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListBackupPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5979,7 +6004,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateBackupPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6009,7 +6034,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6024,7 +6049,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_backup_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_backup_policy`.
@@ -6041,7 +6066,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6114,8 +6139,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateBackupPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateBackupPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6125,7 +6150,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteBackupPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6155,7 +6180,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6170,7 +6195,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_backup_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_backup_policy`.
@@ -6182,7 +6207,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6219,8 +6244,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteBackupPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteBackupPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6230,8 +6255,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListQuotaRules;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6260,7 +6285,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6270,14 +6295,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_quota_rules(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListQuotaRulesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListQuotaRulesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6285,15 +6312,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListQuotaRulesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListQuotaRulesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6331,8 +6360,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListQuotaRules {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListQuotaRules {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6342,7 +6371,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetQuotaRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6368,7 +6397,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6378,7 +6407,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_quota_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetQuotaRuleRequest::name].
@@ -6391,8 +6420,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetQuotaRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetQuotaRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6402,7 +6431,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateQuotaRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6429,7 +6458,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6444,7 +6473,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_quota_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_quota_rule`.
@@ -6461,7 +6490,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6528,8 +6557,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateQuotaRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateQuotaRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6539,7 +6568,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateQuotaRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6566,7 +6595,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6581,7 +6610,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_quota_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_quota_rule`.
@@ -6598,7 +6627,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6667,8 +6696,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateQuotaRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateQuotaRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6678,7 +6707,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteQuotaRule;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6705,7 +6734,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6720,7 +6749,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_quota_rule(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_quota_rule`.
@@ -6732,7 +6761,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6769,8 +6798,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteQuotaRule {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteQuotaRule {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6780,7 +6809,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::RestoreBackupFiles;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6810,7 +6839,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6825,7 +6854,7 @@ pub mod net_app {
             (*self.0.stub)
                 .restore_backup_files(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `restore_backup_files`.
@@ -6844,7 +6873,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6908,8 +6937,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RestoreBackupFiles {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RestoreBackupFiles {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6919,8 +6948,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListHostGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6949,7 +6978,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6959,14 +6988,16 @@ pub mod net_app {
             (*self.0.stub)
                 .list_host_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListHostGroupsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListHostGroupsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6974,15 +7005,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListHostGroupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListHostGroupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7020,8 +7053,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListHostGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListHostGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7031,7 +7064,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetHostGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7057,7 +7090,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7067,7 +7100,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_host_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetHostGroupRequest::name].
@@ -7080,8 +7113,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHostGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHostGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7091,7 +7124,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CreateHostGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7118,7 +7151,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7133,7 +7166,7 @@ pub mod net_app {
             (*self.0.stub)
                 .create_host_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_host_group`.
@@ -7150,7 +7183,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7217,8 +7250,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateHostGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateHostGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7228,7 +7261,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::UpdateHostGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7255,7 +7288,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7270,7 +7303,7 @@ pub mod net_app {
             (*self.0.stub)
                 .update_host_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_host_group`.
@@ -7287,7 +7320,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7356,8 +7389,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateHostGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateHostGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7367,7 +7400,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteHostGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7394,7 +7427,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7409,7 +7442,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_host_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_host_group`.
@@ -7421,7 +7454,7 @@ pub mod net_app {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7458,8 +7491,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteHostGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteHostGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7469,8 +7502,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7502,7 +7535,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7512,15 +7545,15 @@ pub mod net_app {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7529,17 +7562,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7569,8 +7602,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7580,7 +7613,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7609,7 +7642,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7619,7 +7652,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -7630,8 +7663,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7641,8 +7674,8 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7676,7 +7709,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7686,15 +7719,15 @@ pub mod net_app {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7703,17 +7736,17 @@ pub mod net_app {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7749,8 +7782,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7760,7 +7793,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7789,7 +7822,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7799,7 +7832,7 @@ pub mod net_app {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -7810,8 +7843,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7821,7 +7854,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7852,7 +7885,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7862,7 +7895,7 @@ pub mod net_app {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -7873,8 +7906,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7884,7 +7917,7 @@ pub mod net_app {
     /// # Example
     /// ```
     /// # use google_cloud_netapp_v1::builder::net_app::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_netapp_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7915,7 +7948,7 @@ pub mod net_app {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7925,7 +7958,7 @@ pub mod net_app {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -7936,8 +7969,8 @@ pub mod net_app {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/netapp/v1/src/client.rs b/src/generated/cloud/netapp/v1/src/client.rs
index 0db9d22816..ff0b2e47ff 100644
--- a/src/generated/cloud/netapp/v1/src/client.rs
+++ b/src/generated/cloud/netapp/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_netapp_v1::client::NetApp;
 /// let client = NetApp::builder().build().await?;
 /// // use `client` to make requests to the NetApp API.
@@ -66,13 +66,13 @@ impl NetApp {
     /// Returns a builder for [NetApp].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_netapp_v1::client::NetApp;
     /// let client = NetApp::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::net_app::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::net_app::client::Factory)
+        crate::new_client_builder(super::builder::net_app::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -90,14 +90,14 @@ impl NetApp {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::NetApp>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::NetApp>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -106,13 +106,13 @@ impl NetApp {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetApp> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetApp> {
         super::transport::NetApp::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::NetApp> {
+    ) -> crate::ClientBuilderResult<impl super::stub::NetApp> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::NetApp::new)
diff --git a/src/generated/cloud/netapp/v1/src/lib.rs b/src/generated/cloud/netapp/v1/src/lib.rs
index cd2b7631a7..1ce5d01cee 100644
--- a/src/generated/cloud/netapp/v1/src/lib.rs
+++ b/src/generated/cloud/netapp/v1/src/lib.rs
@@ -46,8 +46,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -82,3 +82,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/netapp/v1/src/model.rs b/src/generated/cloud/netapp/v1/src/model.rs
index de81f1eea5..6e13b664f7 100644
--- a/src/generated/cloud/netapp/v1/src/model.rs
+++ b/src/generated/cloud/netapp/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
 extern crate google_cloud_lro;
@@ -211,7 +211,7 @@ impl wkt::message::Message for ListActiveDirectoriesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListActiveDirectoriesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListActiveDirectoriesResponse {
     type PageItem = crate::model::ActiveDirectory;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -1890,7 +1890,7 @@ impl wkt::message::Message for ListBackupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupsResponse {
     type PageItem = crate::model::Backup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -2945,7 +2945,7 @@ impl wkt::message::Message for ListBackupPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupPoliciesResponse {
     type PageItem = crate::model::BackupPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4168,7 +4168,7 @@ impl wkt::message::Message for ListBackupVaultsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListBackupVaultsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListBackupVaultsResponse {
     type PageItem = crate::model::BackupVault;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4888,7 +4888,7 @@ impl wkt::message::Message for ListHostGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListHostGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListHostGroupsResponse {
     type PageItem = crate::model::HostGroup;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5838,7 +5838,7 @@ impl wkt::message::Message for ListKmsConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListKmsConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListKmsConfigsResponse {
     type PageItem = crate::model::KmsConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6775,7 +6775,7 @@ impl wkt::message::Message for ListQuotaRulesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListQuotaRulesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListQuotaRulesResponse {
     type PageItem = crate::model::QuotaRule;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -9471,7 +9471,7 @@ impl wkt::message::Message for ListReplicationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListReplicationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListReplicationsResponse {
     type PageItem = crate::model::Replication;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10323,7 +10323,7 @@ impl wkt::message::Message for ListSnapshotsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSnapshotsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSnapshotsResponse {
     type PageItem = crate::model::Snapshot;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11123,7 +11123,7 @@ impl wkt::message::Message for ListStoragePoolsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListStoragePoolsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListStoragePoolsResponse {
     type PageItem = crate::model::StoragePool;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12429,7 +12429,7 @@ impl wkt::message::Message for ListVolumesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListVolumesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListVolumesResponse {
     type PageItem = crate::model::Volume;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/netapp/v1/src/stub.rs b/src/generated/cloud/netapp/v1/src/stub.rs
index c58d6ad9c4..53754d4523 100644
--- a/src/generated/cloud/netapp/v1/src/stub.rs
+++ b/src/generated/cloud/netapp/v1/src/stub.rs
@@ -42,9 +42,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_storage_pools(
         &self,
         _req: crate::model::ListStoragePoolsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListStoragePoolsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListStoragePoolsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -53,9 +53,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_storage_pool(
         &self,
         _req: crate::model::CreateStoragePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -64,10 +64,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_storage_pool(
         &self,
         _req: crate::model::GetStoragePoolRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::StoragePool>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::StoragePool>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -75,9 +74,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_storage_pool(
         &self,
         _req: crate::model::UpdateStoragePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -86,9 +85,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_storage_pool(
         &self,
         _req: crate::model::DeleteStoragePoolRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -97,9 +96,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn validate_directory_service(
         &self,
         _req: crate::model::ValidateDirectoryServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -108,9 +107,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn switch_active_replica_zone(
         &self,
         _req: crate::model::SwitchActiveReplicaZoneRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -119,9 +118,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_volumes(
         &self,
         _req: crate::model::ListVolumesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListVolumesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListVolumesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -130,10 +129,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_volume(
         &self,
         _req: crate::model::GetVolumeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Volume>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Volume>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -141,9 +139,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_volume(
         &self,
         _req: crate::model::CreateVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -152,9 +150,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_volume(
         &self,
         _req: crate::model::UpdateVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -163,9 +161,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_volume(
         &self,
         _req: crate::model::DeleteVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -174,9 +172,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn revert_volume(
         &self,
         _req: crate::model::RevertVolumeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -185,9 +183,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_snapshots(
         &self,
         _req: crate::model::ListSnapshotsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSnapshotsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -196,10 +194,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_snapshot(
         &self,
         _req: crate::model::GetSnapshotRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Snapshot>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Snapshot>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -207,9 +204,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_snapshot(
         &self,
         _req: crate::model::CreateSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -218,9 +215,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_snapshot(
         &self,
         _req: crate::model::DeleteSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -229,9 +226,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_snapshot(
         &self,
         _req: crate::model::UpdateSnapshotRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -240,11 +237,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_active_directories(
         &self,
         _req: crate::model::ListActiveDirectoriesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListActiveDirectoriesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListActiveDirectoriesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -253,9 +248,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_active_directory(
         &self,
         _req: crate::model::GetActiveDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ActiveDirectory>>,
+        Output = crate::Result<crate::Response<crate::model::ActiveDirectory>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -264,9 +259,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_active_directory(
         &self,
         _req: crate::model::CreateActiveDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -275,9 +270,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_active_directory(
         &self,
         _req: crate::model::UpdateActiveDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -286,9 +281,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_active_directory(
         &self,
         _req: crate::model::DeleteActiveDirectoryRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -297,9 +292,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_kms_configs(
         &self,
         _req: crate::model::ListKmsConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListKmsConfigsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListKmsConfigsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -308,9 +303,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_kms_config(
         &self,
         _req: crate::model::CreateKmsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -319,10 +314,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_kms_config(
         &self,
         _req: crate::model::GetKmsConfigRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::KmsConfig>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::KmsConfig>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -330,9 +324,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_kms_config(
         &self,
         _req: crate::model::UpdateKmsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -341,9 +335,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn encrypt_volumes(
         &self,
         _req: crate::model::EncryptVolumesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -352,9 +346,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn verify_kms_config(
         &self,
         _req: crate::model::VerifyKmsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::VerifyKmsConfigResponse>>,
+        Output = crate::Result<crate::Response<crate::model::VerifyKmsConfigResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -363,9 +357,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_kms_config(
         &self,
         _req: crate::model::DeleteKmsConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -374,9 +368,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_replications(
         &self,
         _req: crate::model::ListReplicationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListReplicationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListReplicationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -385,10 +379,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_replication(
         &self,
         _req: crate::model::GetReplicationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Replication>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Replication>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -396,9 +389,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_replication(
         &self,
         _req: crate::model::CreateReplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -407,9 +400,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_replication(
         &self,
         _req: crate::model::DeleteReplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -418,9 +411,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_replication(
         &self,
         _req: crate::model::UpdateReplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -429,9 +422,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn stop_replication(
         &self,
         _req: crate::model::StopReplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -440,9 +433,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn resume_replication(
         &self,
         _req: crate::model::ResumeReplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -451,9 +444,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn reverse_replication_direction(
         &self,
         _req: crate::model::ReverseReplicationDirectionRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -462,9 +455,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn establish_peering(
         &self,
         _req: crate::model::EstablishPeeringRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -473,9 +466,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn sync_replication(
         &self,
         _req: crate::model::SyncReplicationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -484,9 +477,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_backup_vault(
         &self,
         _req: crate::model::CreateBackupVaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -495,10 +488,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_backup_vault(
         &self,
         _req: crate::model::GetBackupVaultRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupVault>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::BackupVault>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -506,9 +498,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_backup_vaults(
         &self,
         _req: crate::model::ListBackupVaultsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupVaultsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupVaultsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -517,9 +509,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_backup_vault(
         &self,
         _req: crate::model::UpdateBackupVaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -528,9 +520,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_backup_vault(
         &self,
         _req: crate::model::DeleteBackupVaultRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -539,9 +531,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_backup(
         &self,
         _req: crate::model::CreateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -550,10 +542,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_backup(
         &self,
         _req: crate::model::GetBackupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Backup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Backup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -561,9 +552,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_backups(
         &self,
         _req: crate::model::ListBackupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -572,9 +563,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_backup(
         &self,
         _req: crate::model::DeleteBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -583,9 +574,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_backup(
         &self,
         _req: crate::model::UpdateBackupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -594,9 +585,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_backup_policy(
         &self,
         _req: crate::model::CreateBackupPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -605,9 +596,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_backup_policy(
         &self,
         _req: crate::model::GetBackupPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::BackupPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::BackupPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -616,9 +607,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_backup_policies(
         &self,
         _req: crate::model::ListBackupPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListBackupPoliciesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListBackupPoliciesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -627,9 +618,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_backup_policy(
         &self,
         _req: crate::model::UpdateBackupPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -638,9 +629,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_backup_policy(
         &self,
         _req: crate::model::DeleteBackupPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -649,9 +640,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_quota_rules(
         &self,
         _req: crate::model::ListQuotaRulesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListQuotaRulesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListQuotaRulesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -660,10 +651,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_quota_rule(
         &self,
         _req: crate::model::GetQuotaRuleRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QuotaRule>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::QuotaRule>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -671,9 +661,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_quota_rule(
         &self,
         _req: crate::model::CreateQuotaRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -682,9 +672,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_quota_rule(
         &self,
         _req: crate::model::UpdateQuotaRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -693,9 +683,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_quota_rule(
         &self,
         _req: crate::model::DeleteQuotaRuleRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -704,9 +694,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn restore_backup_files(
         &self,
         _req: crate::model::RestoreBackupFilesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -715,9 +705,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_host_groups(
         &self,
         _req: crate::model::ListHostGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListHostGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListHostGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -726,10 +716,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_host_group(
         &self,
         _req: crate::model::GetHostGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::HostGroup>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::HostGroup>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -737,9 +726,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn create_host_group(
         &self,
         _req: crate::model::CreateHostGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -748,9 +737,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn update_host_group(
         &self,
         _req: crate::model::UpdateHostGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -759,9 +748,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_host_group(
         &self,
         _req: crate::model::DeleteHostGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -770,10 +759,10 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -783,9 +772,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -794,10 +783,10 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -807,9 +796,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -818,8 +807,8 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -827,8 +816,8 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -838,9 +827,9 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -849,8 +838,8 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/netapp/v1/src/stub/dynamic.rs b/src/generated/cloud/netapp/v1/src/stub/dynamic.rs
index 4ebf830a08..c9267a4930 100644
--- a/src/generated/cloud/netapp/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/netapp/v1/src/stub/dynamic.rs
@@ -20,446 +20,444 @@ pub trait NetApp: std::fmt::Debug + Send + Sync {
     async fn list_storage_pools(
         &self,
         req: crate::model::ListStoragePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStoragePoolsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStoragePoolsResponse>>;
 
     async fn create_storage_pool(
         &self,
         req: crate::model::CreateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_storage_pool(
         &self,
         req: crate::model::GetStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePool>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePool>>;
 
     async fn update_storage_pool(
         &self,
         req: crate::model::UpdateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_storage_pool(
         &self,
         req: crate::model::DeleteStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn validate_directory_service(
         &self,
         req: crate::model::ValidateDirectoryServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn switch_active_replica_zone(
         &self,
         req: crate::model::SwitchActiveReplicaZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumesResponse>>;
 
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Volume>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Volume>>;
 
     async fn create_volume(
         &self,
         req: crate::model::CreateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_volume(
         &self,
         req: crate::model::DeleteVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn revert_volume(
         &self,
         req: crate::model::RevertVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSnapshotsResponse>>;
 
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>>;
 
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_active_directories(
         &self,
         req: crate::model::ListActiveDirectoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActiveDirectoriesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActiveDirectoriesResponse>>;
 
     async fn get_active_directory(
         &self,
         req: crate::model::GetActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ActiveDirectory>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ActiveDirectory>>;
 
     async fn create_active_directory(
         &self,
         req: crate::model::CreateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_active_directory(
         &self,
         req: crate::model::UpdateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_active_directory(
         &self,
         req: crate::model::DeleteActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_kms_configs(
         &self,
         req: crate::model::ListKmsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKmsConfigsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKmsConfigsResponse>>;
 
     async fn create_kms_config(
         &self,
         req: crate::model::CreateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_kms_config(
         &self,
         req: crate::model::GetKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KmsConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KmsConfig>>;
 
     async fn update_kms_config(
         &self,
         req: crate::model::UpdateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn encrypt_volumes(
         &self,
         req: crate::model::EncryptVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn verify_kms_config(
         &self,
         req: crate::model::VerifyKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyKmsConfigResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyKmsConfigResponse>>;
 
     async fn delete_kms_config(
         &self,
         req: crate::model::DeleteKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_replications(
         &self,
         req: crate::model::ListReplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReplicationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReplicationsResponse>>;
 
     async fn get_replication(
         &self,
         req: crate::model::GetReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Replication>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Replication>>;
 
     async fn create_replication(
         &self,
         req: crate::model::CreateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_replication(
         &self,
         req: crate::model::DeleteReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_replication(
         &self,
         req: crate::model::UpdateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn stop_replication(
         &self,
         req: crate::model::StopReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn resume_replication(
         &self,
         req: crate::model::ResumeReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reverse_replication_direction(
         &self,
         req: crate::model::ReverseReplicationDirectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn establish_peering(
         &self,
         req: crate::model::EstablishPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn sync_replication(
         &self,
         req: crate::model::SyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupVault>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupVault>>;
 
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupVaultsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupVaultsResponse>>;
 
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>>;
 
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>>;
 
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn create_backup_policy(
         &self,
         req: crate::model::CreateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_backup_policy(
         &self,
         req: crate::model::GetBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPolicy>>;
 
     async fn list_backup_policies(
         &self,
         req: crate::model::ListBackupPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPoliciesResponse>>;
 
     async fn update_backup_policy(
         &self,
         req: crate::model::UpdateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_backup_policy(
         &self,
         req: crate::model::DeleteBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_quota_rules(
         &self,
         req: crate::model::ListQuotaRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQuotaRulesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQuotaRulesResponse>>;
 
     async fn get_quota_rule(
         &self,
         req: crate::model::GetQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaRule>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaRule>>;
 
     async fn create_quota_rule(
         &self,
         req: crate::model::CreateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_quota_rule(
         &self,
         req: crate::model::UpdateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_quota_rule(
         &self,
         req: crate::model::DeleteQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn restore_backup_files(
         &self,
         req: crate::model::RestoreBackupFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_host_groups(
         &self,
         req: crate::model::ListHostGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHostGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHostGroupsResponse>>;
 
     async fn get_host_group(
         &self,
         req: crate::model::GetHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HostGroup>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HostGroup>>;
 
     async fn create_host_group(
         &self,
         req: crate::model::CreateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_host_group(
         &self,
         req: crate::model::UpdateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_host_group(
         &self,
         req: crate::model::DeleteHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::NetApp] also implement [NetApp].
@@ -469,8 +467,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_storage_pools(
         &self,
         req: crate::model::ListStoragePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListStoragePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListStoragePoolsResponse>> {
         T::list_storage_pools(self, req, options).await
     }
 
@@ -478,8 +476,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_storage_pool(
         &self,
         req: crate::model::CreateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_storage_pool(self, req, options).await
     }
 
@@ -487,8 +485,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_storage_pool(
         &self,
         req: crate::model::GetStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::StoragePool>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::StoragePool>> {
         T::get_storage_pool(self, req, options).await
     }
 
@@ -496,8 +494,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_storage_pool(
         &self,
         req: crate::model::UpdateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_storage_pool(self, req, options).await
     }
 
@@ -505,8 +503,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_storage_pool(
         &self,
         req: crate::model::DeleteStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_storage_pool(self, req, options).await
     }
 
@@ -514,8 +512,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn validate_directory_service(
         &self,
         req: crate::model::ValidateDirectoryServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::validate_directory_service(self, req, options).await
     }
 
@@ -523,8 +521,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn switch_active_replica_zone(
         &self,
         req: crate::model::SwitchActiveReplicaZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::switch_active_replica_zone(self, req, options).await
     }
 
@@ -532,8 +530,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListVolumesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListVolumesResponse>> {
         T::list_volumes(self, req, options).await
     }
 
@@ -541,8 +539,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Volume>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Volume>> {
         T::get_volume(self, req, options).await
     }
 
@@ -550,8 +548,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_volume(
         &self,
         req: crate::model::CreateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_volume(self, req, options).await
     }
 
@@ -559,8 +557,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_volume(self, req, options).await
     }
 
@@ -568,8 +566,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_volume(
         &self,
         req: crate::model::DeleteVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_volume(self, req, options).await
     }
 
@@ -577,8 +575,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn revert_volume(
         &self,
         req: crate::model::RevertVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::revert_volume(self, req, options).await
     }
 
@@ -586,8 +584,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         T::list_snapshots(self, req, options).await
     }
 
@@ -595,8 +593,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Snapshot>> {
         T::get_snapshot(self, req, options).await
     }
 
@@ -604,8 +602,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_snapshot(self, req, options).await
     }
 
@@ -613,8 +611,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_snapshot(self, req, options).await
     }
 
@@ -622,8 +620,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_snapshot(self, req, options).await
     }
 
@@ -631,8 +629,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_active_directories(
         &self,
         req: crate::model::ListActiveDirectoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListActiveDirectoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListActiveDirectoriesResponse>> {
         T::list_active_directories(self, req, options).await
     }
 
@@ -640,8 +638,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_active_directory(
         &self,
         req: crate::model::GetActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ActiveDirectory>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ActiveDirectory>> {
         T::get_active_directory(self, req, options).await
     }
 
@@ -649,8 +647,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_active_directory(
         &self,
         req: crate::model::CreateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_active_directory(self, req, options).await
     }
 
@@ -658,8 +656,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_active_directory(
         &self,
         req: crate::model::UpdateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_active_directory(self, req, options).await
     }
 
@@ -667,8 +665,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_active_directory(
         &self,
         req: crate::model::DeleteActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_active_directory(self, req, options).await
     }
 
@@ -676,8 +674,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_kms_configs(
         &self,
         req: crate::model::ListKmsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListKmsConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListKmsConfigsResponse>> {
         T::list_kms_configs(self, req, options).await
     }
 
@@ -685,8 +683,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_kms_config(
         &self,
         req: crate::model::CreateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_kms_config(self, req, options).await
     }
 
@@ -694,8 +692,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_kms_config(
         &self,
         req: crate::model::GetKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::KmsConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::KmsConfig>> {
         T::get_kms_config(self, req, options).await
     }
 
@@ -703,8 +701,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_kms_config(
         &self,
         req: crate::model::UpdateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_kms_config(self, req, options).await
     }
 
@@ -712,8 +710,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn encrypt_volumes(
         &self,
         req: crate::model::EncryptVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::encrypt_volumes(self, req, options).await
     }
 
@@ -721,8 +719,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn verify_kms_config(
         &self,
         req: crate::model::VerifyKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::VerifyKmsConfigResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::VerifyKmsConfigResponse>> {
         T::verify_kms_config(self, req, options).await
     }
 
@@ -730,8 +728,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_kms_config(
         &self,
         req: crate::model::DeleteKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_kms_config(self, req, options).await
     }
 
@@ -739,8 +737,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_replications(
         &self,
         req: crate::model::ListReplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListReplicationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListReplicationsResponse>> {
         T::list_replications(self, req, options).await
     }
 
@@ -748,8 +746,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_replication(
         &self,
         req: crate::model::GetReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Replication>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Replication>> {
         T::get_replication(self, req, options).await
     }
 
@@ -757,8 +755,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_replication(
         &self,
         req: crate::model::CreateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_replication(self, req, options).await
     }
 
@@ -766,8 +764,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_replication(
         &self,
         req: crate::model::DeleteReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_replication(self, req, options).await
     }
 
@@ -775,8 +773,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_replication(
         &self,
         req: crate::model::UpdateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_replication(self, req, options).await
     }
 
@@ -784,8 +782,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn stop_replication(
         &self,
         req: crate::model::StopReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::stop_replication(self, req, options).await
     }
 
@@ -793,8 +791,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn resume_replication(
         &self,
         req: crate::model::ResumeReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::resume_replication(self, req, options).await
     }
 
@@ -802,8 +800,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn reverse_replication_direction(
         &self,
         req: crate::model::ReverseReplicationDirectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reverse_replication_direction(self, req, options).await
     }
 
@@ -811,8 +809,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn establish_peering(
         &self,
         req: crate::model::EstablishPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::establish_peering(self, req, options).await
     }
 
@@ -820,8 +818,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn sync_replication(
         &self,
         req: crate::model::SyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::sync_replication(self, req, options).await
     }
 
@@ -829,8 +827,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_vault(self, req, options).await
     }
 
@@ -838,8 +836,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupVault>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupVault>> {
         T::get_backup_vault(self, req, options).await
     }
 
@@ -847,8 +845,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupVaultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupVaultsResponse>> {
         T::list_backup_vaults(self, req, options).await
     }
 
@@ -856,8 +854,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_vault(self, req, options).await
     }
 
@@ -865,8 +863,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_vault(self, req, options).await
     }
 
@@ -874,8 +872,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup(self, req, options).await
     }
 
@@ -883,8 +881,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Backup>> {
         T::get_backup(self, req, options).await
     }
 
@@ -892,8 +890,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupsResponse>> {
         T::list_backups(self, req, options).await
     }
 
@@ -901,8 +899,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup(self, req, options).await
     }
 
@@ -910,8 +908,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup(self, req, options).await
     }
 
@@ -919,8 +917,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_backup_policy(
         &self,
         req: crate::model::CreateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_backup_policy(self, req, options).await
     }
 
@@ -928,8 +926,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_backup_policy(
         &self,
         req: crate::model::GetBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::BackupPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::BackupPolicy>> {
         T::get_backup_policy(self, req, options).await
     }
 
@@ -937,8 +935,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_backup_policies(
         &self,
         req: crate::model::ListBackupPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListBackupPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListBackupPoliciesResponse>> {
         T::list_backup_policies(self, req, options).await
     }
 
@@ -946,8 +944,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_backup_policy(
         &self,
         req: crate::model::UpdateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_backup_policy(self, req, options).await
     }
 
@@ -955,8 +953,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_backup_policy(
         &self,
         req: crate::model::DeleteBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_backup_policy(self, req, options).await
     }
 
@@ -964,8 +962,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_quota_rules(
         &self,
         req: crate::model::ListQuotaRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListQuotaRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListQuotaRulesResponse>> {
         T::list_quota_rules(self, req, options).await
     }
 
@@ -973,8 +971,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_quota_rule(
         &self,
         req: crate::model::GetQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QuotaRule>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QuotaRule>> {
         T::get_quota_rule(self, req, options).await
     }
 
@@ -982,8 +980,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_quota_rule(
         &self,
         req: crate::model::CreateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_quota_rule(self, req, options).await
     }
 
@@ -991,8 +989,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_quota_rule(
         &self,
         req: crate::model::UpdateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_quota_rule(self, req, options).await
     }
 
@@ -1000,8 +998,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_quota_rule(
         &self,
         req: crate::model::DeleteQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_quota_rule(self, req, options).await
     }
 
@@ -1009,8 +1007,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn restore_backup_files(
         &self,
         req: crate::model::RestoreBackupFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::restore_backup_files(self, req, options).await
     }
 
@@ -1018,8 +1016,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_host_groups(
         &self,
         req: crate::model::ListHostGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHostGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHostGroupsResponse>> {
         T::list_host_groups(self, req, options).await
     }
 
@@ -1027,8 +1025,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_host_group(
         &self,
         req: crate::model::GetHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::HostGroup>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::HostGroup>> {
         T::get_host_group(self, req, options).await
     }
 
@@ -1036,8 +1034,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn create_host_group(
         &self,
         req: crate::model::CreateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_host_group(self, req, options).await
     }
 
@@ -1045,8 +1043,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn update_host_group(
         &self,
         req: crate::model::UpdateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_host_group(self, req, options).await
     }
 
@@ -1054,8 +1052,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_host_group(
         &self,
         req: crate::model::DeleteHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_host_group(self, req, options).await
     }
 
@@ -1063,9 +1061,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1073,8 +1070,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1082,10 +1079,9 @@ impl<T: super::NetApp> NetApp for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1093,8 +1089,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1102,8 +1098,8 @@ impl<T: super::NetApp> NetApp for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1111,22 +1107,22 @@ impl<T: super::NetApp> NetApp for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/netapp/v1/src/tracing.rs b/src/generated/cloud/netapp/v1/src/tracing.rs
index 49f23c7c3d..ac33e81886 100644
--- a/src/generated/cloud/netapp/v1/src/tracing.rs
+++ b/src/generated/cloud/netapp/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_storage_pools(
         &self,
         req: crate::model::ListStoragePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStoragePoolsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStoragePoolsResponse>> {
         self.inner.list_storage_pools(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn create_storage_pool(
         &self,
         req: crate::model::CreateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_storage_pool(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn get_storage_pool(
         &self,
         req: crate::model::GetStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePool>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePool>> {
         self.inner.get_storage_pool(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_storage_pool(
         &self,
         req: crate::model::UpdateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_storage_pool(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_storage_pool(
         &self,
         req: crate::model::DeleteStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_storage_pool(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn validate_directory_service(
         &self,
         req: crate::model::ValidateDirectoryServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.validate_directory_service(req, options).await
     }
 
@@ -95,8 +95,8 @@ where
     async fn switch_active_replica_zone(
         &self,
         req: crate::model::SwitchActiveReplicaZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.switch_active_replica_zone(req, options).await
     }
 
@@ -104,8 +104,8 @@ where
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumesResponse>> {
         self.inner.list_volumes(req, options).await
     }
 
@@ -113,8 +113,8 @@ where
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Volume>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Volume>> {
         self.inner.get_volume(req, options).await
     }
 
@@ -122,8 +122,8 @@ where
     async fn create_volume(
         &self,
         req: crate::model::CreateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_volume(req, options).await
     }
 
@@ -131,8 +131,8 @@ where
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_volume(req, options).await
     }
 
@@ -140,8 +140,8 @@ where
     async fn delete_volume(
         &self,
         req: crate::model::DeleteVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_volume(req, options).await
     }
 
@@ -149,8 +149,8 @@ where
     async fn revert_volume(
         &self,
         req: crate::model::RevertVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.revert_volume(req, options).await
     }
 
@@ -158,8 +158,8 @@ where
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         self.inner.list_snapshots(req, options).await
     }
 
@@ -167,8 +167,8 @@ where
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         self.inner.get_snapshot(req, options).await
     }
 
@@ -176,8 +176,8 @@ where
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_snapshot(req, options).await
     }
 
@@ -185,8 +185,8 @@ where
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_snapshot(req, options).await
     }
 
@@ -194,8 +194,8 @@ where
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_snapshot(req, options).await
     }
 
@@ -203,8 +203,8 @@ where
     async fn list_active_directories(
         &self,
         req: crate::model::ListActiveDirectoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActiveDirectoriesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActiveDirectoriesResponse>> {
         self.inner.list_active_directories(req, options).await
     }
 
@@ -212,8 +212,8 @@ where
     async fn get_active_directory(
         &self,
         req: crate::model::GetActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ActiveDirectory>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ActiveDirectory>> {
         self.inner.get_active_directory(req, options).await
     }
 
@@ -221,8 +221,8 @@ where
     async fn create_active_directory(
         &self,
         req: crate::model::CreateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_active_directory(req, options).await
     }
 
@@ -230,8 +230,8 @@ where
     async fn update_active_directory(
         &self,
         req: crate::model::UpdateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_active_directory(req, options).await
     }
 
@@ -239,8 +239,8 @@ where
     async fn delete_active_directory(
         &self,
         req: crate::model::DeleteActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_active_directory(req, options).await
     }
 
@@ -248,8 +248,8 @@ where
     async fn list_kms_configs(
         &self,
         req: crate::model::ListKmsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKmsConfigsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKmsConfigsResponse>> {
         self.inner.list_kms_configs(req, options).await
     }
 
@@ -257,8 +257,8 @@ where
     async fn create_kms_config(
         &self,
         req: crate::model::CreateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_kms_config(req, options).await
     }
 
@@ -266,8 +266,8 @@ where
     async fn get_kms_config(
         &self,
         req: crate::model::GetKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KmsConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KmsConfig>> {
         self.inner.get_kms_config(req, options).await
     }
 
@@ -275,8 +275,8 @@ where
     async fn update_kms_config(
         &self,
         req: crate::model::UpdateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_kms_config(req, options).await
     }
 
@@ -284,8 +284,8 @@ where
     async fn encrypt_volumes(
         &self,
         req: crate::model::EncryptVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.encrypt_volumes(req, options).await
     }
 
@@ -293,8 +293,8 @@ where
     async fn verify_kms_config(
         &self,
         req: crate::model::VerifyKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyKmsConfigResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyKmsConfigResponse>> {
         self.inner.verify_kms_config(req, options).await
     }
 
@@ -302,8 +302,8 @@ where
     async fn delete_kms_config(
         &self,
         req: crate::model::DeleteKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_kms_config(req, options).await
     }
 
@@ -311,8 +311,8 @@ where
     async fn list_replications(
         &self,
         req: crate::model::ListReplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReplicationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReplicationsResponse>> {
         self.inner.list_replications(req, options).await
     }
 
@@ -320,8 +320,8 @@ where
     async fn get_replication(
         &self,
         req: crate::model::GetReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Replication>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Replication>> {
         self.inner.get_replication(req, options).await
     }
 
@@ -329,8 +329,8 @@ where
     async fn create_replication(
         &self,
         req: crate::model::CreateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_replication(req, options).await
     }
 
@@ -338,8 +338,8 @@ where
     async fn delete_replication(
         &self,
         req: crate::model::DeleteReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_replication(req, options).await
     }
 
@@ -347,8 +347,8 @@ where
     async fn update_replication(
         &self,
         req: crate::model::UpdateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_replication(req, options).await
     }
 
@@ -356,8 +356,8 @@ where
     async fn stop_replication(
         &self,
         req: crate::model::StopReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.stop_replication(req, options).await
     }
 
@@ -365,8 +365,8 @@ where
     async fn resume_replication(
         &self,
         req: crate::model::ResumeReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.resume_replication(req, options).await
     }
 
@@ -374,8 +374,8 @@ where
     async fn reverse_replication_direction(
         &self,
         req: crate::model::ReverseReplicationDirectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reverse_replication_direction(req, options).await
     }
 
@@ -383,8 +383,8 @@ where
     async fn establish_peering(
         &self,
         req: crate::model::EstablishPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.establish_peering(req, options).await
     }
 
@@ -392,8 +392,8 @@ where
     async fn sync_replication(
         &self,
         req: crate::model::SyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.sync_replication(req, options).await
     }
 
@@ -401,8 +401,8 @@ where
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup_vault(req, options).await
     }
 
@@ -410,8 +410,8 @@ where
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupVault>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupVault>> {
         self.inner.get_backup_vault(req, options).await
     }
 
@@ -419,8 +419,8 @@ where
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupVaultsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupVaultsResponse>> {
         self.inner.list_backup_vaults(req, options).await
     }
 
@@ -428,8 +428,8 @@ where
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup_vault(req, options).await
     }
 
@@ -437,8 +437,8 @@ where
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup_vault(req, options).await
     }
 
@@ -446,8 +446,8 @@ where
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup(req, options).await
     }
 
@@ -455,8 +455,8 @@ where
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         self.inner.get_backup(req, options).await
     }
 
@@ -464,8 +464,8 @@ where
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         self.inner.list_backups(req, options).await
     }
 
@@ -473,8 +473,8 @@ where
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup(req, options).await
     }
 
@@ -482,8 +482,8 @@ where
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup(req, options).await
     }
 
@@ -491,8 +491,8 @@ where
     async fn create_backup_policy(
         &self,
         req: crate::model::CreateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_backup_policy(req, options).await
     }
 
@@ -500,8 +500,8 @@ where
     async fn get_backup_policy(
         &self,
         req: crate::model::GetBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPolicy>> {
         self.inner.get_backup_policy(req, options).await
     }
 
@@ -509,8 +509,8 @@ where
     async fn list_backup_policies(
         &self,
         req: crate::model::ListBackupPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPoliciesResponse>> {
         self.inner.list_backup_policies(req, options).await
     }
 
@@ -518,8 +518,8 @@ where
     async fn update_backup_policy(
         &self,
         req: crate::model::UpdateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_backup_policy(req, options).await
     }
 
@@ -527,8 +527,8 @@ where
     async fn delete_backup_policy(
         &self,
         req: crate::model::DeleteBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_backup_policy(req, options).await
     }
 
@@ -536,8 +536,8 @@ where
     async fn list_quota_rules(
         &self,
         req: crate::model::ListQuotaRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQuotaRulesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQuotaRulesResponse>> {
         self.inner.list_quota_rules(req, options).await
     }
 
@@ -545,8 +545,8 @@ where
     async fn get_quota_rule(
         &self,
         req: crate::model::GetQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaRule>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaRule>> {
         self.inner.get_quota_rule(req, options).await
     }
 
@@ -554,8 +554,8 @@ where
     async fn create_quota_rule(
         &self,
         req: crate::model::CreateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_quota_rule(req, options).await
     }
 
@@ -563,8 +563,8 @@ where
     async fn update_quota_rule(
         &self,
         req: crate::model::UpdateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_quota_rule(req, options).await
     }
 
@@ -572,8 +572,8 @@ where
     async fn delete_quota_rule(
         &self,
         req: crate::model::DeleteQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_quota_rule(req, options).await
     }
 
@@ -581,8 +581,8 @@ where
     async fn restore_backup_files(
         &self,
         req: crate::model::RestoreBackupFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.restore_backup_files(req, options).await
     }
 
@@ -590,8 +590,8 @@ where
     async fn list_host_groups(
         &self,
         req: crate::model::ListHostGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHostGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHostGroupsResponse>> {
         self.inner.list_host_groups(req, options).await
     }
 
@@ -599,8 +599,8 @@ where
     async fn get_host_group(
         &self,
         req: crate::model::GetHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HostGroup>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HostGroup>> {
         self.inner.get_host_group(req, options).await
     }
 
@@ -608,8 +608,8 @@ where
     async fn create_host_group(
         &self,
         req: crate::model::CreateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_host_group(req, options).await
     }
 
@@ -617,8 +617,8 @@ where
     async fn update_host_group(
         &self,
         req: crate::model::UpdateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_host_group(req, options).await
     }
 
@@ -626,8 +626,8 @@ where
     async fn delete_host_group(
         &self,
         req: crate::model::DeleteHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_host_group(req, options).await
     }
 
@@ -635,8 +635,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -644,8 +644,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -653,9 +653,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -663,8 +662,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -672,8 +671,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -681,22 +680,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/netapp/v1/src/transport.rs b/src/generated/cloud/netapp/v1/src/transport.rs
index c408a4ae02..45df74a607 100644
--- a/src/generated/cloud/netapp/v1/src/transport.rs
+++ b/src/generated/cloud/netapp/v1/src/transport.rs
@@ -14,9 +14,9 @@
 //
 // Code generated by sidekick. DO NOT EDIT.
 
-use crate::Result;
 #[allow(unused_imports)]
-use gax::error::Error;
+use crate::Error;
+use crate::Result;
 
 /// Implements [NetApp](super::stub::NetApp) using a [gaxi::http::ReqwestClient].
 #[derive(Clone)]
@@ -33,7 +33,7 @@ impl std::fmt::Debug for NetApp {
 }
 
 impl NetApp {
-    pub async fn new(config: gaxi::options::ClientConfig) -> gax::client_builder::Result<Self> {
+    pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
         let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
@@ -43,13 +43,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_storage_pools(
         &self,
         req: crate::model::ListStoragePoolsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListStoragePoolsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListStoragePoolsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -90,9 +90,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -107,13 +107,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_storage_pool(
         &self,
         req: crate::model::CreateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -151,9 +151,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -168,13 +168,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_storage_pool(
         &self,
         req: crate::model::GetStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::StoragePool>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::StoragePool>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -215,9 +215,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -232,13 +232,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_storage_pool(
         &self,
         req: crate::model::UpdateStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -297,9 +297,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -314,13 +314,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_storage_pool(
         &self,
         req: crate::model::DeleteStoragePoolRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -361,9 +361,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -378,13 +378,13 @@ impl super::stub::NetApp for NetApp {
     async fn validate_directory_service(
         &self,
         req: crate::model::ValidateDirectoryServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -425,9 +425,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -442,13 +442,13 @@ impl super::stub::NetApp for NetApp {
     async fn switch_active_replica_zone(
         &self,
         req: crate::model::SwitchActiveReplicaZoneRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -489,9 +489,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -506,13 +506,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_volumes(
         &self,
         req: crate::model::ListVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListVolumesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListVolumesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -553,9 +553,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -570,13 +570,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_volume(
         &self,
         req: crate::model::GetVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Volume>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Volume>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -617,9 +617,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -634,13 +634,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_volume(
         &self,
         req: crate::model::CreateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -678,9 +678,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -695,13 +695,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_volume(
         &self,
         req: crate::model::UpdateVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -760,9 +760,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -777,13 +777,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_volume(
         &self,
         req: crate::model::DeleteVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -825,9 +825,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -842,13 +842,13 @@ impl super::stub::NetApp for NetApp {
     async fn revert_volume(
         &self,
         req: crate::model::RevertVolumeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -889,9 +889,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -906,13 +906,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_snapshots(
         &self,
         req: crate::model::ListSnapshotsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSnapshotsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSnapshotsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -957,9 +957,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -974,13 +974,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_snapshot(
         &self,
         req: crate::model::GetSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Snapshot>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Snapshot>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1025,9 +1025,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1042,13 +1042,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_snapshot(
         &self,
         req: crate::model::CreateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1090,9 +1090,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1107,13 +1107,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_snapshot(
         &self,
         req: crate::model::DeleteSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1158,9 +1158,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1175,13 +1175,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_snapshot(
         &self,
         req: crate::model::UpdateSnapshotRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1244,9 +1244,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1261,13 +1261,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_active_directories(
         &self,
         req: crate::model::ListActiveDirectoriesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListActiveDirectoriesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListActiveDirectoriesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1308,9 +1308,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1325,13 +1325,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_active_directory(
         &self,
         req: crate::model::GetActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ActiveDirectory>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ActiveDirectory>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1372,9 +1372,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1389,13 +1389,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_active_directory(
         &self,
         req: crate::model::CreateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1433,9 +1433,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1450,13 +1450,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_active_directory(
         &self,
         req: crate::model::UpdateActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1515,9 +1515,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1532,13 +1532,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_active_directory(
         &self,
         req: crate::model::DeleteActiveDirectoryRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1579,9 +1579,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1596,13 +1596,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_kms_configs(
         &self,
         req: crate::model::ListKmsConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListKmsConfigsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListKmsConfigsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1643,9 +1643,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1660,13 +1660,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_kms_config(
         &self,
         req: crate::model::CreateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1704,9 +1704,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1721,13 +1721,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_kms_config(
         &self,
         req: crate::model::GetKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::KmsConfig>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::KmsConfig>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1768,9 +1768,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1785,13 +1785,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_kms_config(
         &self,
         req: crate::model::UpdateKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1850,9 +1850,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1867,13 +1867,13 @@ impl super::stub::NetApp for NetApp {
     async fn encrypt_volumes(
         &self,
         req: crate::model::EncryptVolumesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1914,9 +1914,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1931,13 +1931,13 @@ impl super::stub::NetApp for NetApp {
     async fn verify_kms_config(
         &self,
         req: crate::model::VerifyKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::VerifyKmsConfigResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::VerifyKmsConfigResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -1978,9 +1978,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -1995,13 +1995,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_kms_config(
         &self,
         req: crate::model::DeleteKmsConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2042,9 +2042,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2059,13 +2059,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_replications(
         &self,
         req: crate::model::ListReplicationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListReplicationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListReplicationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2110,9 +2110,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2127,13 +2127,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_replication(
         &self,
         req: crate::model::GetReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Replication>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Replication>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2178,9 +2178,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2195,13 +2195,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_replication(
         &self,
         req: crate::model::CreateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2243,9 +2243,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2260,13 +2260,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_replication(
         &self,
         req: crate::model::DeleteReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2311,9 +2311,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2328,13 +2328,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_replication(
         &self,
         req: crate::model::UpdateReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2397,9 +2397,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2414,13 +2414,13 @@ impl super::stub::NetApp for NetApp {
     async fn stop_replication(
         &self,
         req: crate::model::StopReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2465,9 +2465,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2482,13 +2482,13 @@ impl super::stub::NetApp for NetApp {
     async fn resume_replication(
         &self,
         req: crate::model::ResumeReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2533,9 +2533,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2550,13 +2550,13 @@ impl super::stub::NetApp for NetApp {
     async fn reverse_replication_direction(
         &self,
         req: crate::model::ReverseReplicationDirectionRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2601,9 +2601,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2618,13 +2618,13 @@ impl super::stub::NetApp for NetApp {
     async fn establish_peering(
         &self,
         req: crate::model::EstablishPeeringRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2669,9 +2669,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2686,13 +2686,13 @@ impl super::stub::NetApp for NetApp {
     async fn sync_replication(
         &self,
         req: crate::model::SyncReplicationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2737,9 +2737,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2754,13 +2754,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_backup_vault(
         &self,
         req: crate::model::CreateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2798,9 +2798,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2815,13 +2815,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_backup_vault(
         &self,
         req: crate::model::GetBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupVault>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupVault>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2862,9 +2862,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2879,13 +2879,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_backup_vaults(
         &self,
         req: crate::model::ListBackupVaultsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupVaultsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupVaultsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -2926,9 +2926,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -2943,13 +2943,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_backup_vault(
         &self,
         req: crate::model::UpdateBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3008,9 +3008,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3025,13 +3025,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_backup_vault(
         &self,
         req: crate::model::DeleteBackupVaultRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3072,9 +3072,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3089,13 +3089,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_backup(
         &self,
         req: crate::model::CreateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3137,9 +3137,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3154,13 +3154,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_backup(
         &self,
         req: crate::model::GetBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Backup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Backup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3205,9 +3205,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3222,13 +3222,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_backups(
         &self,
         req: crate::model::ListBackupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3273,9 +3273,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3290,13 +3290,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_backup(
         &self,
         req: crate::model::DeleteBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3341,9 +3341,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3358,13 +3358,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_backup(
         &self,
         req: crate::model::UpdateBackupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3427,9 +3427,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3444,13 +3444,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_backup_policy(
         &self,
         req: crate::model::CreateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3488,9 +3488,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3505,13 +3505,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_backup_policy(
         &self,
         req: crate::model::GetBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::BackupPolicy>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::BackupPolicy>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3552,9 +3552,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3569,13 +3569,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_backup_policies(
         &self,
         req: crate::model::ListBackupPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListBackupPoliciesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListBackupPoliciesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3616,9 +3616,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3633,13 +3633,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_backup_policy(
         &self,
         req: crate::model::UpdateBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3698,9 +3698,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3715,13 +3715,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_backup_policy(
         &self,
         req: crate::model::DeleteBackupPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3762,9 +3762,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3779,13 +3779,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_quota_rules(
         &self,
         req: crate::model::ListQuotaRulesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListQuotaRulesResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListQuotaRulesResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3830,9 +3830,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3847,13 +3847,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_quota_rule(
         &self,
         req: crate::model::GetQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QuotaRule>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QuotaRule>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3898,9 +3898,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3915,13 +3915,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_quota_rule(
         &self,
         req: crate::model::CreateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -3963,9 +3963,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -3980,13 +3980,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_quota_rule(
         &self,
         req: crate::model::UpdateQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4049,9 +4049,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4066,13 +4066,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_quota_rule(
         &self,
         req: crate::model::DeleteQuotaRuleRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4117,9 +4117,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4134,13 +4134,13 @@ impl super::stub::NetApp for NetApp {
     async fn restore_backup_files(
         &self,
         req: crate::model::RestoreBackupFilesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4181,9 +4181,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4198,13 +4198,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_host_groups(
         &self,
         req: crate::model::ListHostGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHostGroupsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHostGroupsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4245,9 +4245,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4262,13 +4262,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_host_group(
         &self,
         req: crate::model::GetHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::HostGroup>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::HostGroup>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4309,9 +4309,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4326,13 +4326,13 @@ impl super::stub::NetApp for NetApp {
     async fn create_host_group(
         &self,
         req: crate::model::CreateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4370,9 +4370,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4387,13 +4387,13 @@ impl super::stub::NetApp for NetApp {
     async fn update_host_group(
         &self,
         req: crate::model::UpdateHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4452,9 +4452,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4469,13 +4469,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_host_group(
         &self,
         req: crate::model::DeleteHostGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4516,9 +4516,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4533,13 +4533,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4569,9 +4569,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4586,13 +4586,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4629,9 +4629,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4646,14 +4646,13 @@ impl super::stub::NetApp for NetApp {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4695,9 +4694,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4712,13 +4711,13 @@ impl super::stub::NetApp for NetApp {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4759,9 +4758,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4776,13 +4775,13 @@ impl super::stub::NetApp for NetApp {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4823,9 +4822,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4834,24 +4833,25 @@ impl super::stub::NetApp for NetApp {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(None::<gaxi::http::NoBody>, &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
-        use gax::error::binding::BindingError;
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         use gaxi::http::reqwest::{HeaderValue, Method};
         use gaxi::path_parameter::PathMismatchBuilder;
         use gaxi::path_parameter::try_match;
         use gaxi::routing_parameter::Segment;
+        use google_cloud_gax::error::binding::BindingError;
         let (builder, method) = None
             .or_else(|| {
                 let path = format!(
@@ -4892,9 +4892,9 @@ impl super::stub::NetApp for NetApp {
                     );
                     paths.push(builder.build());
                 }
-                gax::error::Error::binding(BindingError { paths })
+                google_cloud_gax::error::Error::binding(BindingError { paths })
             })??;
-        let options = gax::options::internal::set_default_idempotency(
+        let options = google_cloud_gax::options::internal::set_default_idempotency(
             options,
             gaxi::http::default_idempotency(&method),
         );
@@ -4903,25 +4903,26 @@ impl super::stub::NetApp for NetApp {
             HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
         );
         let body = gaxi::http::handle_empty(Some(req), &method);
-        self.inner.execute(builder, body, options).await.map(
-            |r: gax::response::Response<wkt::Empty>| {
+        self.inner
+            .execute(builder, body, options)
+            .await
+            .map(|r: crate::Response<wkt::Empty>| {
                 let (parts, _) = r.into_parts();
-                gax::response::Response::from_parts(parts, ())
-            },
-        )
+                crate::Response::from_parts(parts, ())
+            })
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
diff --git a/src/generated/cloud/networkconnectivity/v1/Cargo.toml b/src/generated/cloud/networkconnectivity/v1/Cargo.toml
index acabe15b75..90261aba0e 100644
--- a/src/generated/cloud/networkconnectivity/v1/Cargo.toml
+++ b/src/generated/cloud/networkconnectivity/v1/Cargo.toml
@@ -40,8 +40,8 @@ all-features = true
 [dependencies]
 async-trait.workspace              = true
 bytes.workspace                    = true
-gax.workspace                      = true
 gaxi                               = { workspace = true, features = ["_internal-http-client"] }
+google-cloud-gax.workspace         = true
 google-cloud-iam-v1.workspace      = true
 google-cloud-location.workspace    = true
 google-cloud-longrunning.workspace = true
diff --git a/src/generated/cloud/networkconnectivity/v1/src/builder.rs b/src/generated/cloud/networkconnectivity/v1/src/builder.rs
index d72fadfae1..98edc22c6a 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/builder.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/builder.rs
@@ -20,7 +20,7 @@ pub mod cross_network_automation_service {
     /// A builder for [CrossNetworkAutomationService][crate::client::CrossNetworkAutomationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::*;
     /// # use builder::cross_network_automation_service::ClientBuilder;
     /// # use client::CrossNetworkAutomationService;
@@ -30,19 +30,18 @@ pub mod cross_network_automation_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::CrossNetworkAutomationService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = CrossNetworkAutomationService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -53,7 +52,7 @@ pub mod cross_network_automation_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::CrossNetworkAutomationService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -66,7 +65,7 @@ pub mod cross_network_automation_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -76,8 +75,8 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::ListServiceConnectionMaps;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -113,7 +112,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -123,15 +122,15 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .list_service_connection_maps(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListServiceConnectionMapsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -140,17 +139,17 @@ pub mod cross_network_automation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceConnectionMapsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -188,8 +187,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceConnectionMaps {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceConnectionMaps {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -199,7 +198,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetServiceConnectionMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -232,7 +231,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -242,7 +241,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_service_connection_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceConnectionMapRequest::name].
@@ -255,8 +254,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceConnectionMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceConnectionMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -266,7 +265,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::CreateServiceConnectionMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -300,7 +299,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -315,7 +314,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .create_service_connection_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service_connection_map`.
@@ -334,7 +333,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -405,8 +404,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateServiceConnectionMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateServiceConnectionMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -416,7 +415,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::UpdateServiceConnectionMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -450,7 +449,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -465,7 +464,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .update_service_connection_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_service_connection_map`.
@@ -484,7 +483,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -559,8 +558,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateServiceConnectionMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateServiceConnectionMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -570,7 +569,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::DeleteServiceConnectionMap;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -604,7 +603,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -619,7 +618,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .delete_service_connection_map(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service_connection_map`.
@@ -631,7 +630,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -692,8 +691,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteServiceConnectionMap {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteServiceConnectionMap {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -703,8 +702,8 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::ListServiceConnectionPolicies;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -740,7 +739,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -750,15 +749,15 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .list_service_connection_policies(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListServiceConnectionPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -767,17 +766,17 @@ pub mod cross_network_automation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceConnectionPoliciesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -815,8 +814,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceConnectionPolicies {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceConnectionPolicies {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -826,7 +825,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetServiceConnectionPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -859,7 +858,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -869,7 +868,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_service_connection_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceConnectionPolicyRequest::name].
@@ -882,8 +881,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceConnectionPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceConnectionPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -893,7 +892,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::CreateServiceConnectionPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -927,7 +926,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -942,7 +941,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .create_service_connection_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service_connection_policy`.
@@ -961,7 +960,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1038,8 +1037,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateServiceConnectionPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateServiceConnectionPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1049,7 +1048,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::UpdateServiceConnectionPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1083,7 +1082,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1098,7 +1097,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .update_service_connection_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_service_connection_policy`.
@@ -1117,7 +1116,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1195,8 +1194,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateServiceConnectionPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateServiceConnectionPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1206,7 +1205,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::DeleteServiceConnectionPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1240,7 +1239,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1255,7 +1254,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .delete_service_connection_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service_connection_policy`.
@@ -1267,7 +1266,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1328,8 +1327,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteServiceConnectionPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteServiceConnectionPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1339,8 +1338,8 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::ListServiceClasses;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1374,7 +1373,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1384,14 +1383,16 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .list_service_classes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListServiceClassesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListServiceClassesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -1399,17 +1400,17 @@ pub mod cross_network_automation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceClassesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1447,8 +1448,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceClasses {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceClasses {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1458,7 +1459,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetServiceClass;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1486,7 +1487,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1496,7 +1497,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_service_class(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceClassRequest::name].
@@ -1509,8 +1510,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceClass {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceClass {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1520,7 +1521,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::UpdateServiceClass;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1552,7 +1553,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1567,7 +1568,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .update_service_class(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_service_class`.
@@ -1584,7 +1585,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1659,8 +1660,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateServiceClass {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateServiceClass {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1670,7 +1671,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::DeleteServiceClass;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -1702,7 +1703,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1717,7 +1718,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .delete_service_class(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service_class`.
@@ -1729,7 +1730,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -1790,8 +1791,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteServiceClass {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteServiceClass {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1801,7 +1802,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetServiceConnectionToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -1834,7 +1835,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1844,7 +1845,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_service_connection_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetServiceConnectionTokenRequest::name].
@@ -1857,8 +1858,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetServiceConnectionToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetServiceConnectionToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1868,8 +1869,8 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::ListServiceConnectionTokens;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -1905,7 +1906,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -1915,15 +1916,15 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .list_service_connection_tokens(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListServiceConnectionTokensResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -1932,17 +1933,17 @@ pub mod cross_network_automation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListServiceConnectionTokensResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -1980,8 +1981,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListServiceConnectionTokens {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListServiceConnectionTokens {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -1991,7 +1992,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::CreateServiceConnectionToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2025,7 +2026,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2040,7 +2041,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .create_service_connection_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_service_connection_token`.
@@ -2059,7 +2060,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2133,8 +2134,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateServiceConnectionToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateServiceConnectionToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2144,7 +2145,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::DeleteServiceConnectionToken;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -2178,7 +2179,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2193,7 +2194,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .delete_service_connection_token(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_service_connection_token`.
@@ -2205,7 +2206,7 @@ pub mod cross_network_automation_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -2266,8 +2267,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteServiceConnectionToken {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteServiceConnectionToken {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2277,8 +2278,8 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2312,7 +2313,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2322,15 +2323,15 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2339,17 +2340,17 @@ pub mod cross_network_automation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2379,8 +2380,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2390,7 +2391,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2421,7 +2422,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2431,7 +2432,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -2442,8 +2443,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2453,7 +2454,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2484,7 +2485,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2494,7 +2495,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -2547,8 +2548,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2558,7 +2559,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2589,7 +2590,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2599,7 +2600,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -2630,8 +2631,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2641,7 +2642,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2674,7 +2675,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2684,7 +2685,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -2710,8 +2711,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2721,8 +2722,8 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -2758,7 +2759,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2768,15 +2769,15 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -2785,17 +2786,17 @@ pub mod cross_network_automation_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -2831,8 +2832,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2842,7 +2843,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2873,7 +2874,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2883,7 +2884,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -2894,8 +2895,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2905,7 +2906,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -2938,7 +2939,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -2948,7 +2949,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -2959,8 +2960,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -2970,7 +2971,7 @@ pub mod cross_network_automation_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::cross_network_automation_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3003,7 +3004,7 @@ pub mod cross_network_automation_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3013,7 +3014,7 @@ pub mod cross_network_automation_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -3024,8 +3025,8 @@ pub mod cross_network_automation_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3037,7 +3038,7 @@ pub mod data_transfer_service {
     /// A builder for [DataTransferService][crate::client::DataTransferService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::*;
     /// # use builder::data_transfer_service::ClientBuilder;
     /// # use client::DataTransferService;
@@ -3047,19 +3048,18 @@ pub mod data_transfer_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::DataTransferService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = DataTransferService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -3070,7 +3070,7 @@ pub mod data_transfer_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::DataTransferService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -3083,7 +3083,7 @@ pub mod data_transfer_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -3093,8 +3093,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::ListMulticloudDataTransferConfigs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3130,7 +3130,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3140,15 +3140,15 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_multicloud_data_transfer_configs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListMulticloudDataTransferConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -3157,17 +3157,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMulticloudDataTransferConfigsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3211,8 +3211,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMulticloudDataTransferConfigs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMulticloudDataTransferConfigs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3222,7 +3222,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::GetMulticloudDataTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3255,7 +3255,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3265,7 +3265,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_multicloud_data_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMulticloudDataTransferConfigRequest::name].
@@ -3278,8 +3278,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMulticloudDataTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMulticloudDataTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3289,7 +3289,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::CreateMulticloudDataTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3323,7 +3323,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3338,7 +3338,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .create_multicloud_data_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_multicloud_data_transfer_config`.
@@ -3357,7 +3357,7 @@ pub mod data_transfer_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3436,8 +3436,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateMulticloudDataTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateMulticloudDataTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3447,7 +3447,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::UpdateMulticloudDataTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3481,7 +3481,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3496,7 +3496,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .update_multicloud_data_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_multicloud_data_transfer_config`.
@@ -3515,7 +3515,7 @@ pub mod data_transfer_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3593,8 +3593,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateMulticloudDataTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateMulticloudDataTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3604,7 +3604,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::DeleteMulticloudDataTransferConfig;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3638,7 +3638,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3653,7 +3653,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .delete_multicloud_data_transfer_config(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_multicloud_data_transfer_config`.
@@ -3665,7 +3665,7 @@ pub mod data_transfer_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -3714,8 +3714,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteMulticloudDataTransferConfig {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteMulticloudDataTransferConfig {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3725,8 +3725,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::ListDestinations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -3760,7 +3760,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3770,14 +3770,16 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_destinations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListDestinationsResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListDestinationsResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -3785,15 +3787,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListDestinationsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListDestinationsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -3837,8 +3841,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListDestinations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListDestinations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3848,7 +3852,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::GetDestination;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -3876,7 +3880,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3886,7 +3890,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_destination(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetDestinationRequest::name].
@@ -3899,8 +3903,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetDestination {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetDestination {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -3910,7 +3914,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::CreateDestination;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -3942,7 +3946,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -3957,7 +3961,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .create_destination(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_destination`.
@@ -3974,7 +3978,7 @@ pub mod data_transfer_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4047,8 +4051,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateDestination {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateDestination {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4058,7 +4062,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::UpdateDestination;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4090,7 +4094,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4105,7 +4109,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .update_destination(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_destination`.
@@ -4122,7 +4126,7 @@ pub mod data_transfer_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4197,8 +4201,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateDestination {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateDestination {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4208,7 +4212,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::DeleteDestination;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -4240,7 +4244,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4255,7 +4259,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .delete_destination(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_destination`.
@@ -4267,7 +4271,7 @@ pub mod data_transfer_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -4316,8 +4320,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteDestination {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteDestination {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4327,7 +4331,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::GetMulticloudDataTransferSupportedService;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4362,7 +4366,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4372,7 +4376,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_multicloud_data_transfer_supported_service(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetMulticloudDataTransferSupportedServiceRequest::name].
@@ -4385,8 +4389,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetMulticloudDataTransferSupportedService {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetMulticloudDataTransferSupportedService {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4396,8 +4400,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::ListMulticloudDataTransferSupportedServices;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4435,7 +4439,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4447,15 +4451,15 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_multicloud_data_transfer_supported_services(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             crate::model::ListMulticloudDataTransferSupportedServicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4464,17 +4468,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListMulticloudDataTransferSupportedServicesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4500,8 +4504,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListMulticloudDataTransferSupportedServices {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListMulticloudDataTransferSupportedServices {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4511,8 +4515,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4546,7 +4550,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4556,15 +4560,15 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -4573,17 +4577,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -4613,8 +4617,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4624,7 +4628,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4655,7 +4659,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4665,7 +4669,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -4676,8 +4680,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4687,7 +4691,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4718,7 +4722,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4728,7 +4732,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -4781,8 +4785,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4792,7 +4796,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4823,7 +4827,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4833,7 +4837,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -4864,8 +4868,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4875,7 +4879,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -4908,7 +4912,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -4918,7 +4922,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -4944,8 +4948,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -4955,8 +4959,8 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -4992,7 +4996,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5002,15 +5006,15 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5019,17 +5023,17 @@ pub mod data_transfer_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5065,8 +5069,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5076,7 +5080,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5107,7 +5111,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5117,7 +5121,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -5128,8 +5132,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5139,7 +5143,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5172,7 +5176,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5182,7 +5186,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -5193,8 +5197,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5204,7 +5208,7 @@ pub mod data_transfer_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::data_transfer_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5237,7 +5241,7 @@ pub mod data_transfer_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5247,7 +5251,7 @@ pub mod data_transfer_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -5258,8 +5262,8 @@ pub mod data_transfer_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5271,7 +5275,7 @@ pub mod hub_service {
     /// A builder for [HubService][crate::client::HubService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::*;
     /// # use builder::hub_service::ClientBuilder;
     /// # use client::HubService;
@@ -5281,19 +5285,18 @@ pub mod hub_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::HubService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = HubService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -5304,7 +5307,7 @@ pub mod hub_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::HubService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -5317,7 +5320,7 @@ pub mod hub_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -5327,8 +5330,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListHubs;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5359,7 +5362,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5369,13 +5372,13 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_hubs(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListHubsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListHubsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5384,15 +5387,15 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListHubsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<crate::model::ListHubsResponse, crate::Error>
         {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -5430,8 +5433,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListHubs {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListHubs {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5441,7 +5444,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetHub;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -5469,7 +5472,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5479,7 +5482,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_hub(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetHubRequest::name].
@@ -5492,8 +5495,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetHub {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetHub {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5503,7 +5506,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::CreateHub;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5532,7 +5535,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5547,7 +5550,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .create_hub(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_hub`.
@@ -5564,7 +5567,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5637,8 +5640,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateHub {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateHub {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5648,7 +5651,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::UpdateHub;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5677,7 +5680,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5692,7 +5695,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .update_hub(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_hub`.
@@ -5709,7 +5712,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5784,8 +5787,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateHub {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateHub {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5795,7 +5798,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::DeleteHub;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -5824,7 +5827,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5839,7 +5842,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .delete_hub(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_hub`.
@@ -5851,7 +5854,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -5894,8 +5897,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteHub {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteHub {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -5905,8 +5908,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListHubSpokes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -5937,7 +5940,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -5947,13 +5950,13 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_hub_spokes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListHubSpokesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListHubSpokesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -5962,15 +5965,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListHubSpokesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListHubSpokesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6028,8 +6033,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListHubSpokes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListHubSpokes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6039,8 +6044,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::QueryHubStatus;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6071,7 +6076,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6081,14 +6086,16 @@ pub mod hub_service {
             (*self.0.stub)
                 .query_hub_status(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::QueryHubStatusResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::QueryHubStatusResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -6096,15 +6103,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::QueryHubStatusResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::QueryHubStatusResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6148,8 +6157,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for QueryHubStatus {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for QueryHubStatus {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6159,8 +6168,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListSpokes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -6191,7 +6200,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6201,13 +6210,13 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_spokes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListSpokesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListSpokesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -6216,15 +6225,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListSpokesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListSpokesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -6262,8 +6273,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListSpokes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListSpokes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6273,7 +6284,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetSpoke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -6301,7 +6312,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6311,7 +6322,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_spoke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetSpokeRequest::name].
@@ -6324,8 +6335,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetSpoke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetSpoke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6335,7 +6346,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::CreateSpoke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6364,7 +6375,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6379,7 +6390,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .create_spoke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_spoke`.
@@ -6396,7 +6407,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6469,8 +6480,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateSpoke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateSpoke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6480,7 +6491,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::UpdateSpoke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6509,7 +6520,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6524,7 +6535,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .update_spoke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_spoke`.
@@ -6541,7 +6552,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6616,8 +6627,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateSpoke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateSpoke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6627,7 +6638,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::RejectHubSpoke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6656,7 +6667,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6671,7 +6682,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .reject_hub_spoke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reject_hub_spoke`.
@@ -6690,7 +6701,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6747,8 +6758,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RejectHubSpoke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RejectHubSpoke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6758,7 +6769,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::AcceptHubSpoke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6787,7 +6798,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6802,7 +6813,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .accept_hub_spoke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `accept_hub_spoke`.
@@ -6821,7 +6832,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -6872,8 +6883,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AcceptHubSpoke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AcceptHubSpoke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -6883,7 +6894,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::AcceptSpokeUpdate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -6915,7 +6926,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -6930,7 +6941,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .accept_spoke_update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `accept_spoke_update`.
@@ -6949,7 +6960,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7008,8 +7019,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for AcceptSpokeUpdate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for AcceptSpokeUpdate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7019,7 +7030,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::RejectSpokeUpdate;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7051,7 +7062,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7066,7 +7077,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .reject_spoke_update(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `reject_spoke_update`.
@@ -7085,7 +7096,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7150,8 +7161,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for RejectSpokeUpdate {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for RejectSpokeUpdate {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7161,7 +7172,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::DeleteSpoke;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7190,7 +7201,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7205,7 +7216,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .delete_spoke(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_spoke`.
@@ -7217,7 +7228,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7260,8 +7271,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteSpoke {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteSpoke {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7271,7 +7282,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetRouteTable;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7299,7 +7310,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7309,7 +7320,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_route_table(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRouteTableRequest::name].
@@ -7322,8 +7333,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRouteTable {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRouteTable {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7333,7 +7344,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7361,7 +7372,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7371,7 +7382,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetRouteRequest::name].
@@ -7384,8 +7395,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7395,8 +7406,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListRoutes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7427,7 +7438,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7437,13 +7448,13 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_routes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRoutesResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListRoutesResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7452,15 +7463,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRoutesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRoutesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7498,8 +7511,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRoutes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRoutes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7509,8 +7522,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListRouteTables;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7541,7 +7554,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7551,14 +7564,16 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_route_tables(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListRouteTablesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListRouteTablesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -7566,15 +7581,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListRouteTablesResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListRouteTablesResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7612,8 +7629,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListRouteTables {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListRouteTables {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7623,7 +7640,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -7651,7 +7668,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7661,7 +7678,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetGroupRequest::name].
@@ -7674,8 +7691,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7685,8 +7702,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListGroups;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7717,7 +7734,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7727,13 +7744,13 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_groups(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListGroupsResponse, gax::error::Error>
+        ) -> impl google_cloud_gax::paginator::Paginator<crate::model::ListGroupsResponse, crate::Error>
         {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -7742,15 +7759,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<crate::model::ListGroupsResponse, gax::error::Error>
-        {
-            use gax::paginator::Paginator;
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
+            crate::model::ListGroupsResponse,
+            crate::Error,
+        > {
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -7788,8 +7807,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListGroups {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListGroups {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7799,7 +7818,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::UpdateGroup;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -7828,7 +7847,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7843,7 +7862,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .update_group(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_group`.
@@ -7860,7 +7879,7 @@ pub mod hub_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -7935,8 +7954,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateGroup {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateGroup {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -7946,8 +7965,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -7981,7 +8000,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -7991,15 +8010,15 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8008,17 +8027,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8048,8 +8067,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8059,7 +8078,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8090,7 +8109,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8100,7 +8119,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -8111,8 +8130,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8122,7 +8141,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8153,7 +8172,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8163,7 +8182,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -8216,8 +8235,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8227,7 +8246,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8258,7 +8277,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8268,7 +8287,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -8299,8 +8318,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8310,7 +8329,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8343,7 +8362,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8353,7 +8372,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -8379,8 +8398,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8390,8 +8409,8 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8427,7 +8446,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8437,15 +8456,15 @@ pub mod hub_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -8454,17 +8473,17 @@ pub mod hub_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8500,8 +8519,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8511,7 +8530,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8542,7 +8561,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8552,7 +8571,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -8563,8 +8582,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8574,7 +8593,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8607,7 +8626,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8617,7 +8636,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -8628,8 +8647,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8639,7 +8658,7 @@ pub mod hub_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::hub_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8672,7 +8691,7 @@ pub mod hub_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8682,7 +8701,7 @@ pub mod hub_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -8693,8 +8712,8 @@ pub mod hub_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8706,7 +8725,7 @@ pub mod internal_range_service {
     /// A builder for [InternalRangeService][crate::client::InternalRangeService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::*;
     /// # use builder::internal_range_service::ClientBuilder;
     /// # use client::InternalRangeService;
@@ -8716,19 +8735,18 @@ pub mod internal_range_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::InternalRangeService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = InternalRangeService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -8739,7 +8757,7 @@ pub mod internal_range_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::InternalRangeService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -8752,7 +8770,7 @@ pub mod internal_range_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -8762,8 +8780,8 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::ListInternalRanges;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -8797,7 +8815,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8807,14 +8825,16 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .list_internal_ranges(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListInternalRangesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListInternalRangesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -8822,17 +8842,17 @@ pub mod internal_range_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListInternalRangesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -8870,8 +8890,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListInternalRanges {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListInternalRanges {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8881,7 +8901,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::GetInternalRange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -8912,7 +8932,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8922,7 +8942,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .get_internal_range(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetInternalRangeRequest::name].
@@ -8935,8 +8955,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetInternalRange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetInternalRange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -8946,7 +8966,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::CreateInternalRange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -8978,7 +8998,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -8993,7 +9013,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .create_internal_range(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_internal_range`.
@@ -9010,7 +9030,7 @@ pub mod internal_range_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9081,8 +9101,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreateInternalRange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreateInternalRange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9092,7 +9112,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::UpdateInternalRange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9124,7 +9144,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9139,7 +9159,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .update_internal_range(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `update_internal_range`.
@@ -9156,7 +9176,7 @@ pub mod internal_range_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9231,8 +9251,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for UpdateInternalRange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for UpdateInternalRange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9242,7 +9262,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::DeleteInternalRange;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -9274,7 +9294,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9289,7 +9309,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .delete_internal_range(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_internal_range`.
@@ -9301,7 +9321,7 @@ pub mod internal_range_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -9344,8 +9364,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteInternalRange {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteInternalRange {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9355,8 +9375,8 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9390,7 +9410,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9400,15 +9420,15 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9417,17 +9437,17 @@ pub mod internal_range_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9457,8 +9477,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9468,7 +9488,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9499,7 +9519,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9509,7 +9529,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -9520,8 +9540,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9531,7 +9551,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9562,7 +9582,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9572,7 +9592,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -9625,8 +9645,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9636,7 +9656,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9667,7 +9687,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9677,7 +9697,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -9708,8 +9728,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9719,7 +9739,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9752,7 +9772,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9762,7 +9782,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -9788,8 +9808,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9799,8 +9819,8 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -9836,7 +9856,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9846,15 +9866,15 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -9863,17 +9883,17 @@ pub mod internal_range_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -9909,8 +9929,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9920,7 +9940,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -9951,7 +9971,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -9961,7 +9981,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -9972,8 +9992,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -9983,7 +10003,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10016,7 +10036,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10026,7 +10046,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -10037,8 +10057,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10048,7 +10068,7 @@ pub mod internal_range_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::internal_range_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10081,7 +10101,7 @@ pub mod internal_range_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10091,7 +10111,7 @@ pub mod internal_range_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -10102,8 +10122,8 @@ pub mod internal_range_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10115,7 +10135,7 @@ pub mod policy_based_routing_service {
     /// A builder for [PolicyBasedRoutingService][crate::client::PolicyBasedRoutingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::*;
     /// # use builder::policy_based_routing_service::ClientBuilder;
     /// # use client::PolicyBasedRoutingService;
@@ -10125,19 +10145,18 @@ pub mod policy_based_routing_service {
     ///     .build().await?;
     /// # Ok(()) }
     /// ```
-    pub type ClientBuilder =
-        gax::client_builder::ClientBuilder<client::Factory, gaxi::options::Credentials>;
+    pub type ClientBuilder = crate::ClientBuilder<client::Factory, gaxi::options::Credentials>;
 
     pub(crate) mod client {
         use super::super::super::client::PolicyBasedRoutingService;
         pub struct Factory;
-        impl gax::client_builder::internal::ClientFactory for Factory {
+        impl crate::ClientFactory for Factory {
             type Client = PolicyBasedRoutingService;
             type Credentials = gaxi::options::Credentials;
             async fn build(
                 self,
                 config: gaxi::options::ClientConfig,
-            ) -> gax::client_builder::Result<Self::Client> {
+            ) -> crate::ClientBuilderResult<Self::Client> {
                 Self::Client::new(config).await
             }
         }
@@ -10148,7 +10167,7 @@ pub mod policy_based_routing_service {
     pub(crate) struct RequestBuilder<R: std::default::Default> {
         stub: std::sync::Arc<dyn super::super::stub::dynamic::PolicyBasedRoutingService>,
         request: R,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     }
 
     impl<R> RequestBuilder<R>
@@ -10161,7 +10180,7 @@ pub mod policy_based_routing_service {
             Self {
                 stub,
                 request: R::default(),
-                options: gax::options::RequestOptions::default(),
+                options: crate::RequestOptions::default(),
             }
         }
     }
@@ -10171,8 +10190,8 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::ListPolicyBasedRoutes;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10206,7 +10225,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10216,14 +10235,16 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .list_policy_based_routes(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<crate::model::ListPolicyBasedRoutesResponse, gax::error::Error>
-        {
+        ) -> impl google_cloud_gax::paginator::Paginator<
+            crate::model::ListPolicyBasedRoutesResponse,
+            crate::Error,
+        > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
             let execute = move |token: String| {
@@ -10231,17 +10252,17 @@ pub mod policy_based_routing_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             crate::model::ListPolicyBasedRoutesResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10279,8 +10300,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListPolicyBasedRoutes {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListPolicyBasedRoutes {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10290,7 +10311,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::GetPolicyBasedRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10321,7 +10342,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10331,7 +10352,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .get_policy_based_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][crate::model::GetPolicyBasedRouteRequest::name].
@@ -10344,8 +10365,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetPolicyBasedRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetPolicyBasedRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10355,7 +10376,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::CreatePolicyBasedRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10387,7 +10408,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10402,7 +10423,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .create_policy_based_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `create_policy_based_route`.
@@ -10419,7 +10440,7 @@ pub mod policy_based_routing_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10492,8 +10513,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CreatePolicyBasedRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CreatePolicyBasedRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10503,7 +10524,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::DeletePolicyBasedRoute;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     /// use google_cloud_lro::Poller;
     ///
     /// let builder = prepare_request_builder();
@@ -10535,7 +10556,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10550,7 +10571,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .delete_policy_based_route(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Creates a [Poller][google_cloud_lro::Poller] to work with `delete_policy_based_route`.
@@ -10562,7 +10583,7 @@ pub mod policy_based_routing_service {
 
             let stub = self.0.stub.clone();
             let mut options = self.0.options.clone();
-            options.set_retry_policy(gax::retry_policy::NeverRetry);
+            options.set_retry_policy(google_cloud_gax::retry_policy::NeverRetry);
             let query = move |name| {
                 let stub = stub.clone();
                 let options = options.clone();
@@ -10605,8 +10626,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeletePolicyBasedRoute {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeletePolicyBasedRoute {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10616,8 +10637,8 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::ListLocations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -10651,7 +10672,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10661,15 +10682,15 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .list_locations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -10678,17 +10699,17 @@ pub mod policy_based_routing_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_location::model::ListLocationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -10718,8 +10739,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListLocations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListLocations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10729,7 +10750,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::GetLocation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10760,7 +10781,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10770,7 +10791,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .get_location(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_location::model::GetLocationRequest::name].
@@ -10781,8 +10802,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetLocation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetLocation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10792,7 +10813,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::SetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10823,7 +10844,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10833,7 +10854,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .set_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::SetIamPolicyRequest::resource].
@@ -10886,8 +10907,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for SetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for SetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10897,7 +10918,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::GetIamPolicy;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -10928,7 +10949,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -10938,7 +10959,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .get_iam_policy(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::GetIamPolicyRequest::resource].
@@ -10969,8 +10990,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetIamPolicy {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetIamPolicy {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -10980,7 +11001,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::TestIamPermissions;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11013,7 +11034,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11023,7 +11044,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .test_iam_permissions(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [resource][google_cloud_iam_v1::model::TestIamPermissionsRequest::resource].
@@ -11049,8 +11070,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for TestIamPermissions {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for TestIamPermissions {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11060,8 +11081,8 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::ListOperations;
-    /// # async fn sample() -> gax::Result<()> {
-    /// use gax::paginator::ItemPaginator;
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
+    /// use google_cloud_gax::paginator::ItemPaginator;
     ///
     /// let builder = prepare_request_builder();
     /// let mut items = builder.by_item();
@@ -11097,7 +11118,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11107,15 +11128,15 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .list_operations(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Streams each page in the collection.
         pub fn by_page(
             self,
-        ) -> impl gax::paginator::Paginator<
+        ) -> impl google_cloud_gax::paginator::Paginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
             use std::clone::Clone;
             let token = self.0.request.page_token.clone();
@@ -11124,17 +11145,17 @@ pub mod policy_based_routing_service {
                 builder.0.request = builder.0.request.set_page_token(token);
                 builder.send()
             };
-            gax::paginator::internal::new_paginator(token, execute)
+            google_cloud_gax::paginator::internal::new_paginator(token, execute)
         }
 
         /// Streams each item in the collection.
         pub fn by_item(
             self,
-        ) -> impl gax::paginator::ItemPaginator<
+        ) -> impl google_cloud_gax::paginator::ItemPaginator<
             google_cloud_longrunning::model::ListOperationsResponse,
-            gax::error::Error,
+            crate::Error,
         > {
-            use gax::paginator::Paginator;
+            use google_cloud_gax::paginator::Paginator;
             self.by_page().items()
         }
 
@@ -11170,8 +11191,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for ListOperations {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for ListOperations {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11181,7 +11202,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::GetOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11212,7 +11233,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11222,7 +11243,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .get_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::GetOperationRequest::name].
@@ -11233,8 +11254,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for GetOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for GetOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11244,7 +11265,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::DeleteOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11277,7 +11298,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11287,7 +11308,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .delete_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::DeleteOperationRequest::name].
@@ -11298,8 +11319,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for DeleteOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for DeleteOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
@@ -11309,7 +11330,7 @@ pub mod policy_based_routing_service {
     /// # Example
     /// ```
     /// # use google_cloud_networkconnectivity_v1::builder::policy_based_routing_service::CancelOperation;
-    /// # async fn sample() -> gax::Result<()> {
+    /// # async fn sample() -> google_cloud_networkconnectivity_v1::Result<()> {
     ///
     /// let builder = prepare_request_builder();
     /// let response = builder.send().await?;
@@ -11342,7 +11363,7 @@ pub mod policy_based_routing_service {
         }
 
         /// Sets all the options, replacing any prior values.
-        pub fn with_options<V: Into<gax::options::RequestOptions>>(mut self, v: V) -> Self {
+        pub fn with_options<V: Into<crate::RequestOptions>>(mut self, v: V) -> Self {
             self.0.options = v.into();
             self
         }
@@ -11352,7 +11373,7 @@ pub mod policy_based_routing_service {
             (*self.0.stub)
                 .cancel_operation(self.0.request, self.0.options)
                 .await
-                .map(gax::response::Response::into_body)
+                .map(crate::Response::into_body)
         }
 
         /// Sets the value of [name][google_cloud_longrunning::model::CancelOperationRequest::name].
@@ -11363,8 +11384,8 @@ pub mod policy_based_routing_service {
     }
 
     #[doc(hidden)]
-    impl gax::options::internal::RequestBuilder for CancelOperation {
-        fn request_options(&mut self) -> &mut gax::options::RequestOptions {
+    impl crate::RequestBuilder for CancelOperation {
+        fn request_options(&mut self) -> &mut crate::RequestOptions {
             &mut self.0.options
         }
     }
diff --git a/src/generated/cloud/networkconnectivity/v1/src/client.rs b/src/generated/cloud/networkconnectivity/v1/src/client.rs
index f795a45c55..60aa6309dc 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/client.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/client.rs
@@ -20,7 +20,7 @@
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_networkconnectivity_v1::client::CrossNetworkAutomationService;
 /// let client = CrossNetworkAutomationService::builder().build().await?;
 /// // use `client` to make requests to the Network Connectivity API.
@@ -66,15 +66,13 @@ impl CrossNetworkAutomationService {
     /// Returns a builder for [CrossNetworkAutomationService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::client::CrossNetworkAutomationService;
     /// let client = CrossNetworkAutomationService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::cross_network_automation_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::cross_network_automation_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::cross_network_automation_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -92,14 +90,14 @@ impl CrossNetworkAutomationService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::CrossNetworkAutomationService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -110,13 +108,13 @@ impl CrossNetworkAutomationService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CrossNetworkAutomationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CrossNetworkAutomationService> {
         super::transport::CrossNetworkAutomationService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::CrossNetworkAutomationService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::CrossNetworkAutomationService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::CrossNetworkAutomationService::new)
@@ -463,7 +461,7 @@ impl CrossNetworkAutomationService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_networkconnectivity_v1::client::DataTransferService;
 /// let client = DataTransferService::builder().build().await?;
 /// // use `client` to make requests to the Network Connectivity API.
@@ -509,15 +507,13 @@ impl DataTransferService {
     /// Returns a builder for [DataTransferService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::client::DataTransferService;
     /// let client = DataTransferService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::data_transfer_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::data_transfer_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::data_transfer_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -535,14 +531,14 @@ impl DataTransferService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::DataTransferService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::DataTransferService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -552,13 +548,13 @@ impl DataTransferService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataTransferService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataTransferService> {
         super::transport::DataTransferService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::DataTransferService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::DataTransferService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::DataTransferService::new)
@@ -788,7 +784,7 @@ impl DataTransferService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_networkconnectivity_v1::client::HubService;
 /// let client = HubService::builder().build().await?;
 /// // use `client` to make requests to the Network Connectivity API.
@@ -836,13 +832,13 @@ impl HubService {
     /// Returns a builder for [HubService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::client::HubService;
     /// let client = HubService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::hub_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(super::builder::hub_service::client::Factory)
+        crate::new_client_builder(super::builder::hub_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -860,14 +856,14 @@ impl HubService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::HubService>> {
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::HubService>> {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
         }
@@ -876,13 +872,13 @@ impl HubService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HubService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HubService> {
         super::transport::HubService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::HubService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::HubService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::HubService::new)
@@ -1191,7 +1187,7 @@ impl HubService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_networkconnectivity_v1::client::InternalRangeService;
 /// let client = InternalRangeService::builder().build().await?;
 /// // use `client` to make requests to the Network Connectivity API.
@@ -1238,15 +1234,13 @@ impl InternalRangeService {
     /// Returns a builder for [InternalRangeService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::client::InternalRangeService;
     /// let client = InternalRangeService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::internal_range_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::internal_range_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::internal_range_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1264,14 +1258,14 @@ impl InternalRangeService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<std::sync::Arc<dyn super::stub::dynamic::InternalRangeService>>
+    ) -> crate::ClientBuilderResult<std::sync::Arc<dyn super::stub::dynamic::InternalRangeService>>
     {
         if gaxi::options::tracing_enabled(&conf) {
             return Ok(std::sync::Arc::new(Self::build_with_tracing(conf).await?));
@@ -1281,13 +1275,13 @@ impl InternalRangeService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InternalRangeService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InternalRangeService> {
         super::transport::InternalRangeService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::InternalRangeService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::InternalRangeService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::InternalRangeService::new)
@@ -1427,7 +1421,7 @@ impl InternalRangeService {
 ///
 /// # Example
 /// ```
-/// # async fn sample() -> gax::client_builder::Result<()> {
+/// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
 /// # use google_cloud_networkconnectivity_v1::client::PolicyBasedRoutingService;
 /// let client = PolicyBasedRoutingService::builder().build().await?;
 /// // use `client` to make requests to the Network Connectivity API.
@@ -1474,15 +1468,13 @@ impl PolicyBasedRoutingService {
     /// Returns a builder for [PolicyBasedRoutingService].
     ///
     /// ```
-    /// # async fn sample() -> gax::client_builder::Result<()> {
+    /// # async fn sample() -> google_cloud_gax::client_builder::Result<()> {
     /// # use google_cloud_networkconnectivity_v1::client::PolicyBasedRoutingService;
     /// let client = PolicyBasedRoutingService::builder().build().await?;
     /// # Ok(()) }
     /// ```
     pub fn builder() -> super::builder::policy_based_routing_service::ClientBuilder {
-        gax::client_builder::internal::new_builder(
-            super::builder::policy_based_routing_service::client::Factory,
-        )
+        crate::new_client_builder(super::builder::policy_based_routing_service::client::Factory)
     }
 
     /// Creates a new client from the provided stub.
@@ -1500,14 +1492,14 @@ impl PolicyBasedRoutingService {
 
     pub(crate) async fn new(
         config: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<Self> {
+    ) -> crate::ClientBuilderResult<Self> {
         let inner = Self::build_inner(config).await?;
         Ok(Self { inner })
     }
 
     async fn build_inner(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<
+    ) -> crate::ClientBuilderResult<
         std::sync::Arc<dyn super::stub::dynamic::PolicyBasedRoutingService>,
     > {
         if gaxi::options::tracing_enabled(&conf) {
@@ -1518,13 +1510,13 @@ impl PolicyBasedRoutingService {
 
     async fn build_transport(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PolicyBasedRoutingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PolicyBasedRoutingService> {
         super::transport::PolicyBasedRoutingService::new(conf).await
     }
 
     async fn build_with_tracing(
         conf: gaxi::options::ClientConfig,
-    ) -> gax::client_builder::Result<impl super::stub::PolicyBasedRoutingService> {
+    ) -> crate::ClientBuilderResult<impl super::stub::PolicyBasedRoutingService> {
         Self::build_transport(conf)
             .await
             .map(super::tracing::PolicyBasedRoutingService::new)
diff --git a/src/generated/cloud/networkconnectivity/v1/src/lib.rs b/src/generated/cloud/networkconnectivity/v1/src/lib.rs
index 5099876af2..57f18774f1 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/lib.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/lib.rs
@@ -50,8 +50,8 @@
 #[allow(clippy::module_inception)]
 pub mod model;
 
-pub use gax::Result;
-pub use gax::error::Error;
+pub use google_cloud_gax::Result;
+pub use google_cloud_gax::error::Error;
 
 #[allow(rustdoc::invalid_html_tags)]
 #[allow(rustdoc::redundant_explicit_links)]
@@ -86,3 +86,12 @@ pub(crate) mod info {
         };
     }
 }
+
+// Define some shortcuts for imported crates.
+pub(crate) use google_cloud_gax::client_builder::ClientBuilder;
+pub(crate) use google_cloud_gax::client_builder::Result as ClientBuilderResult;
+pub(crate) use google_cloud_gax::client_builder::internal::ClientFactory;
+pub(crate) use google_cloud_gax::client_builder::internal::new_builder as new_client_builder;
+pub(crate) use google_cloud_gax::options::RequestOptions;
+pub(crate) use google_cloud_gax::options::internal::RequestBuilder;
+pub(crate) use google_cloud_gax::response::Response;
diff --git a/src/generated/cloud/networkconnectivity/v1/src/model.rs b/src/generated/cloud/networkconnectivity/v1/src/model.rs
index c3c567ffe1..4d5a6ccf0a 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/model.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/model.rs
@@ -19,8 +19,8 @@
 #![no_implicit_prelude]
 extern crate async_trait;
 extern crate bytes;
-extern crate gax;
 extern crate gaxi;
+extern crate google_cloud_gax;
 extern crate google_cloud_iam_v1;
 extern crate google_cloud_location;
 extern crate google_cloud_longrunning;
@@ -1709,7 +1709,7 @@ impl wkt::message::Message for ListServiceConnectionMapsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceConnectionMapsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServiceConnectionMapsResponse {
     type PageItem = crate::model::ServiceConnectionMap;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -3384,7 +3384,9 @@ impl wkt::message::Message for ListServiceConnectionPoliciesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceConnectionPoliciesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListServiceConnectionPoliciesResponse
+{
     type PageItem = crate::model::ServiceConnectionPolicy;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4145,7 +4147,7 @@ impl wkt::message::Message for ListServiceClassesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceClassesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListServiceClassesResponse {
     type PageItem = crate::model::ServiceClass;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -4838,7 +4840,9 @@ impl wkt::message::Message for ListServiceConnectionTokensResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListServiceConnectionTokensResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListServiceConnectionTokensResponse
+{
     type PageItem = crate::model::ServiceConnectionToken;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -5557,7 +5561,9 @@ impl wkt::message::Message for ListMulticloudDataTransferConfigsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListMulticloudDataTransferConfigsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse
+    for ListMulticloudDataTransferConfigsResponse
+{
     type PageItem = crate::model::MulticloudDataTransferConfig;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -6658,7 +6664,7 @@ impl wkt::message::Message for ListDestinationsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListDestinationsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListDestinationsResponse {
     type PageItem = crate::model::Destination;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -7771,7 +7777,7 @@ impl wkt::message::Message for ListMulticloudDataTransferSupportedServicesRespon
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse
+impl google_cloud_gax::paginator::internal::PageableResponse
     for ListMulticloudDataTransferSupportedServicesResponse
 {
     type PageItem = crate::model::MulticloudDataTransferSupportedService;
@@ -10031,7 +10037,7 @@ impl wkt::message::Message for ListHubsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListHubsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListHubsResponse {
     type PageItem = crate::model::Hub;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10766,7 +10772,7 @@ impl wkt::message::Message for ListHubSpokesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListHubSpokesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListHubSpokesResponse {
     type PageItem = crate::model::Spoke;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -10983,7 +10989,7 @@ impl wkt::message::Message for QueryHubStatusResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for QueryHubStatusResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for QueryHubStatusResponse {
     type PageItem = crate::model::HubStatusEntry;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -11591,7 +11597,7 @@ impl wkt::message::Message for ListSpokesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListSpokesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListSpokesResponse {
     type PageItem = crate::model::Spoke;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -12819,7 +12825,7 @@ impl wkt::message::Message for ListRoutesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRoutesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRoutesResponse {
     type PageItem = crate::model::Route;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13016,7 +13022,7 @@ impl wkt::message::Message for ListRouteTablesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListRouteTablesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListRouteTablesResponse {
     type PageItem = crate::model::RouteTable;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -13213,7 +13219,7 @@ impl wkt::message::Message for ListGroupsResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListGroupsResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListGroupsResponse {
     type PageItem = crate::model::Group;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -15941,7 +15947,7 @@ impl wkt::message::Message for ListInternalRangesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListInternalRangesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListInternalRangesResponse {
     type PageItem = crate::model::InternalRange;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
@@ -17654,7 +17660,7 @@ impl wkt::message::Message for ListPolicyBasedRoutesResponse {
 }
 
 #[doc(hidden)]
-impl gax::paginator::internal::PageableResponse for ListPolicyBasedRoutesResponse {
+impl google_cloud_gax::paginator::internal::PageableResponse for ListPolicyBasedRoutesResponse {
     type PageItem = crate::model::PolicyBasedRoute;
 
     fn items(self) -> std::vec::Vec<Self::PageItem> {
diff --git a/src/generated/cloud/networkconnectivity/v1/src/stub.rs b/src/generated/cloud/networkconnectivity/v1/src/stub.rs
index df4a4b64e1..4a75512831 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/stub.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/stub.rs
@@ -42,11 +42,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn list_service_connection_maps(
         &self,
         _req: crate::model::ListServiceConnectionMapsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListServiceConnectionMapsResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListServiceConnectionMapsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -55,9 +53,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_service_connection_map(
         &self,
         _req: crate::model::GetServiceConnectionMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceConnectionMap>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceConnectionMap>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -66,9 +64,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn create_service_connection_map(
         &self,
         _req: crate::model::CreateServiceConnectionMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -77,9 +75,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn update_service_connection_map(
         &self,
         _req: crate::model::UpdateServiceConnectionMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -88,9 +86,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn delete_service_connection_map(
         &self,
         _req: crate::model::DeleteServiceConnectionMapRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -99,10 +97,10 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn list_service_connection_policies(
         &self,
         _req: crate::model::ListServiceConnectionPoliciesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListServiceConnectionPoliciesResponse>,
+            crate::Response<crate::model::ListServiceConnectionPoliciesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -112,9 +110,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_service_connection_policy(
         &self,
         _req: crate::model::GetServiceConnectionPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceConnectionPolicy>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceConnectionPolicy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -123,9 +121,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn create_service_connection_policy(
         &self,
         _req: crate::model::CreateServiceConnectionPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -134,9 +132,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn update_service_connection_policy(
         &self,
         _req: crate::model::UpdateServiceConnectionPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -145,9 +143,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn delete_service_connection_policy(
         &self,
         _req: crate::model::DeleteServiceConnectionPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -156,9 +154,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn list_service_classes(
         &self,
         _req: crate::model::ListServiceClassesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListServiceClassesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListServiceClassesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -167,9 +165,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_service_class(
         &self,
         _req: crate::model::GetServiceClassRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceClass>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceClass>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -178,9 +176,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn update_service_class(
         &self,
         _req: crate::model::UpdateServiceClassRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -189,9 +187,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn delete_service_class(
         &self,
         _req: crate::model::DeleteServiceClassRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -200,9 +198,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_service_connection_token(
         &self,
         _req: crate::model::GetServiceConnectionTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ServiceConnectionToken>>,
+        Output = crate::Result<crate::Response<crate::model::ServiceConnectionToken>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -211,11 +209,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn list_service_connection_tokens(
         &self,
         _req: crate::model::ListServiceConnectionTokensRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListServiceConnectionTokensResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListServiceConnectionTokensResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -224,9 +220,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn create_service_connection_token(
         &self,
         _req: crate::model::CreateServiceConnectionTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -235,9 +231,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn delete_service_connection_token(
         &self,
         _req: crate::model::DeleteServiceConnectionTokenRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -246,10 +242,10 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -259,9 +255,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -270,9 +266,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -281,9 +277,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -292,10 +288,10 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -305,10 +301,10 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -318,9 +314,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -329,8 +325,8 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -338,8 +334,8 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -349,9 +345,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -360,9 +356,9 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -382,10 +378,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_multicloud_data_transfer_configs(
         &self,
         _req: crate::model::ListMulticloudDataTransferConfigsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::ListMulticloudDataTransferConfigsResponse>,
+            crate::Response<crate::model::ListMulticloudDataTransferConfigsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -395,9 +391,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_multicloud_data_transfer_config(
         &self,
         _req: crate::model::GetMulticloudDataTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::MulticloudDataTransferConfig>>,
+        Output = crate::Result<crate::Response<crate::model::MulticloudDataTransferConfig>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -406,9 +402,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn create_multicloud_data_transfer_config(
         &self,
         _req: crate::model::CreateMulticloudDataTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -417,9 +413,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn update_multicloud_data_transfer_config(
         &self,
         _req: crate::model::UpdateMulticloudDataTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -428,9 +424,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn delete_multicloud_data_transfer_config(
         &self,
         _req: crate::model::DeleteMulticloudDataTransferConfigRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -439,9 +435,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_destinations(
         &self,
         _req: crate::model::ListDestinationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListDestinationsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListDestinationsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -450,10 +446,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_destination(
         &self,
         _req: crate::model::GetDestinationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Destination>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Destination>>>
+    + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -461,9 +456,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn create_destination(
         &self,
         _req: crate::model::CreateDestinationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -472,9 +467,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn update_destination(
         &self,
         _req: crate::model::UpdateDestinationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -483,9 +478,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn delete_destination(
         &self,
         _req: crate::model::DeleteDestinationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -494,10 +489,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_multicloud_data_transfer_supported_service(
         &self,
         _req: crate::model::GetMulticloudDataTransferSupportedServiceRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<crate::model::MulticloudDataTransferSupportedService>,
+            crate::Response<crate::model::MulticloudDataTransferSupportedService>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -507,12 +502,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_multicloud_data_transfer_supported_services(
         &self,
         _req: crate::model::ListMulticloudDataTransferSupportedServicesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<
-                crate::model::ListMulticloudDataTransferSupportedServicesResponse,
-            >,
+            crate::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -522,10 +515,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -535,9 +528,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -546,9 +539,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -557,9 +550,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -568,10 +561,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -581,10 +574,10 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -594,9 +587,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -605,8 +598,8 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -614,8 +607,8 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -625,9 +618,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -636,9 +629,9 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -658,9 +651,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_hubs(
         &self,
         _req: crate::model::ListHubsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListHubsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListHubsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -669,9 +662,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_hub(
         &self,
         _req: crate::model::GetHubRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<crate::model::Hub>>>
-    + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Hub>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -679,9 +672,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn create_hub(
         &self,
         _req: crate::model::CreateHubRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -690,9 +683,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn update_hub(
         &self,
         _req: crate::model::UpdateHubRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -701,9 +694,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn delete_hub(
         &self,
         _req: crate::model::DeleteHubRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -712,9 +705,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_hub_spokes(
         &self,
         _req: crate::model::ListHubSpokesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListHubSpokesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListHubSpokesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -723,9 +716,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn query_hub_status(
         &self,
         _req: crate::model::QueryHubStatusRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::QueryHubStatusResponse>>,
+        Output = crate::Result<crate::Response<crate::model::QueryHubStatusResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -734,9 +727,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_spokes(
         &self,
         _req: crate::model::ListSpokesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListSpokesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListSpokesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -745,10 +738,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_spoke(
         &self,
         _req: crate::model::GetSpokeRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Spoke>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Spoke>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -756,9 +748,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn create_spoke(
         &self,
         _req: crate::model::CreateSpokeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -767,9 +759,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn update_spoke(
         &self,
         _req: crate::model::UpdateSpokeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -778,9 +770,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn reject_hub_spoke(
         &self,
         _req: crate::model::RejectHubSpokeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -789,9 +781,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn accept_hub_spoke(
         &self,
         _req: crate::model::AcceptHubSpokeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -800,9 +792,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn accept_spoke_update(
         &self,
         _req: crate::model::AcceptSpokeUpdateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -811,9 +803,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn reject_spoke_update(
         &self,
         _req: crate::model::RejectSpokeUpdateRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -822,9 +814,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn delete_spoke(
         &self,
         _req: crate::model::DeleteSpokeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -833,10 +825,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_route_table(
         &self,
         _req: crate::model::GetRouteTableRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::RouteTable>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::RouteTable>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -844,10 +835,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_route(
         &self,
         _req: crate::model::GetRouteRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Route>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Route>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -855,9 +845,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_routes(
         &self,
         _req: crate::model::ListRoutesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRoutesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRoutesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -866,9 +856,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_route_tables(
         &self,
         _req: crate::model::ListRouteTablesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListRouteTablesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListRouteTablesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -877,10 +867,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_group(
         &self,
         _req: crate::model::GetGroupRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::Group>>,
-    > + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<crate::model::Group>>> + Send
+    {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -888,9 +877,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_groups(
         &self,
         _req: crate::model::ListGroupsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListGroupsResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListGroupsResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -899,9 +888,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn update_group(
         &self,
         _req: crate::model::UpdateGroupRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -910,10 +899,10 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -923,9 +912,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -934,9 +923,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -945,9 +934,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -956,10 +945,10 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -969,10 +958,10 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -982,9 +971,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -993,8 +982,8 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1002,8 +991,8 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1013,9 +1002,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1024,9 +1013,9 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1046,9 +1035,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn list_internal_ranges(
         &self,
         _req: crate::model::ListInternalRangesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::ListInternalRangesResponse>>,
+        Output = crate::Result<crate::Response<crate::model::ListInternalRangesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1057,9 +1046,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn get_internal_range(
         &self,
         _req: crate::model::GetInternalRangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::InternalRange>>,
+        Output = crate::Result<crate::Response<crate::model::InternalRange>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1068,9 +1057,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn create_internal_range(
         &self,
         _req: crate::model::CreateInternalRangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1079,9 +1068,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn update_internal_range(
         &self,
         _req: crate::model::UpdateInternalRangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1090,9 +1079,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn delete_internal_range(
         &self,
         _req: crate::model::DeleteInternalRangeRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1101,10 +1090,10 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1114,9 +1103,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1125,9 +1114,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1136,9 +1125,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1147,10 +1136,10 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1160,10 +1149,10 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1173,9 +1162,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1184,8 +1173,8 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1193,8 +1182,8 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1204,9 +1193,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1215,9 +1204,9 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
 
@@ -1237,11 +1226,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn list_policy_based_routes(
         &self,
         _req: crate::model::ListPolicyBasedRoutesRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<
-            gax::response::Response<crate::model::ListPolicyBasedRoutesResponse>,
-        >,
+        Output = crate::Result<crate::Response<crate::model::ListPolicyBasedRoutesResponse>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1250,9 +1237,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn get_policy_based_route(
         &self,
         _req: crate::model::GetPolicyBasedRouteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<crate::model::PolicyBasedRoute>>,
+        Output = crate::Result<crate::Response<crate::model::PolicyBasedRoute>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1261,9 +1248,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn create_policy_based_route(
         &self,
         _req: crate::model::CreatePolicyBasedRouteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1272,9 +1259,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn delete_policy_based_route(
         &self,
         _req: crate::model::DeletePolicyBasedRouteRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1283,10 +1270,10 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn list_locations(
         &self,
         _req: google_cloud_location::model::ListLocationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_location::model::ListLocationsResponse>,
+            crate::Response<google_cloud_location::model::ListLocationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1296,9 +1283,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn get_location(
         &self,
         _req: google_cloud_location::model::GetLocationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_location::model::Location>>,
+        Output = crate::Result<crate::Response<google_cloud_location::model::Location>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1307,9 +1294,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn set_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1318,9 +1305,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn get_iam_policy(
         &self,
         _req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>,
+        Output = crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1329,10 +1316,10 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn test_iam_permissions(
         &self,
         _req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
+            crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1342,10 +1329,10 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn list_operations(
         &self,
         _req: google_cloud_longrunning::model::ListOperationsRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
         Output = crate::Result<
-            gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
+            crate::Response<google_cloud_longrunning::model::ListOperationsResponse>,
         >,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
@@ -1355,9 +1342,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn get_operation(
         &self,
         _req: google_cloud_longrunning::model::GetOperationRequest,
-        _options: gax::options::RequestOptions,
+        _options: crate::RequestOptions,
     ) -> impl std::future::Future<
-        Output = crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>,
+        Output = crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>,
     > + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
@@ -1366,8 +1353,8 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn delete_operation(
         &self,
         _req: google_cloud_longrunning::model::DeleteOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1375,8 +1362,8 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     fn cancel_operation(
         &self,
         _req: google_cloud_longrunning::model::CancelOperationRequest,
-        _options: gax::options::RequestOptions,
-    ) -> impl std::future::Future<Output = crate::Result<gax::response::Response<()>>> + Send {
+        _options: crate::RequestOptions,
+    ) -> impl std::future::Future<Output = crate::Result<crate::Response<()>>> + Send {
         gaxi::unimplemented::unimplemented_stub()
     }
 
@@ -1386,9 +1373,9 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_error_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
-        std::sync::Arc::new(gax::polling_error_policy::Aip194Strict)
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
+        std::sync::Arc::new(google_cloud_gax::polling_error_policy::Aip194Strict)
     }
 
     /// Returns the polling backoff policy.
@@ -1397,8 +1384,8 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     /// it is called by your mocks.
     fn get_polling_backoff_policy(
         &self,
-        _options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
-        std::sync::Arc::new(gax::exponential_backoff::ExponentialBackoff::default())
+        _options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
+        std::sync::Arc::new(google_cloud_gax::exponential_backoff::ExponentialBackoff::default())
     }
 }
diff --git a/src/generated/cloud/networkconnectivity/v1/src/stub/dynamic.rs b/src/generated/cloud/networkconnectivity/v1/src/stub/dynamic.rs
index 30f44b5897..95ffadb9c3 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/stub/dynamic.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/stub/dynamic.rs
@@ -20,178 +20,174 @@ pub trait CrossNetworkAutomationService: std::fmt::Debug + Send + Sync {
     async fn list_service_connection_maps(
         &self,
         req: crate::model::ListServiceConnectionMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConnectionMapsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConnectionMapsResponse>>;
 
     async fn get_service_connection_map(
         &self,
         req: crate::model::GetServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceConnectionMap>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceConnectionMap>>;
 
     async fn create_service_connection_map(
         &self,
         req: crate::model::CreateServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_service_connection_map(
         &self,
         req: crate::model::UpdateServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service_connection_map(
         &self,
         req: crate::model::DeleteServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_service_connection_policies(
         &self,
         req: crate::model::ListServiceConnectionPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConnectionPoliciesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConnectionPoliciesResponse>>;
 
     async fn get_service_connection_policy(
         &self,
         req: crate::model::GetServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceConnectionPolicy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceConnectionPolicy>>;
 
     async fn create_service_connection_policy(
         &self,
         req: crate::model::CreateServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_service_connection_policy(
         &self,
         req: crate::model::UpdateServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service_connection_policy(
         &self,
         req: crate::model::DeleteServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_service_classes(
         &self,
         req: crate::model::ListServiceClassesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceClassesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceClassesResponse>>;
 
     async fn get_service_class(
         &self,
         req: crate::model::GetServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceClass>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceClass>>;
 
     async fn update_service_class(
         &self,
         req: crate::model::UpdateServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service_class(
         &self,
         req: crate::model::DeleteServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_service_connection_token(
         &self,
         req: crate::model::GetServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceConnectionToken>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceConnectionToken>>;
 
     async fn list_service_connection_tokens(
         &self,
         req: crate::model::ListServiceConnectionTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConnectionTokensResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConnectionTokensResponse>>;
 
     async fn create_service_connection_token(
         &self,
         req: crate::model::CreateServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_service_connection_token(
         &self,
         req: crate::model::DeleteServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::CrossNetworkAutomationService] also implement [CrossNetworkAutomationService].
@@ -201,9 +197,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn list_service_connection_maps(
         &self,
         req: crate::model::ListServiceConnectionMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConnectionMapsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConnectionMapsResponse>> {
         T::list_service_connection_maps(self, req, options).await
     }
 
@@ -211,8 +206,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_service_connection_map(
         &self,
         req: crate::model::GetServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceConnectionMap>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceConnectionMap>> {
         T::get_service_connection_map(self, req, options).await
     }
 
@@ -220,8 +215,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn create_service_connection_map(
         &self,
         req: crate::model::CreateServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service_connection_map(self, req, options).await
     }
 
@@ -229,8 +224,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn update_service_connection_map(
         &self,
         req: crate::model::UpdateServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_service_connection_map(self, req, options).await
     }
 
@@ -238,8 +233,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn delete_service_connection_map(
         &self,
         req: crate::model::DeleteServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service_connection_map(self, req, options).await
     }
 
@@ -247,9 +242,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn list_service_connection_policies(
         &self,
         req: crate::model::ListServiceConnectionPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConnectionPoliciesResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConnectionPoliciesResponse>> {
         T::list_service_connection_policies(self, req, options).await
     }
 
@@ -257,8 +251,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_service_connection_policy(
         &self,
         req: crate::model::GetServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceConnectionPolicy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceConnectionPolicy>> {
         T::get_service_connection_policy(self, req, options).await
     }
 
@@ -266,8 +260,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn create_service_connection_policy(
         &self,
         req: crate::model::CreateServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service_connection_policy(self, req, options).await
     }
 
@@ -275,8 +269,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn update_service_connection_policy(
         &self,
         req: crate::model::UpdateServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_service_connection_policy(self, req, options).await
     }
 
@@ -284,8 +278,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn delete_service_connection_policy(
         &self,
         req: crate::model::DeleteServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service_connection_policy(self, req, options).await
     }
 
@@ -293,8 +287,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn list_service_classes(
         &self,
         req: crate::model::ListServiceClassesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceClassesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceClassesResponse>> {
         T::list_service_classes(self, req, options).await
     }
 
@@ -302,8 +296,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_service_class(
         &self,
         req: crate::model::GetServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceClass>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceClass>> {
         T::get_service_class(self, req, options).await
     }
 
@@ -311,8 +305,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn update_service_class(
         &self,
         req: crate::model::UpdateServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_service_class(self, req, options).await
     }
 
@@ -320,8 +314,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn delete_service_class(
         &self,
         req: crate::model::DeleteServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service_class(self, req, options).await
     }
 
@@ -329,8 +323,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_service_connection_token(
         &self,
         req: crate::model::GetServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ServiceConnectionToken>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ServiceConnectionToken>> {
         T::get_service_connection_token(self, req, options).await
     }
 
@@ -338,9 +332,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn list_service_connection_tokens(
         &self,
         req: crate::model::ListServiceConnectionTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListServiceConnectionTokensResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListServiceConnectionTokensResponse>> {
         T::list_service_connection_tokens(self, req, options).await
     }
 
@@ -348,8 +341,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn create_service_connection_token(
         &self,
         req: crate::model::CreateServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_service_connection_token(self, req, options).await
     }
 
@@ -357,8 +350,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn delete_service_connection_token(
         &self,
         req: crate::model::DeleteServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_service_connection_token(self, req, options).await
     }
 
@@ -366,9 +359,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -376,8 +368,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -385,8 +377,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -394,8 +386,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -403,10 +395,9 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -414,10 +405,9 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -425,8 +415,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -434,8 +424,8 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -443,22 +433,22 @@ impl<T: super::CrossNetworkAutomationService> CrossNetworkAutomationService for
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -469,146 +459,140 @@ pub trait DataTransferService: std::fmt::Debug + Send + Sync {
     async fn list_multicloud_data_transfer_configs(
         &self,
         req: crate::model::ListMulticloudDataTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListMulticloudDataTransferConfigsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMulticloudDataTransferConfigsResponse>>;
 
     async fn get_multicloud_data_transfer_config(
         &self,
         req: crate::model::GetMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MulticloudDataTransferConfig>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MulticloudDataTransferConfig>>;
 
     async fn create_multicloud_data_transfer_config(
         &self,
         req: crate::model::CreateMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_multicloud_data_transfer_config(
         &self,
         req: crate::model::UpdateMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_multicloud_data_transfer_config(
         &self,
         req: crate::model::DeleteMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_destinations(
         &self,
         req: crate::model::ListDestinationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDestinationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDestinationsResponse>>;
 
     async fn get_destination(
         &self,
         req: crate::model::GetDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Destination>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Destination>>;
 
     async fn create_destination(
         &self,
         req: crate::model::CreateDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_destination(
         &self,
         req: crate::model::UpdateDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_destination(
         &self,
         req: crate::model::DeleteDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_multicloud_data_transfer_supported_service(
         &self,
         req: crate::model::GetMulticloudDataTransferSupportedServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MulticloudDataTransferSupportedService>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MulticloudDataTransferSupportedService>>;
 
     async fn list_multicloud_data_transfer_supported_services(
         &self,
         req: crate::model::ListMulticloudDataTransferSupportedServicesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>,
+        crate::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>,
     >;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::DataTransferService] also implement [DataTransferService].
@@ -618,10 +602,9 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_multicloud_data_transfer_configs(
         &self,
         req: crate::model::ListMulticloudDataTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<crate::model::ListMulticloudDataTransferConfigsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListMulticloudDataTransferConfigsResponse>>
+    {
         T::list_multicloud_data_transfer_configs(self, req, options).await
     }
 
@@ -629,8 +612,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_multicloud_data_transfer_config(
         &self,
         req: crate::model::GetMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MulticloudDataTransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MulticloudDataTransferConfig>> {
         T::get_multicloud_data_transfer_config(self, req, options).await
     }
 
@@ -638,8 +621,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn create_multicloud_data_transfer_config(
         &self,
         req: crate::model::CreateMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_multicloud_data_transfer_config(self, req, options).await
     }
 
@@ -647,8 +630,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn update_multicloud_data_transfer_config(
         &self,
         req: crate::model::UpdateMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_multicloud_data_transfer_config(self, req, options).await
     }
 
@@ -656,8 +639,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn delete_multicloud_data_transfer_config(
         &self,
         req: crate::model::DeleteMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_multicloud_data_transfer_config(self, req, options).await
     }
 
@@ -665,8 +648,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_destinations(
         &self,
         req: crate::model::ListDestinationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListDestinationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListDestinationsResponse>> {
         T::list_destinations(self, req, options).await
     }
 
@@ -674,8 +657,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_destination(
         &self,
         req: crate::model::GetDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Destination>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Destination>> {
         T::get_destination(self, req, options).await
     }
 
@@ -683,8 +666,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn create_destination(
         &self,
         req: crate::model::CreateDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_destination(self, req, options).await
     }
 
@@ -692,8 +675,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn update_destination(
         &self,
         req: crate::model::UpdateDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_destination(self, req, options).await
     }
 
@@ -701,8 +684,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn delete_destination(
         &self,
         req: crate::model::DeleteDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_destination(self, req, options).await
     }
 
@@ -710,9 +693,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_multicloud_data_transfer_supported_service(
         &self,
         req: crate::model::GetMulticloudDataTransferSupportedServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::MulticloudDataTransferSupportedService>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::MulticloudDataTransferSupportedService>> {
         T::get_multicloud_data_transfer_supported_service(self, req, options).await
     }
 
@@ -720,9 +702,9 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_multicloud_data_transfer_supported_services(
         &self,
         req: crate::model::ListMulticloudDataTransferSupportedServicesRequest,
-        options: gax::options::RequestOptions,
+        options: crate::RequestOptions,
     ) -> crate::Result<
-        gax::response::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>,
+        crate::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>,
     > {
         T::list_multicloud_data_transfer_supported_services(self, req, options).await
     }
@@ -731,9 +713,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -741,8 +722,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -750,8 +731,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -759,8 +740,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -768,10 +749,9 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -779,10 +759,9 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -790,8 +769,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -799,8 +778,8 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -808,22 +787,22 @@ impl<T: super::DataTransferService> DataTransferService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -834,208 +813,204 @@ pub trait HubService: std::fmt::Debug + Send + Sync {
     async fn list_hubs(
         &self,
         req: crate::model::ListHubsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHubsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHubsResponse>>;
 
     async fn get_hub(
         &self,
         req: crate::model::GetHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Hub>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Hub>>;
 
     async fn create_hub(
         &self,
         req: crate::model::CreateHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_hub(
         &self,
         req: crate::model::UpdateHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_hub(
         &self,
         req: crate::model::DeleteHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_hub_spokes(
         &self,
         req: crate::model::ListHubSpokesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHubSpokesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHubSpokesResponse>>;
 
     async fn query_hub_status(
         &self,
         req: crate::model::QueryHubStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryHubStatusResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryHubStatusResponse>>;
 
     async fn list_spokes(
         &self,
         req: crate::model::ListSpokesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSpokesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSpokesResponse>>;
 
     async fn get_spoke(
         &self,
         req: crate::model::GetSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spoke>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spoke>>;
 
     async fn create_spoke(
         &self,
         req: crate::model::CreateSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_spoke(
         &self,
         req: crate::model::UpdateSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reject_hub_spoke(
         &self,
         req: crate::model::RejectHubSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn accept_hub_spoke(
         &self,
         req: crate::model::AcceptHubSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn accept_spoke_update(
         &self,
         req: crate::model::AcceptSpokeUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn reject_spoke_update(
         &self,
         req: crate::model::RejectSpokeUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_spoke(
         &self,
         req: crate::model::DeleteSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn get_route_table(
         &self,
         req: crate::model::GetRouteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouteTable>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouteTable>>;
 
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Route>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Route>>;
 
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutesResponse>>;
 
     async fn list_route_tables(
         &self,
         req: crate::model::ListRouteTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRouteTablesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRouteTablesResponse>>;
 
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Group>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Group>>;
 
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGroupsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGroupsResponse>>;
 
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::HubService] also implement [HubService].
@@ -1045,8 +1020,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_hubs(
         &self,
         req: crate::model::ListHubsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHubsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHubsResponse>> {
         T::list_hubs(self, req, options).await
     }
 
@@ -1054,8 +1029,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_hub(
         &self,
         req: crate::model::GetHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Hub>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Hub>> {
         T::get_hub(self, req, options).await
     }
 
@@ -1063,8 +1038,8 @@ impl<T: super::HubService> HubService for T {
     async fn create_hub(
         &self,
         req: crate::model::CreateHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_hub(self, req, options).await
     }
 
@@ -1072,8 +1047,8 @@ impl<T: super::HubService> HubService for T {
     async fn update_hub(
         &self,
         req: crate::model::UpdateHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_hub(self, req, options).await
     }
 
@@ -1081,8 +1056,8 @@ impl<T: super::HubService> HubService for T {
     async fn delete_hub(
         &self,
         req: crate::model::DeleteHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_hub(self, req, options).await
     }
 
@@ -1090,8 +1065,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_hub_spokes(
         &self,
         req: crate::model::ListHubSpokesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListHubSpokesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListHubSpokesResponse>> {
         T::list_hub_spokes(self, req, options).await
     }
 
@@ -1099,8 +1074,8 @@ impl<T: super::HubService> HubService for T {
     async fn query_hub_status(
         &self,
         req: crate::model::QueryHubStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::QueryHubStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::QueryHubStatusResponse>> {
         T::query_hub_status(self, req, options).await
     }
 
@@ -1108,8 +1083,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_spokes(
         &self,
         req: crate::model::ListSpokesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListSpokesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListSpokesResponse>> {
         T::list_spokes(self, req, options).await
     }
 
@@ -1117,8 +1092,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_spoke(
         &self,
         req: crate::model::GetSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Spoke>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Spoke>> {
         T::get_spoke(self, req, options).await
     }
 
@@ -1126,8 +1101,8 @@ impl<T: super::HubService> HubService for T {
     async fn create_spoke(
         &self,
         req: crate::model::CreateSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_spoke(self, req, options).await
     }
 
@@ -1135,8 +1110,8 @@ impl<T: super::HubService> HubService for T {
     async fn update_spoke(
         &self,
         req: crate::model::UpdateSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_spoke(self, req, options).await
     }
 
@@ -1144,8 +1119,8 @@ impl<T: super::HubService> HubService for T {
     async fn reject_hub_spoke(
         &self,
         req: crate::model::RejectHubSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reject_hub_spoke(self, req, options).await
     }
 
@@ -1153,8 +1128,8 @@ impl<T: super::HubService> HubService for T {
     async fn accept_hub_spoke(
         &self,
         req: crate::model::AcceptHubSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::accept_hub_spoke(self, req, options).await
     }
 
@@ -1162,8 +1137,8 @@ impl<T: super::HubService> HubService for T {
     async fn accept_spoke_update(
         &self,
         req: crate::model::AcceptSpokeUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::accept_spoke_update(self, req, options).await
     }
 
@@ -1171,8 +1146,8 @@ impl<T: super::HubService> HubService for T {
     async fn reject_spoke_update(
         &self,
         req: crate::model::RejectSpokeUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::reject_spoke_update(self, req, options).await
     }
 
@@ -1180,8 +1155,8 @@ impl<T: super::HubService> HubService for T {
     async fn delete_spoke(
         &self,
         req: crate::model::DeleteSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_spoke(self, req, options).await
     }
 
@@ -1189,8 +1164,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_route_table(
         &self,
         req: crate::model::GetRouteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::RouteTable>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::RouteTable>> {
         T::get_route_table(self, req, options).await
     }
 
@@ -1198,8 +1173,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Route>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Route>> {
         T::get_route(self, req, options).await
     }
 
@@ -1207,8 +1182,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRoutesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRoutesResponse>> {
         T::list_routes(self, req, options).await
     }
 
@@ -1216,8 +1191,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_route_tables(
         &self,
         req: crate::model::ListRouteTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListRouteTablesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListRouteTablesResponse>> {
         T::list_route_tables(self, req, options).await
     }
 
@@ -1225,8 +1200,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::Group>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::Group>> {
         T::get_group(self, req, options).await
     }
 
@@ -1234,8 +1209,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListGroupsResponse>> {
         T::list_groups(self, req, options).await
     }
 
@@ -1243,8 +1218,8 @@ impl<T: super::HubService> HubService for T {
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_group(self, req, options).await
     }
 
@@ -1252,9 +1227,8 @@ impl<T: super::HubService> HubService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1262,8 +1236,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1271,8 +1245,8 @@ impl<T: super::HubService> HubService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1280,8 +1254,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1289,10 +1263,9 @@ impl<T: super::HubService> HubService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1300,10 +1273,9 @@ impl<T: super::HubService> HubService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1311,8 +1283,8 @@ impl<T: super::HubService> HubService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1320,8 +1292,8 @@ impl<T: super::HubService> HubService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1329,22 +1301,22 @@ impl<T: super::HubService> HubService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1355,100 +1327,96 @@ pub trait InternalRangeService: std::fmt::Debug + Send + Sync {
     async fn list_internal_ranges(
         &self,
         req: crate::model::ListInternalRangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInternalRangesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInternalRangesResponse>>;
 
     async fn get_internal_range(
         &self,
         req: crate::model::GetInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InternalRange>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InternalRange>>;
 
     async fn create_internal_range(
         &self,
         req: crate::model::CreateInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn update_internal_range(
         &self,
         req: crate::model::UpdateInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_internal_range(
         &self,
         req: crate::model::DeleteInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::InternalRangeService] also implement [InternalRangeService].
@@ -1458,8 +1426,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn list_internal_ranges(
         &self,
         req: crate::model::ListInternalRangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListInternalRangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListInternalRangesResponse>> {
         T::list_internal_ranges(self, req, options).await
     }
 
@@ -1467,8 +1435,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn get_internal_range(
         &self,
         req: crate::model::GetInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::InternalRange>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::InternalRange>> {
         T::get_internal_range(self, req, options).await
     }
 
@@ -1476,8 +1444,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn create_internal_range(
         &self,
         req: crate::model::CreateInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_internal_range(self, req, options).await
     }
 
@@ -1485,8 +1453,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn update_internal_range(
         &self,
         req: crate::model::UpdateInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::update_internal_range(self, req, options).await
     }
 
@@ -1494,8 +1462,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn delete_internal_range(
         &self,
         req: crate::model::DeleteInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_internal_range(self, req, options).await
     }
 
@@ -1503,9 +1471,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1513,8 +1480,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1522,8 +1489,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1531,8 +1498,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1540,10 +1507,9 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1551,10 +1517,9 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1562,8 +1527,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1571,8 +1536,8 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1580,22 +1545,22 @@ impl<T: super::InternalRangeService> InternalRangeService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
@@ -1606,94 +1571,90 @@ pub trait PolicyBasedRoutingService: std::fmt::Debug + Send + Sync {
     async fn list_policy_based_routes(
         &self,
         req: crate::model::ListPolicyBasedRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPolicyBasedRoutesResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPolicyBasedRoutesResponse>>;
 
     async fn get_policy_based_route(
         &self,
         req: crate::model::GetPolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyBasedRoute>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyBasedRoute>>;
 
     async fn create_policy_based_route(
         &self,
         req: crate::model::CreatePolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_policy_based_route(
         &self,
         req: crate::model::DeletePolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>>;
 
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>>;
 
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>>;
 
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>;
 
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    >;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>;
 
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>>;
 
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>>;
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>>;
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy>;
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy>;
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy>;
 }
 
 /// All implementations of [super::PolicyBasedRoutingService] also implement [PolicyBasedRoutingService].
@@ -1703,8 +1664,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn list_policy_based_routes(
         &self,
         req: crate::model::ListPolicyBasedRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::ListPolicyBasedRoutesResponse>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::ListPolicyBasedRoutesResponse>> {
         T::list_policy_based_routes(self, req, options).await
     }
 
@@ -1712,8 +1673,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn get_policy_based_route(
         &self,
         req: crate::model::GetPolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<crate::model::PolicyBasedRoute>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<crate::model::PolicyBasedRoute>> {
         T::get_policy_based_route(self, req, options).await
     }
 
@@ -1721,8 +1682,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn create_policy_based_route(
         &self,
         req: crate::model::CreatePolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::create_policy_based_route(self, req, options).await
     }
 
@@ -1730,8 +1691,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn delete_policy_based_route(
         &self,
         req: crate::model::DeletePolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::delete_policy_based_route(self, req, options).await
     }
 
@@ -1739,9 +1700,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         T::list_locations(self, req, options).await
     }
 
@@ -1749,8 +1709,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_location::model::Location>> {
         T::get_location(self, req, options).await
     }
 
@@ -1758,8 +1718,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::set_iam_policy(self, req, options).await
     }
 
@@ -1767,8 +1727,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         T::get_iam_policy(self, req, options).await
     }
 
@@ -1776,10 +1736,9 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
+    {
         T::test_iam_permissions(self, req, options).await
     }
 
@@ -1787,10 +1746,9 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<
-        gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>>
+    {
         T::list_operations(self, req, options).await
     }
 
@@ -1798,8 +1756,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         T::get_operation(self, req, options).await
     }
 
@@ -1807,8 +1765,8 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::delete_operation(self, req, options).await
     }
 
@@ -1816,22 +1774,22 @@ impl<T: super::PolicyBasedRoutingService> PolicyBasedRoutingService for T {
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> crate::Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> crate::Result<crate::Response<()>> {
         T::cancel_operation(self, req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         T::get_polling_error_policy(self, options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         T::get_polling_backoff_policy(self, options)
     }
 }
diff --git a/src/generated/cloud/networkconnectivity/v1/src/tracing.rs b/src/generated/cloud/networkconnectivity/v1/src/tracing.rs
index b29a1d3139..d1046e209a 100644
--- a/src/generated/cloud/networkconnectivity/v1/src/tracing.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/tracing.rs
@@ -41,8 +41,8 @@ where
     async fn list_service_connection_maps(
         &self,
         req: crate::model::ListServiceConnectionMapsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceConnectionMapsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceConnectionMapsResponse>> {
         self.inner.list_service_connection_maps(req, options).await
     }
 
@@ -50,8 +50,8 @@ where
     async fn get_service_connection_map(
         &self,
         req: crate::model::GetServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceConnectionMap>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceConnectionMap>> {
         self.inner.get_service_connection_map(req, options).await
     }
 
@@ -59,8 +59,8 @@ where
     async fn create_service_connection_map(
         &self,
         req: crate::model::CreateServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_service_connection_map(req, options).await
     }
 
@@ -68,8 +68,8 @@ where
     async fn update_service_connection_map(
         &self,
         req: crate::model::UpdateServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_service_connection_map(req, options).await
     }
 
@@ -77,8 +77,8 @@ where
     async fn delete_service_connection_map(
         &self,
         req: crate::model::DeleteServiceConnectionMapRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_service_connection_map(req, options).await
     }
 
@@ -86,8 +86,8 @@ where
     async fn list_service_connection_policies(
         &self,
         req: crate::model::ListServiceConnectionPoliciesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceConnectionPoliciesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceConnectionPoliciesResponse>> {
         self.inner
             .list_service_connection_policies(req, options)
             .await
@@ -97,8 +97,8 @@ where
     async fn get_service_connection_policy(
         &self,
         req: crate::model::GetServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceConnectionPolicy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceConnectionPolicy>> {
         self.inner.get_service_connection_policy(req, options).await
     }
 
@@ -106,8 +106,8 @@ where
     async fn create_service_connection_policy(
         &self,
         req: crate::model::CreateServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_service_connection_policy(req, options)
             .await
@@ -117,8 +117,8 @@ where
     async fn update_service_connection_policy(
         &self,
         req: crate::model::UpdateServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_service_connection_policy(req, options)
             .await
@@ -128,8 +128,8 @@ where
     async fn delete_service_connection_policy(
         &self,
         req: crate::model::DeleteServiceConnectionPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_service_connection_policy(req, options)
             .await
@@ -139,8 +139,8 @@ where
     async fn list_service_classes(
         &self,
         req: crate::model::ListServiceClassesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceClassesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceClassesResponse>> {
         self.inner.list_service_classes(req, options).await
     }
 
@@ -148,8 +148,8 @@ where
     async fn get_service_class(
         &self,
         req: crate::model::GetServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceClass>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceClass>> {
         self.inner.get_service_class(req, options).await
     }
 
@@ -157,8 +157,8 @@ where
     async fn update_service_class(
         &self,
         req: crate::model::UpdateServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_service_class(req, options).await
     }
 
@@ -166,8 +166,8 @@ where
     async fn delete_service_class(
         &self,
         req: crate::model::DeleteServiceClassRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_service_class(req, options).await
     }
 
@@ -175,8 +175,8 @@ where
     async fn get_service_connection_token(
         &self,
         req: crate::model::GetServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ServiceConnectionToken>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ServiceConnectionToken>> {
         self.inner.get_service_connection_token(req, options).await
     }
 
@@ -184,8 +184,8 @@ where
     async fn list_service_connection_tokens(
         &self,
         req: crate::model::ListServiceConnectionTokensRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListServiceConnectionTokensResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListServiceConnectionTokensResponse>> {
         self.inner
             .list_service_connection_tokens(req, options)
             .await
@@ -195,8 +195,8 @@ where
     async fn create_service_connection_token(
         &self,
         req: crate::model::CreateServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_service_connection_token(req, options)
             .await
@@ -206,8 +206,8 @@ where
     async fn delete_service_connection_token(
         &self,
         req: crate::model::DeleteServiceConnectionTokenRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_service_connection_token(req, options)
             .await
@@ -217,8 +217,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -226,8 +226,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -235,8 +235,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -244,8 +244,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -253,9 +253,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -263,9 +262,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -273,8 +271,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -282,8 +280,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -291,22 +289,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -337,9 +335,8 @@ where
     async fn list_multicloud_data_transfer_configs(
         &self,
         req: crate::model::ListMulticloudDataTransferConfigsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListMulticloudDataTransferConfigsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMulticloudDataTransferConfigsResponse>> {
         self.inner
             .list_multicloud_data_transfer_configs(req, options)
             .await
@@ -349,8 +346,8 @@ where
     async fn get_multicloud_data_transfer_config(
         &self,
         req: crate::model::GetMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MulticloudDataTransferConfig>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MulticloudDataTransferConfig>> {
         self.inner
             .get_multicloud_data_transfer_config(req, options)
             .await
@@ -360,8 +357,8 @@ where
     async fn create_multicloud_data_transfer_config(
         &self,
         req: crate::model::CreateMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .create_multicloud_data_transfer_config(req, options)
             .await
@@ -371,8 +368,8 @@ where
     async fn update_multicloud_data_transfer_config(
         &self,
         req: crate::model::UpdateMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .update_multicloud_data_transfer_config(req, options)
             .await
@@ -382,8 +379,8 @@ where
     async fn delete_multicloud_data_transfer_config(
         &self,
         req: crate::model::DeleteMulticloudDataTransferConfigRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner
             .delete_multicloud_data_transfer_config(req, options)
             .await
@@ -393,8 +390,8 @@ where
     async fn list_destinations(
         &self,
         req: crate::model::ListDestinationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListDestinationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListDestinationsResponse>> {
         self.inner.list_destinations(req, options).await
     }
 
@@ -402,8 +399,8 @@ where
     async fn get_destination(
         &self,
         req: crate::model::GetDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Destination>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Destination>> {
         self.inner.get_destination(req, options).await
     }
 
@@ -411,8 +408,8 @@ where
     async fn create_destination(
         &self,
         req: crate::model::CreateDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_destination(req, options).await
     }
 
@@ -420,8 +417,8 @@ where
     async fn update_destination(
         &self,
         req: crate::model::UpdateDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_destination(req, options).await
     }
 
@@ -429,8 +426,8 @@ where
     async fn delete_destination(
         &self,
         req: crate::model::DeleteDestinationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_destination(req, options).await
     }
 
@@ -438,8 +435,8 @@ where
     async fn get_multicloud_data_transfer_supported_service(
         &self,
         req: crate::model::GetMulticloudDataTransferSupportedServiceRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::MulticloudDataTransferSupportedService>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::MulticloudDataTransferSupportedService>> {
         self.inner
             .get_multicloud_data_transfer_supported_service(req, options)
             .await
@@ -449,10 +446,9 @@ where
     async fn list_multicloud_data_transfer_supported_services(
         &self,
         req: crate::model::ListMulticloudDataTransferSupportedServicesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<
-        gax::response::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>,
-    > {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListMulticloudDataTransferSupportedServicesResponse>>
+    {
         self.inner
             .list_multicloud_data_transfer_supported_services(req, options)
             .await
@@ -462,8 +458,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -471,8 +467,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -480,8 +476,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -489,8 +485,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -498,9 +494,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -508,9 +503,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -518,8 +512,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -527,8 +521,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -536,22 +530,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -582,8 +576,8 @@ where
     async fn list_hubs(
         &self,
         req: crate::model::ListHubsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHubsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHubsResponse>> {
         self.inner.list_hubs(req, options).await
     }
 
@@ -591,8 +585,8 @@ where
     async fn get_hub(
         &self,
         req: crate::model::GetHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Hub>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Hub>> {
         self.inner.get_hub(req, options).await
     }
 
@@ -600,8 +594,8 @@ where
     async fn create_hub(
         &self,
         req: crate::model::CreateHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_hub(req, options).await
     }
 
@@ -609,8 +603,8 @@ where
     async fn update_hub(
         &self,
         req: crate::model::UpdateHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_hub(req, options).await
     }
 
@@ -618,8 +612,8 @@ where
     async fn delete_hub(
         &self,
         req: crate::model::DeleteHubRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_hub(req, options).await
     }
 
@@ -627,8 +621,8 @@ where
     async fn list_hub_spokes(
         &self,
         req: crate::model::ListHubSpokesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListHubSpokesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListHubSpokesResponse>> {
         self.inner.list_hub_spokes(req, options).await
     }
 
@@ -636,8 +630,8 @@ where
     async fn query_hub_status(
         &self,
         req: crate::model::QueryHubStatusRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::QueryHubStatusResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::QueryHubStatusResponse>> {
         self.inner.query_hub_status(req, options).await
     }
 
@@ -645,8 +639,8 @@ where
     async fn list_spokes(
         &self,
         req: crate::model::ListSpokesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListSpokesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListSpokesResponse>> {
         self.inner.list_spokes(req, options).await
     }
 
@@ -654,8 +648,8 @@ where
     async fn get_spoke(
         &self,
         req: crate::model::GetSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Spoke>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Spoke>> {
         self.inner.get_spoke(req, options).await
     }
 
@@ -663,8 +657,8 @@ where
     async fn create_spoke(
         &self,
         req: crate::model::CreateSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_spoke(req, options).await
     }
 
@@ -672,8 +666,8 @@ where
     async fn update_spoke(
         &self,
         req: crate::model::UpdateSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_spoke(req, options).await
     }
 
@@ -681,8 +675,8 @@ where
     async fn reject_hub_spoke(
         &self,
         req: crate::model::RejectHubSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reject_hub_spoke(req, options).await
     }
 
@@ -690,8 +684,8 @@ where
     async fn accept_hub_spoke(
         &self,
         req: crate::model::AcceptHubSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.accept_hub_spoke(req, options).await
     }
 
@@ -699,8 +693,8 @@ where
     async fn accept_spoke_update(
         &self,
         req: crate::model::AcceptSpokeUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.accept_spoke_update(req, options).await
     }
 
@@ -708,8 +702,8 @@ where
     async fn reject_spoke_update(
         &self,
         req: crate::model::RejectSpokeUpdateRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.reject_spoke_update(req, options).await
     }
 
@@ -717,8 +711,8 @@ where
     async fn delete_spoke(
         &self,
         req: crate::model::DeleteSpokeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_spoke(req, options).await
     }
 
@@ -726,8 +720,8 @@ where
     async fn get_route_table(
         &self,
         req: crate::model::GetRouteTableRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::RouteTable>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::RouteTable>> {
         self.inner.get_route_table(req, options).await
     }
 
@@ -735,8 +729,8 @@ where
     async fn get_route(
         &self,
         req: crate::model::GetRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Route>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Route>> {
         self.inner.get_route(req, options).await
     }
 
@@ -744,8 +738,8 @@ where
     async fn list_routes(
         &self,
         req: crate::model::ListRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRoutesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRoutesResponse>> {
         self.inner.list_routes(req, options).await
     }
 
@@ -753,8 +747,8 @@ where
     async fn list_route_tables(
         &self,
         req: crate::model::ListRouteTablesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListRouteTablesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListRouteTablesResponse>> {
         self.inner.list_route_tables(req, options).await
     }
 
@@ -762,8 +756,8 @@ where
     async fn get_group(
         &self,
         req: crate::model::GetGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::Group>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::Group>> {
         self.inner.get_group(req, options).await
     }
 
@@ -771,8 +765,8 @@ where
     async fn list_groups(
         &self,
         req: crate::model::ListGroupsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListGroupsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListGroupsResponse>> {
         self.inner.list_groups(req, options).await
     }
 
@@ -780,8 +774,8 @@ where
     async fn update_group(
         &self,
         req: crate::model::UpdateGroupRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_group(req, options).await
     }
 
@@ -789,8 +783,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -798,8 +792,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -807,8 +801,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -816,8 +810,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -825,9 +819,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -835,9 +828,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -845,8 +837,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -854,8 +846,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -863,22 +855,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -909,8 +901,8 @@ where
     async fn list_internal_ranges(
         &self,
         req: crate::model::ListInternalRangesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListInternalRangesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListInternalRangesResponse>> {
         self.inner.list_internal_ranges(req, options).await
     }
 
@@ -918,8 +910,8 @@ where
     async fn get_internal_range(
         &self,
         req: crate::model::GetInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::InternalRange>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::InternalRange>> {
         self.inner.get_internal_range(req, options).await
     }
 
@@ -927,8 +919,8 @@ where
     async fn create_internal_range(
         &self,
         req: crate::model::CreateInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_internal_range(req, options).await
     }
 
@@ -936,8 +928,8 @@ where
     async fn update_internal_range(
         &self,
         req: crate::model::UpdateInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.update_internal_range(req, options).await
     }
 
@@ -945,8 +937,8 @@ where
     async fn delete_internal_range(
         &self,
         req: crate::model::DeleteInternalRangeRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_internal_range(req, options).await
     }
 
@@ -954,8 +946,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -963,8 +955,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -972,8 +964,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -981,8 +973,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -990,9 +982,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1000,9 +991,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1010,8 +1000,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1019,8 +1009,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1028,22 +1018,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
         self.inner.get_polling_backoff_policy(options)
     }
 }
@@ -1074,8 +1064,8 @@ where
     async fn list_policy_based_routes(
         &self,
         req: crate::model::ListPolicyBasedRoutesRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::ListPolicyBasedRoutesResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::ListPolicyBasedRoutesResponse>> {
         self.inner.list_policy_based_routes(req, options).await
     }
 
@@ -1083,8 +1073,8 @@ where
     async fn get_policy_based_route(
         &self,
         req: crate::model::GetPolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<crate::model::PolicyBasedRoute>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<crate::model::PolicyBasedRoute>> {
         self.inner.get_policy_based_route(req, options).await
     }
 
@@ -1092,8 +1082,8 @@ where
     async fn create_policy_based_route(
         &self,
         req: crate::model::CreatePolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.create_policy_based_route(req, options).await
     }
 
@@ -1101,8 +1091,8 @@ where
     async fn delete_policy_based_route(
         &self,
         req: crate::model::DeletePolicyBasedRouteRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.delete_policy_based_route(req, options).await
     }
 
@@ -1110,8 +1100,8 @@ where
     async fn list_locations(
         &self,
         req: google_cloud_location::model::ListLocationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::ListLocationsResponse>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::ListLocationsResponse>> {
         self.inner.list_locations(req, options).await
     }
 
@@ -1119,8 +1109,8 @@ where
     async fn get_location(
         &self,
         req: google_cloud_location::model::GetLocationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_location::model::Location>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_location::model::Location>> {
         self.inner.get_location(req, options).await
     }
 
@@ -1128,8 +1118,8 @@ where
     async fn set_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::SetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.set_iam_policy(req, options).await
     }
 
@@ -1137,8 +1127,8 @@ where
     async fn get_iam_policy(
         &self,
         req: google_cloud_iam_v1::model::GetIamPolicyRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::Policy>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::Policy>> {
         self.inner.get_iam_policy(req, options).await
     }
 
@@ -1146,9 +1136,8 @@ where
     async fn test_iam_permissions(
         &self,
         req: google_cloud_iam_v1::model::TestIamPermissionsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_iam_v1::model::TestIamPermissionsResponse>> {
         self.inner.test_iam_permissions(req, options).await
     }
 
@@ -1156,9 +1145,8 @@ where
     async fn list_operations(
         &self,
         req: google_cloud_longrunning::model::ListOperationsRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::ListOperationsResponse>>
-    {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::ListOperationsResponse>> {
         self.inner.list_operations(req, options).await
     }
 
@@ -1166,8 +1154,8 @@ where
     async fn get_operation(
         &self,
         req: google_cloud_longrunning::model::GetOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<google_cloud_longrunning::model::Operation>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<google_cloud_longrunning::model::Operation>> {
         self.inner.get_operation(req, options).await
     }
 
@@ -1175,8 +1163,8 @@ where
     async fn delete_operation(
         &self,
         req: google_cloud_longrunning::model::DeleteOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.delete_operation(req, options).await
     }
 
@@ -1184,22 +1172,22 @@ where
     async fn cancel_operation(
         &self,
         req: google_cloud_longrunning::model::CancelOperationRequest,
-        options: gax::options::RequestOptions,
-    ) -> Result<gax::response::Response<()>> {
+        options: crate::RequestOptions,
+    ) -> Result<crate::Response<()>> {
         self.inner.cancel_operation(req, options).await
     }
 
     fn get_polling_error_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_error_policy::PollingErrorPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_error_policy::PollingErrorPolicy> {
         self.inner.get_polling_error_policy(options)
     }
 
     fn get_polling_backoff_policy(
         &self,
-        options: &gax::options::RequestOptions,
-    ) -> std::sync::Arc<dyn gax::polling_backoff_policy::PollingBackoffPolicy> {
+        options: &crate::RequestOptions,
+    ) -> std::sync::Arc<dyn google_cloud_gax::polling_backoff_policy::PollingBackoffPolicy> {
  {"code":"deadline_exceeded","msg":"operation timed out"}